restructure template for ease of use

Makefile

@@ -17,26 +17,28 @@ default:
 	
 curseforge:
 	@echo "Making Curseforge pack"
-	@-mkdir ../modpack-curseforge
-	packwiz curseforge export --mods-folder packwiz-data/mods/ --pack-file packwiz-data/pack.toml
-	cp -r .minecraft overrides
-	7z a *.zip overrides 
-	rm -rf overrides
-	mv *.zip ../modpack-curseforge/
+	packwiz curseforge export --pack-file .minecraft/pack.toml -o ../modpack-curseforge.zip
+	7z d ../modpack-curseforge.zip overrides/packwiz-installer-bootstrap.jar overrides/pack.toml  overrides/index.toml	
+
+modrinth:
+	@echo "Making Modrinth pack"
+	packwiz modrinth export --pack-file .minecraft/pack.toml -o ../modpack-modrinth.zip
+	7z d ../modpack-modrinth.zip overrides/packwiz-installer-bootstrap.jar overrides/pack.toml  overrides/index.toml	
 
 multimc:
 	@echo "Making MultiMC pack"
 	7z d ../modpack-multimc.zip ./* -r
-	7z d ../modpack-multimc.zip ./.* -r
+	7z d ../modpack-multimc.zip ./.minecraft -r
 	7z a ../modpack-multimc.zip ./* -r
 	7z a ../modpack-multimc.zip ./.minecraft -r
+	7z d ../modpack-multimc.zip ./.minecraft/mods ./.minecraft/pack.toml ./.minecraft/index.toml -r
 
 technic:
 	@echo "Making Technic pack"
 	-rm -rf .technic
 	-cp -r .minecraft .technic
 	mv .technic/modpack.icon.png .technic/icon.png
-	cd .technic && java -jar packwiz-installer-bootstrap.jar https://gitlab.com/Merith-TK/modpack-template/-/raw/main/packwiz-data/pack.toml && cd ..
+	cd .technic && java -jar packwiz-installer-bootstrap.jar https://gitlab.com/Merith-TK/modpack-template/-/raw/main/.minecraft/pack.toml && cd ..
 	-rm -rf .technic/packwiz*
 	7z d ../modpack-technic.zip ./* -r
 	7z a ../modpack-technic.zip ./.technic/* -r
@@ -45,4 +47,4 @@ clean:
 	-rm -rf .technic
 	-git gc --aggressive --prune
 
-all: curseforge multimc technic clean
+all: curseforge modrinth multimc technic clean