diff --git a/Makefile b/Makefile
index 7637f0a..9560e66 100644
--- a/Makefile
+++ b/Makefile
@@ -6,12 +6,12 @@ REV=$(shell grep define svnrev/svnrev.c | gawk '{print $$3}')
 full_dist: dist dist_vwii pack_forwarder
 
 dist: compile_installer compile_stboot
-	@tar cfj HomebrewFilter-rev$(REV).tar.bz2 HomebrewFilter/
-	@tar cfj HomebrewFilter-Standalone-rev$(REV).tar.bz2 HomebrewFilter.Standalone/
+	@tar cfj dist/HomebrewFilter-rev$(REV).tar.bz2 dist/HomebrewFilter/
+	@tar cfj dist/HomebrewFilter-Standalone-rev$(REV).tar.bz2 dist/HomebrewFilter.Standalone/
 
 dist_vwii: compile_installer_vwii compile_stboot_vwii
-	@tar cfj HomebrewFilter-vWii-rev$(REV).tar.bz2 HomebrewFilter.vWii/
-	@tar cfj HomebrewFilter-vWii-Standalone-rev$(REV).tar.bz2 HomebrewFilter.vWii.Standalone/
+	@tar cfj dist/HomebrewFilter-vWii-rev$(REV).tar.bz2 dist/HomebrewFilter.vWii/
+	@tar cfj dist/HomebrewFilter-vWii-Standalone-rev$(REV).tar.bz2 dist/HomebrewFilter.vWii.Standalone/
 
 compile_forwarder:
 	@make -C forwarder
@@ -19,13 +19,13 @@ compile_forwarder:
 	@cp forwarder/forwarder.dol forwarder/wad.vwii/00000001.app
 
 pack_forwarder: compile_forwarder
-	@tools/WadMii.exe -input "Z:$(PWD)\forwarder\wad" -output "Z:$(PWD)\HBF0.wad" || wine tools/WadMii.exe -input "Z:$(PWD)\forwarder\wad" -output "Z:$(PWD)\HBF0.wad"
-	@tools/WadMii.exe -input "Z:$(PWD)\forwarder\wad.vwii" -output "Z:$(PWD)\HBF0.vWii.wad" || wine tools/WadMii.exe -input "Z:$(PWD)\forwarder\wad" -output "Z:$(PWD)\HBF0.vWii.wad"
+	@tools/WadMii.exe -input "Z:$(PWD)\forwarder\wad" -output "Z:$(PWD)\dist\HBF0.wad" || wine tools/WadMii.exe -input "Z:$(PWD)\forwarder\wad" -output "Z:$(PWD)\dist\HBF0.wad"
+	@tools/WadMii.exe -input "Z:$(PWD)\forwarder\wad.vwii" -output "Z:$(PWD)\dist\HBF0.vWii.wad" || wine tools/WadMii.exe -input "Z:$(PWD)\forwarder\wad" -output "Z:$(PWD)\dist\HBF0.vWii.wad"
 
 distclean: clean
-	@rm -f HomebrewFilter*/boot.dol
-	@rm -f HomebrewFilter*.tar.bz2
-	@rm -f HBF0*.wad
+	@rm -f dist/HomebrewFilter*/boot.dol
+	@rm -f dist/HomebrewFilter*.tar.bz2
+	@rm -f dist/HBF0*.wad
 
 clean:
 	@make -C main clean
@@ -50,29 +50,29 @@ compile_stboot: clean
 	@echo "============================"
 	@echo "== HBF Standalone for Wii =="
 	@echo "============================"
-	@rm -f HomebrewFilter.Standalone/boot.dol
+	@rm -f dist/HomebrewFilter.Standalone/boot.dol
 	@make -C main clean
 	@XFLAGS="-DSTBOOT" make -C main
 	@cp main/hbf.dol boot/source/hbf.dol
 	@make -C boot
-	@cp boot/hbf_boot.dol HomebrewFilter.Standalone/boot.dol
+	@cp boot/hbf_boot.dol dist/HomebrewFilter.Standalone/boot.dol
 
 compile_stboot_vwii: clean_vwii
 	@echo "============================="
 	@echo "== HBF Standalone for vWii =="
 	@echo "============================="
-	@rm -f HomebrewFilter.vWii.Standalone/boot.dol
+	@rm -f dist/HomebrewFilter.vWii.Standalone/boot.dol
 	@make -C main clean
 	@XFLAGS="-DSTBOOTVWII -DVWII" make -C main
 	@cp main/hbf.dol boot/source/hbf.dol
 	@make -C boot
-	@cp boot/hbf_boot.dol HomebrewFilter.vWii.Standalone/boot.dol
+	@cp boot/hbf_boot.dol dist/HomebrewFilter.vWii.Standalone/boot.dol
 
 compile_hbf: clean
 	@echo "==========================="
 	@echo "== HBF Installer for Wii =="
 	@echo "==========================="
-	@rm -f HomebrewFilter/boot.dol
+	@rm -f dist/HomebrewFilter/boot.dol
 	@make -C main
 	@cp main/hbf.dol boot/source/hbf.dol
 
@@ -83,13 +83,13 @@ compile_boot: compile_hbf
 compile_installer: compile_boot
 	@tools/WadMii.exe -input "Z:$(PWD)\installer\wad" -output "Z:$(PWD)\installer\data\install.wad" || wine tools/WadMii.exe -input "Z:$(PWD)\installer\wad" -output "Z:$(PWD)\installer\data\install.wad"
 	@make -C installer
-	@cp installer/installer.dol HomebrewFilter/boot.dol
+	@cp installer/installer.dol dist/HomebrewFilter/boot.dol
 
 compile_hbf_vwii: clean_vwii
 	@echo "============================"
 	@echo "== HBF Installer for vWii =="
 	@echo "============================"
-	@rm -f HomebrewFilter.vWii/boot.dol
+	@rm -f dist/HomebrewFilter.vWii/boot.dol
 	@XFLAGS="-DVWII" make -C main
 	@cp main/hbf.dol boot/source/hbf.dol
 
@@ -100,4 +100,4 @@ compile_boot_vwii: compile_hbf_vwii
 compile_installer_vwii: compile_boot_vwii
 	@tools/WadMii.exe -input "Z:$(PWD)\installer\wad.vwii" -output "Z:$(PWD)\installer\data\install.wad" || wine tools/WadMii.exe -input "Z:$(PWD)\installer\wad.vwii" -output "Z:$(PWD)\installer\data\install.wad"
 	@make -C installer
-	@cp installer/installer.dol HomebrewFilter.vWii/boot.dol
+	@cp installer/installer.dol dist/HomebrewFilter.vWii/boot.dol
diff --git a/HomebrewFilter.Standalone/icon.png b/dist/HomebrewFilter.Standalone/icon.png
similarity index 100%
rename from HomebrewFilter.Standalone/icon.png
rename to dist/HomebrewFilter.Standalone/icon.png
diff --git a/HomebrewFilter.Standalone/meta.xml b/dist/HomebrewFilter.Standalone/meta.xml
similarity index 100%
rename from HomebrewFilter.Standalone/meta.xml
rename to dist/HomebrewFilter.Standalone/meta.xml
diff --git a/HomebrewFilter.vWii.Standalone/icon.png b/dist/HomebrewFilter.vWii.Standalone/icon.png
similarity index 100%
rename from HomebrewFilter.vWii.Standalone/icon.png
rename to dist/HomebrewFilter.vWii.Standalone/icon.png
diff --git a/HomebrewFilter.vWii.Standalone/meta.xml b/dist/HomebrewFilter.vWii.Standalone/meta.xml
similarity index 100%
rename from HomebrewFilter.vWii.Standalone/meta.xml
rename to dist/HomebrewFilter.vWii.Standalone/meta.xml
diff --git a/HomebrewFilter.vWii/icon.png b/dist/HomebrewFilter.vWii/icon.png
similarity index 100%
rename from HomebrewFilter.vWii/icon.png
rename to dist/HomebrewFilter.vWii/icon.png
diff --git a/HomebrewFilter.vWii/meta.xml b/dist/HomebrewFilter.vWii/meta.xml
similarity index 100%
rename from HomebrewFilter.vWii/meta.xml
rename to dist/HomebrewFilter.vWii/meta.xml
diff --git a/HomebrewFilter/icon.png b/dist/HomebrewFilter/icon.png
similarity index 100%
rename from HomebrewFilter/icon.png
rename to dist/HomebrewFilter/icon.png
diff --git a/HomebrewFilter/meta.xml b/dist/HomebrewFilter/meta.xml
similarity index 100%
rename from HomebrewFilter/meta.xml
rename to dist/HomebrewFilter/meta.xml