diff --git a/distribute b/distribute
index 34d506b..9edb72e 100755
--- a/distribute
+++ b/distribute
@@ -2,16 +2,16 @@
 
 compile_hbf ()
 {
-	make || exit 1
+	make -C main/ || exit 1
 }
 
 compile_boot ()
 {
 	if [[ -e $PWD/hbf.dol && ! $FORCE ]]; then
-		cp hbf.dol boot/source/hbf.dol
+		cp main/hbf.dol boot/source/hbf.dol
 		make -C boot/ || exit 1
 	else	compile_hbf
-		cp hbf.dol boot/source/hbf.dol
+		cp main/hbf.dol boot/source/hbf.dol
 		make -C boot/ || exit 1
 	fi
 
@@ -53,7 +53,7 @@ make_distribution ()
 
 	XREV=$(grep "define SVN_REV" svnrev/svnrev.c | gawk '{print $3}')
 
-	cp data/meta.xml.in HomebrewFilter/meta.xml
+	cp main/data/meta.xml.in HomebrewFilter/meta.xml
 
 	sed -e "s/@REV@/$XREV/g" -i HomebrewFilter/meta.xml
 	sed -e '/./{H;$!d;}' -e "x;/rev$XREV/!d;" updates >> HomebrewFilter/meta.xml
@@ -77,22 +77,36 @@ make_filelist()
 
 }
 
-if [[ $1 == "-c" ]]; then
-	make clean
-	make -C boot clean
-	make -C installer clean
-	rm HomebrewFilter/meta.xml
-elif [[ $1 == "-l" ]]; then
-	make_filelist $2
-elif [[ $1 == "-f" ]]; then
-	FORCE=YES
-	make_distribution
-elif [[ $1 == "-o" ]]; then
-	FORCE=YES
-	CHNL=COMEX
-	make_distribution
-elif [[ $1 == "-b" ]]; then
-	FORCE=YES
-	compile_boot
-else	make_distribution
-fi
+case $1 in
+
+	"-c" )
+		make -C main clean
+		make -C boot clean
+		make -C installer clean
+	;;
+
+	"-l" )
+		make_filelist $2
+	;;
+
+	"-f" )
+		FORCE=YES
+		make_distribution
+	;;
+
+	"-o" )
+		FORCE=YES
+		CHNL=COMEX
+		make_distribution
+	;;
+
+	"-b" )
+		FORCE=YES
+		compile_boot
+	;;
+
+	* )
+		make_distribution
+	;;
+
+esac
\ No newline at end of file
diff --git a/Makefile b/main/Makefile
similarity index 99%
rename from Makefile
rename to main/Makefile
index 415da78..a527454 100644
--- a/Makefile
+++ b/main/Makefile
@@ -26,7 +26,7 @@ SOURCES		:=	source \
 			source/Network \
 			source/Tools \
 			source/Neek \
-			svnrev
+			../svnrev
 INCLUDES	:=	source
 DATA		:=	data/fonts \
 			data/sounds \
diff --git a/data/binary/banner.bin b/main/data/binary/banner.bin
similarity index 100%
rename from data/binary/banner.bin
rename to main/data/binary/banner.bin
diff --git a/data/binary/stub.bin b/main/data/binary/stub.bin
similarity index 100%
rename from data/binary/stub.bin
rename to main/data/binary/stub.bin
diff --git a/data/fonts/font.ttf b/main/data/fonts/font.ttf
similarity index 100%
rename from data/fonts/font.ttf
rename to main/data/fonts/font.ttf
diff --git a/data/fonts/symbol.ttf b/main/data/fonts/symbol.ttf
similarity index 100%
rename from data/fonts/symbol.ttf
rename to main/data/fonts/symbol.ttf
diff --git a/data/images/LogoHomebrewFilter.png b/main/data/images/LogoHomebrewFilter.png
similarity index 100%
rename from data/images/LogoHomebrewFilter.png
rename to main/data/images/LogoHomebrewFilter.png
diff --git a/data/images/bg_options.png b/main/data/images/bg_options.png
similarity index 100%
rename from data/images/bg_options.png
rename to main/data/images/bg_options.png
diff --git a/data/images/button_large.png b/main/data/images/button_large.png
similarity index 100%
rename from data/images/button_large.png
rename to main/data/images/button_large.png
diff --git a/data/images/button_large_over.png b/main/data/images/button_large_over.png
similarity index 100%
rename from data/images/button_large_over.png
rename to main/data/images/button_large_over.png
diff --git a/data/images/design/all_active.png b/main/data/images/design/all_active.png
similarity index 100%
rename from data/images/design/all_active.png
rename to main/data/images/design/all_active.png
diff --git a/data/images/design/all_inactive.png b/main/data/images/design/all_inactive.png
similarity index 100%
rename from data/images/design/all_inactive.png
rename to main/data/images/design/all_inactive.png
diff --git a/data/images/design/apps_grid.png b/main/data/images/design/apps_grid.png
similarity index 100%
rename from data/images/design/apps_grid.png
rename to main/data/images/design/apps_grid.png
diff --git a/data/images/design/apps_grid_hover.png b/main/data/images/design/apps_grid_hover.png
similarity index 100%
rename from data/images/design/apps_grid_hover.png
rename to main/data/images/design/apps_grid_hover.png
diff --git a/data/images/design/apps_list.png b/main/data/images/design/apps_list.png
similarity index 100%
rename from data/images/design/apps_list.png
rename to main/data/images/design/apps_list.png
diff --git a/data/images/design/apps_list_hover.png b/main/data/images/design/apps_list_hover.png
similarity index 100%
rename from data/images/design/apps_list_hover.png
rename to main/data/images/design/apps_list_hover.png
diff --git a/data/images/design/apps_minus.png b/main/data/images/design/apps_minus.png
similarity index 100%
rename from data/images/design/apps_minus.png
rename to main/data/images/design/apps_minus.png
diff --git a/data/images/design/apps_minus_hover.png b/main/data/images/design/apps_minus_hover.png
similarity index 100%
rename from data/images/design/apps_minus_hover.png
rename to main/data/images/design/apps_minus_hover.png
diff --git a/data/images/design/apps_next.png b/main/data/images/design/apps_next.png
similarity index 100%
rename from data/images/design/apps_next.png
rename to main/data/images/design/apps_next.png
diff --git a/data/images/design/apps_next_hover.png b/main/data/images/design/apps_next_hover.png
similarity index 100%
rename from data/images/design/apps_next_hover.png
rename to main/data/images/design/apps_next_hover.png
diff --git a/data/images/design/apps_plus.png b/main/data/images/design/apps_plus.png
similarity index 100%
rename from data/images/design/apps_plus.png
rename to main/data/images/design/apps_plus.png
diff --git a/data/images/design/apps_plus_hover.png b/main/data/images/design/apps_plus_hover.png
similarity index 100%
rename from data/images/design/apps_plus_hover.png
rename to main/data/images/design/apps_plus_hover.png
diff --git a/data/images/design/apps_previous.png b/main/data/images/design/apps_previous.png
similarity index 100%
rename from data/images/design/apps_previous.png
rename to main/data/images/design/apps_previous.png
diff --git a/data/images/design/apps_previous_hover.png b/main/data/images/design/apps_previous_hover.png
similarity index 100%
rename from data/images/design/apps_previous_hover.png
rename to main/data/images/design/apps_previous_hover.png
diff --git a/data/images/design/background.png b/main/data/images/design/background.png
similarity index 100%
rename from data/images/design/background.png
rename to main/data/images/design/background.png
diff --git a/data/images/design/bg_options.png b/main/data/images/design/bg_options.png
similarity index 100%
rename from data/images/design/bg_options.png
rename to main/data/images/design/bg_options.png
diff --git a/data/images/design/bg_options_entry.png b/main/data/images/design/bg_options_entry.png
similarity index 100%
rename from data/images/design/bg_options_entry.png
rename to main/data/images/design/bg_options_entry.png
diff --git a/data/images/design/button.png b/main/data/images/design/button.png
similarity index 100%
rename from data/images/design/button.png
rename to main/data/images/design/button.png
diff --git a/data/images/design/button_focus.png b/main/data/images/design/button_focus.png
similarity index 100%
rename from data/images/design/button_focus.png
rename to main/data/images/design/button_focus.png
diff --git a/data/images/design/button_small.png b/main/data/images/design/button_small.png
similarity index 100%
rename from data/images/design/button_small.png
rename to main/data/images/design/button_small.png
diff --git a/data/images/design/button_small_focus.png b/main/data/images/design/button_small_focus.png
similarity index 100%
rename from data/images/design/button_small_focus.png
rename to main/data/images/design/button_small_focus.png
diff --git a/data/images/design/button_square.png b/main/data/images/design/button_square.png
similarity index 100%
rename from data/images/design/button_square.png
rename to main/data/images/design/button_square.png
diff --git a/data/images/design/button_square_focus.png b/main/data/images/design/button_square_focus.png
similarity index 100%
rename from data/images/design/button_square_focus.png
rename to main/data/images/design/button_square_focus.png
diff --git a/data/images/design/button_tiny.png b/main/data/images/design/button_tiny.png
similarity index 100%
rename from data/images/design/button_tiny.png
rename to main/data/images/design/button_tiny.png
diff --git a/data/images/design/button_tiny_focus.png b/main/data/images/design/button_tiny_focus.png
similarity index 100%
rename from data/images/design/button_tiny_focus.png
rename to main/data/images/design/button_tiny_focus.png
diff --git a/data/images/design/cancel_active.png b/main/data/images/design/cancel_active.png
similarity index 100%
rename from data/images/design/cancel_active.png
rename to main/data/images/design/cancel_active.png
diff --git a/data/images/design/cancel_inactive.png b/main/data/images/design/cancel_inactive.png
similarity index 100%
rename from data/images/design/cancel_inactive.png
rename to main/data/images/design/cancel_inactive.png
diff --git a/data/images/design/choice.png b/main/data/images/design/choice.png
similarity index 100%
rename from data/images/design/choice.png
rename to main/data/images/design/choice.png
diff --git a/data/images/design/choice_large.png b/main/data/images/design/choice_large.png
similarity index 100%
rename from data/images/design/choice_large.png
rename to main/data/images/design/choice_large.png
diff --git a/data/images/design/dialog_background.png b/main/data/images/design/dialog_background.png
similarity index 100%
rename from data/images/design/dialog_background.png
rename to main/data/images/design/dialog_background.png
diff --git a/data/images/design/dvd_active.png b/main/data/images/design/dvd_active.png
similarity index 100%
rename from data/images/design/dvd_active.png
rename to main/data/images/design/dvd_active.png
diff --git a/data/images/design/dvd_inactive.png b/main/data/images/design/dvd_inactive.png
similarity index 100%
rename from data/images/design/dvd_inactive.png
rename to main/data/images/design/dvd_inactive.png
diff --git a/data/images/design/edit_active.png b/main/data/images/design/edit_active.png
similarity index 100%
rename from data/images/design/edit_active.png
rename to main/data/images/design/edit_active.png
diff --git a/data/images/design/edit_inactive.png b/main/data/images/design/edit_inactive.png
similarity index 100%
rename from data/images/design/edit_inactive.png
rename to main/data/images/design/edit_inactive.png
diff --git a/data/images/design/gc_active.png b/main/data/images/design/gc_active.png
similarity index 100%
rename from data/images/design/gc_active.png
rename to main/data/images/design/gc_active.png
diff --git a/data/images/design/gc_inactive.png b/main/data/images/design/gc_inactive.png
similarity index 100%
rename from data/images/design/gc_inactive.png
rename to main/data/images/design/gc_inactive.png
diff --git a/data/images/design/grid_active.png b/main/data/images/design/grid_active.png
similarity index 100%
rename from data/images/design/grid_active.png
rename to main/data/images/design/grid_active.png
diff --git a/data/images/design/grid_inactive.png b/main/data/images/design/grid_inactive.png
similarity index 100%
rename from data/images/design/grid_inactive.png
rename to main/data/images/design/grid_inactive.png
diff --git a/data/images/design/loader_active.png b/main/data/images/design/loader_active.png
similarity index 100%
rename from data/images/design/loader_active.png
rename to main/data/images/design/loader_active.png
diff --git a/data/images/design/loader_inactive.png b/main/data/images/design/loader_inactive.png
similarity index 100%
rename from data/images/design/loader_inactive.png
rename to main/data/images/design/loader_inactive.png
diff --git a/data/images/design/network_active.png b/main/data/images/design/network_active.png
similarity index 100%
rename from data/images/design/network_active.png
rename to main/data/images/design/network_active.png
diff --git a/data/images/design/network_inactive.png b/main/data/images/design/network_inactive.png
similarity index 100%
rename from data/images/design/network_inactive.png
rename to main/data/images/design/network_inactive.png
diff --git a/data/images/design/normal_active.png b/main/data/images/design/normal_active.png
similarity index 100%
rename from data/images/design/normal_active.png
rename to main/data/images/design/normal_active.png
diff --git a/data/images/design/normal_inactive.png b/main/data/images/design/normal_inactive.png
similarity index 100%
rename from data/images/design/normal_inactive.png
rename to main/data/images/design/normal_inactive.png
diff --git a/data/images/design/player_grab.png b/main/data/images/design/player_grab.png
similarity index 100%
rename from data/images/design/player_grab.png
rename to main/data/images/design/player_grab.png
diff --git a/data/images/design/player_point.png b/main/data/images/design/player_point.png
similarity index 100%
rename from data/images/design/player_point.png
rename to main/data/images/design/player_point.png
diff --git a/data/images/design/power_active.png b/main/data/images/design/power_active.png
similarity index 100%
rename from data/images/design/power_active.png
rename to main/data/images/design/power_active.png
diff --git a/data/images/design/power_inactive.png b/main/data/images/design/power_inactive.png
similarity index 100%
rename from data/images/design/power_inactive.png
rename to main/data/images/design/power_inactive.png
diff --git a/data/images/design/progress.png b/main/data/images/design/progress.png
similarity index 100%
rename from data/images/design/progress.png
rename to main/data/images/design/progress.png
diff --git a/data/images/design/recycle_bin.png b/main/data/images/design/recycle_bin.png
similarity index 100%
rename from data/images/design/recycle_bin.png
rename to main/data/images/design/recycle_bin.png
diff --git a/data/images/design/scrollbar.png b/main/data/images/design/scrollbar.png
similarity index 100%
rename from data/images/design/scrollbar.png
rename to main/data/images/design/scrollbar.png
diff --git a/data/images/design/scrollbar_arrowdown.png b/main/data/images/design/scrollbar_arrowdown.png
similarity index 100%
rename from data/images/design/scrollbar_arrowdown.png
rename to main/data/images/design/scrollbar_arrowdown.png
diff --git a/data/images/design/scrollbar_arrowdown_over.png b/main/data/images/design/scrollbar_arrowdown_over.png
similarity index 100%
rename from data/images/design/scrollbar_arrowdown_over.png
rename to main/data/images/design/scrollbar_arrowdown_over.png
diff --git a/data/images/design/scrollbar_arrowup.png b/main/data/images/design/scrollbar_arrowup.png
similarity index 100%
rename from data/images/design/scrollbar_arrowup.png
rename to main/data/images/design/scrollbar_arrowup.png
diff --git a/data/images/design/scrollbar_arrowup_over.png b/main/data/images/design/scrollbar_arrowup_over.png
similarity index 100%
rename from data/images/design/scrollbar_arrowup_over.png
rename to main/data/images/design/scrollbar_arrowup_over.png
diff --git a/data/images/design/sd_active.png b/main/data/images/design/sd_active.png
similarity index 100%
rename from data/images/design/sd_active.png
rename to main/data/images/design/sd_active.png
diff --git a/data/images/design/sd_inactive.png b/main/data/images/design/sd_inactive.png
similarity index 100%
rename from data/images/design/sd_inactive.png
rename to main/data/images/design/sd_inactive.png
diff --git a/data/images/design/sd_usb_active.png b/main/data/images/design/sd_usb_active.png
similarity index 100%
rename from data/images/design/sd_usb_active.png
rename to main/data/images/design/sd_usb_active.png
diff --git a/data/images/design/sd_usb_inactive.png b/main/data/images/design/sd_usb_inactive.png
similarity index 100%
rename from data/images/design/sd_usb_inactive.png
rename to main/data/images/design/sd_usb_inactive.png
diff --git a/data/images/design/settings_active.png b/main/data/images/design/settings_active.png
similarity index 100%
rename from data/images/design/settings_active.png
rename to main/data/images/design/settings_active.png
diff --git a/data/images/design/settings_inactive.png b/main/data/images/design/settings_inactive.png
similarity index 100%
rename from data/images/design/settings_inactive.png
rename to main/data/images/design/settings_inactive.png
diff --git a/data/images/design/throbber.png b/main/data/images/design/throbber.png
similarity index 100%
rename from data/images/design/throbber.png
rename to main/data/images/design/throbber.png
diff --git a/data/images/design/usb_active.png b/main/data/images/design/usb_active.png
similarity index 100%
rename from data/images/design/usb_active.png
rename to main/data/images/design/usb_active.png
diff --git a/data/images/design/usb_inactive.png b/main/data/images/design/usb_inactive.png
similarity index 100%
rename from data/images/design/usb_inactive.png
rename to main/data/images/design/usb_inactive.png
diff --git a/data/images/design/wii_active.png b/main/data/images/design/wii_active.png
similarity index 100%
rename from data/images/design/wii_active.png
rename to main/data/images/design/wii_active.png
diff --git a/data/images/design/wii_gc_active.png b/main/data/images/design/wii_gc_active.png
similarity index 100%
rename from data/images/design/wii_gc_active.png
rename to main/data/images/design/wii_gc_active.png
diff --git a/data/images/design/wii_gc_inactive.png b/main/data/images/design/wii_gc_inactive.png
similarity index 100%
rename from data/images/design/wii_gc_inactive.png
rename to main/data/images/design/wii_gc_inactive.png
diff --git a/data/images/design/wii_inactive.png b/main/data/images/design/wii_inactive.png
similarity index 100%
rename from data/images/design/wii_inactive.png
rename to main/data/images/design/wii_inactive.png
diff --git a/data/images/keyboard_key.png b/main/data/images/keyboard_key.png
similarity index 100%
rename from data/images/keyboard_key.png
rename to main/data/images/keyboard_key.png
diff --git a/data/images/keyboard_key_over.png b/main/data/images/keyboard_key_over.png
similarity index 100%
rename from data/images/keyboard_key_over.png
rename to main/data/images/keyboard_key_over.png
diff --git a/data/images/keyboard_largekey.png b/main/data/images/keyboard_largekey.png
similarity index 100%
rename from data/images/keyboard_largekey.png
rename to main/data/images/keyboard_largekey.png
diff --git a/data/images/keyboard_largekey_over.png b/main/data/images/keyboard_largekey_over.png
similarity index 100%
rename from data/images/keyboard_largekey_over.png
rename to main/data/images/keyboard_largekey_over.png
diff --git a/data/images/keyboard_mediumkey.png b/main/data/images/keyboard_mediumkey.png
similarity index 100%
rename from data/images/keyboard_mediumkey.png
rename to main/data/images/keyboard_mediumkey.png
diff --git a/data/images/keyboard_mediumkey_over.png b/main/data/images/keyboard_mediumkey_over.png
similarity index 100%
rename from data/images/keyboard_mediumkey_over.png
rename to main/data/images/keyboard_mediumkey_over.png
diff --git a/data/images/keyboard_textbox.png b/main/data/images/keyboard_textbox.png
similarity index 100%
rename from data/images/keyboard_textbox.png
rename to main/data/images/keyboard_textbox.png
diff --git a/data/images/scrollbar_box.png b/main/data/images/scrollbar_box.png
similarity index 100%
rename from data/images/scrollbar_box.png
rename to main/data/images/scrollbar_box.png
diff --git a/data/images/scrollbar_box_over.png b/main/data/images/scrollbar_box_over.png
similarity index 100%
rename from data/images/scrollbar_box_over.png
rename to main/data/images/scrollbar_box_over.png
diff --git a/data/images/textpointer_img.png b/main/data/images/textpointer_img.png
similarity index 100%
rename from data/images/textpointer_img.png
rename to main/data/images/textpointer_img.png
diff --git a/data/meta.xml.in b/main/data/meta.xml.in
similarity index 100%
rename from data/meta.xml.in
rename to main/data/meta.xml.in
diff --git a/data/sounds/button_click.ogg b/main/data/sounds/button_click.ogg
similarity index 100%
rename from data/sounds/button_click.ogg
rename to main/data/sounds/button_click.ogg
diff --git a/source/BootHomebrew/BootHomebrew.cpp b/main/source/BootHomebrew/BootHomebrew.cpp
similarity index 100%
rename from source/BootHomebrew/BootHomebrew.cpp
rename to main/source/BootHomebrew/BootHomebrew.cpp
diff --git a/source/BootHomebrew/BootHomebrew.h b/main/source/BootHomebrew/BootHomebrew.h
similarity index 100%
rename from source/BootHomebrew/BootHomebrew.h
rename to main/source/BootHomebrew/BootHomebrew.h
diff --git a/source/BootHomebrew/dolloader.c b/main/source/BootHomebrew/dolloader.c
similarity index 100%
rename from source/BootHomebrew/dolloader.c
rename to main/source/BootHomebrew/dolloader.c
diff --git a/source/BootHomebrew/dolloader.h b/main/source/BootHomebrew/dolloader.h
similarity index 100%
rename from source/BootHomebrew/dolloader.h
rename to main/source/BootHomebrew/dolloader.h
diff --git a/source/BootHomebrew/elf_abi.h b/main/source/BootHomebrew/elf_abi.h
similarity index 100%
rename from source/BootHomebrew/elf_abi.h
rename to main/source/BootHomebrew/elf_abi.h
diff --git a/source/BootHomebrew/elfloader.c b/main/source/BootHomebrew/elfloader.c
similarity index 100%
rename from source/BootHomebrew/elfloader.c
rename to main/source/BootHomebrew/elfloader.c
diff --git a/source/BootHomebrew/elfloader.h b/main/source/BootHomebrew/elfloader.h
similarity index 100%
rename from source/BootHomebrew/elfloader.h
rename to main/source/BootHomebrew/elfloader.h
diff --git a/source/DiskOperations/di2.c b/main/source/DiskOperations/di2.c
similarity index 100%
rename from source/DiskOperations/di2.c
rename to main/source/DiskOperations/di2.c
diff --git a/source/DiskOperations/di2.h b/main/source/DiskOperations/di2.h
similarity index 100%
rename from source/DiskOperations/di2.h
rename to main/source/DiskOperations/di2.h
diff --git a/source/DiskOperations/iso.c b/main/source/DiskOperations/iso.c
similarity index 100%
rename from source/DiskOperations/iso.c
rename to main/source/DiskOperations/iso.c
diff --git a/source/DiskOperations/iso.h b/main/source/DiskOperations/iso.h
similarity index 100%
rename from source/DiskOperations/iso.h
rename to main/source/DiskOperations/iso.h
diff --git a/source/FreeTypeGX.cpp b/main/source/FreeTypeGX.cpp
similarity index 100%
rename from source/FreeTypeGX.cpp
rename to main/source/FreeTypeGX.cpp
diff --git a/source/FreeTypeGX.h b/main/source/FreeTypeGX.h
similarity index 100%
rename from source/FreeTypeGX.h
rename to main/source/FreeTypeGX.h
diff --git a/source/Menus/menu_childlock.cpp b/main/source/Menus/menu_childlock.cpp
similarity index 100%
rename from source/Menus/menu_childlock.cpp
rename to main/source/Menus/menu_childlock.cpp
diff --git a/source/Menus/menu_main.cpp b/main/source/Menus/menu_main.cpp
similarity index 100%
rename from source/Menus/menu_main.cpp
rename to main/source/Menus/menu_main.cpp
diff --git a/source/Menus/menu_settings.cpp b/main/source/Menus/menu_settings.cpp
similarity index 100%
rename from source/Menus/menu_settings.cpp
rename to main/source/Menus/menu_settings.cpp
diff --git a/source/Menus/menu_settings_display.cpp b/main/source/Menus/menu_settings_display.cpp
similarity index 100%
rename from source/Menus/menu_settings_display.cpp
rename to main/source/Menus/menu_settings_display.cpp
diff --git a/source/Menus/menu_settings_file.cpp b/main/source/Menus/menu_settings_file.cpp
similarity index 100%
rename from source/Menus/menu_settings_file.cpp
rename to main/source/Menus/menu_settings_file.cpp
diff --git a/source/Menus/menu_settings_font.cpp b/main/source/Menus/menu_settings_font.cpp
similarity index 100%
rename from source/Menus/menu_settings_font.cpp
rename to main/source/Menus/menu_settings_font.cpp
diff --git a/source/Menus/menu_settings_language.cpp b/main/source/Menus/menu_settings_language.cpp
similarity index 100%
rename from source/Menus/menu_settings_language.cpp
rename to main/source/Menus/menu_settings_language.cpp
diff --git a/source/Menus/menu_settings_network.cpp b/main/source/Menus/menu_settings_network.cpp
similarity index 100%
rename from source/Menus/menu_settings_network.cpp
rename to main/source/Menus/menu_settings_network.cpp
diff --git a/source/Menus/menu_settings_theme.cpp b/main/source/Menus/menu_settings_theme.cpp
similarity index 100%
rename from source/Menus/menu_settings_theme.cpp
rename to main/source/Menus/menu_settings_theme.cpp
diff --git a/source/Menus/menus.h b/main/source/Menus/menus.h
similarity index 100%
rename from source/Menus/menus.h
rename to main/source/Menus/menus.h
diff --git a/source/Menus/menus_command.cpp b/main/source/Menus/menus_command.cpp
similarity index 100%
rename from source/Menus/menus_command.cpp
rename to main/source/Menus/menus_command.cpp
diff --git a/source/Menus/menus_command.h b/main/source/Menus/menus_command.h
similarity index 100%
rename from source/Menus/menus_command.h
rename to main/source/Menus/menus_command.h
diff --git a/source/Neek/armboot.h b/main/source/Neek/armboot.h
similarity index 100%
rename from source/Neek/armboot.h
rename to main/source/Neek/armboot.h
diff --git a/source/Neek/boot_neek2o.c b/main/source/Neek/boot_neek2o.c
similarity index 100%
rename from source/Neek/boot_neek2o.c
rename to main/source/Neek/boot_neek2o.c
diff --git a/source/Neek/boot_neek2o.h b/main/source/Neek/boot_neek2o.h
similarity index 100%
rename from source/Neek/boot_neek2o.h
rename to main/source/Neek/boot_neek2o.h
diff --git a/source/Neek/uneek_fs.c b/main/source/Neek/uneek_fs.c
similarity index 100%
rename from source/Neek/uneek_fs.c
rename to main/source/Neek/uneek_fs.c
diff --git a/source/Neek/uneek_fs.h b/main/source/Neek/uneek_fs.h
similarity index 100%
rename from source/Neek/uneek_fs.h
rename to main/source/Neek/uneek_fs.h
diff --git a/source/Network/dns.c b/main/source/Network/dns.c
similarity index 100%
rename from source/Network/dns.c
rename to main/source/Network/dns.c
diff --git a/source/Network/dns.h b/main/source/Network/dns.h
similarity index 100%
rename from source/Network/dns.h
rename to main/source/Network/dns.h
diff --git a/source/Network/http.c b/main/source/Network/http.c
similarity index 100%
rename from source/Network/http.c
rename to main/source/Network/http.c
diff --git a/source/Network/http.h b/main/source/Network/http.h
similarity index 100%
rename from source/Network/http.h
rename to main/source/Network/http.h
diff --git a/source/Network/network.cpp b/main/source/Network/network.cpp
similarity index 100%
rename from source/Network/network.cpp
rename to main/source/Network/network.cpp
diff --git a/source/Network/network.h b/main/source/Network/network.h
similarity index 100%
rename from source/Network/network.h
rename to main/source/Network/network.h
diff --git a/source/Network/tcp.cpp b/main/source/Network/tcp.cpp
similarity index 100%
rename from source/Network/tcp.cpp
rename to main/source/Network/tcp.cpp
diff --git a/source/Network/tcp.h b/main/source/Network/tcp.h
similarity index 100%
rename from source/Network/tcp.h
rename to main/source/Network/tcp.h
diff --git a/source/Network/update.cpp b/main/source/Network/update.cpp
similarity index 100%
rename from source/Network/update.cpp
rename to main/source/Network/update.cpp
diff --git a/source/Network/update.h b/main/source/Network/update.h
similarity index 100%
rename from source/Network/update.h
rename to main/source/Network/update.h
diff --git a/source/Network/wiiload_gecko.cpp b/main/source/Network/wiiload_gecko.cpp
similarity index 100%
rename from source/Network/wiiload_gecko.cpp
rename to main/source/Network/wiiload_gecko.cpp
diff --git a/source/Network/wiiload_gecko.h b/main/source/Network/wiiload_gecko.h
similarity index 100%
rename from source/Network/wiiload_gecko.h
rename to main/source/Network/wiiload_gecko.h
diff --git a/source/Prompts/OnScreenCodeboard.cpp b/main/source/Prompts/OnScreenCodeboard.cpp
similarity index 100%
rename from source/Prompts/OnScreenCodeboard.cpp
rename to main/source/Prompts/OnScreenCodeboard.cpp
diff --git a/source/Prompts/OnScreenKeyboard.cpp b/main/source/Prompts/OnScreenKeyboard.cpp
similarity index 100%
rename from source/Prompts/OnScreenKeyboard.cpp
rename to main/source/Prompts/OnScreenKeyboard.cpp
diff --git a/source/Prompts/prompt_add_app.cpp b/main/source/Prompts/prompt_add_app.cpp
similarity index 100%
rename from source/Prompts/prompt_add_app.cpp
rename to main/source/Prompts/prompt_add_app.cpp
diff --git a/source/Prompts/prompt_app_info.cpp b/main/source/Prompts/prompt_app_info.cpp
similarity index 100%
rename from source/Prompts/prompt_app_info.cpp
rename to main/source/Prompts/prompt_app_info.cpp
diff --git a/source/Prompts/prompt_debug.cpp b/main/source/Prompts/prompt_debug.cpp
similarity index 100%
rename from source/Prompts/prompt_debug.cpp
rename to main/source/Prompts/prompt_debug.cpp
diff --git a/source/Prompts/prompt_device.cpp b/main/source/Prompts/prompt_device.cpp
similarity index 100%
rename from source/Prompts/prompt_device.cpp
rename to main/source/Prompts/prompt_device.cpp
diff --git a/source/Prompts/prompt_edit.cpp b/main/source/Prompts/prompt_edit.cpp
similarity index 100%
rename from source/Prompts/prompt_edit.cpp
rename to main/source/Prompts/prompt_edit.cpp
diff --git a/source/Prompts/prompt_end.cpp b/main/source/Prompts/prompt_end.cpp
similarity index 100%
rename from source/Prompts/prompt_end.cpp
rename to main/source/Prompts/prompt_end.cpp
diff --git a/source/Prompts/prompt_erase_category.cpp b/main/source/Prompts/prompt_erase_category.cpp
similarity index 100%
rename from source/Prompts/prompt_erase_category.cpp
rename to main/source/Prompts/prompt_erase_category.cpp
diff --git a/source/Prompts/prompt_erase_dir.cpp b/main/source/Prompts/prompt_erase_dir.cpp
similarity index 100%
rename from source/Prompts/prompt_erase_dir.cpp
rename to main/source/Prompts/prompt_erase_dir.cpp
diff --git a/source/Prompts/prompt_font_download.cpp b/main/source/Prompts/prompt_font_download.cpp
similarity index 100%
rename from source/Prompts/prompt_font_download.cpp
rename to main/source/Prompts/prompt_font_download.cpp
diff --git a/source/Prompts/prompt_info.cpp b/main/source/Prompts/prompt_info.cpp
similarity index 100%
rename from source/Prompts/prompt_info.cpp
rename to main/source/Prompts/prompt_info.cpp
diff --git a/source/Prompts/prompt_language_download.cpp b/main/source/Prompts/prompt_language_download.cpp
similarity index 100%
rename from source/Prompts/prompt_language_download.cpp
rename to main/source/Prompts/prompt_language_download.cpp
diff --git a/source/Prompts/prompt_loader.cpp b/main/source/Prompts/prompt_loader.cpp
similarity index 100%
rename from source/Prompts/prompt_loader.cpp
rename to main/source/Prompts/prompt_loader.cpp
diff --git a/source/Prompts/prompt_move_category.cpp b/main/source/Prompts/prompt_move_category.cpp
similarity index 100%
rename from source/Prompts/prompt_move_category.cpp
rename to main/source/Prompts/prompt_move_category.cpp
diff --git a/source/Prompts/prompt_remove_app.cpp b/main/source/Prompts/prompt_remove_app.cpp
similarity index 100%
rename from source/Prompts/prompt_remove_app.cpp
rename to main/source/Prompts/prompt_remove_app.cpp
diff --git a/source/Prompts/prompt_revtext.cpp b/main/source/Prompts/prompt_revtext.cpp
similarity index 100%
rename from source/Prompts/prompt_revtext.cpp
rename to main/source/Prompts/prompt_revtext.cpp
diff --git a/source/Prompts/prompt_sort.cpp b/main/source/Prompts/prompt_sort.cpp
similarity index 100%
rename from source/Prompts/prompt_sort.cpp
rename to main/source/Prompts/prompt_sort.cpp
diff --git a/source/Prompts/prompt_system.cpp b/main/source/Prompts/prompt_system.cpp
similarity index 100%
rename from source/Prompts/prompt_system.cpp
rename to main/source/Prompts/prompt_system.cpp
diff --git a/source/Prompts/prompt_theme_download.cpp b/main/source/Prompts/prompt_theme_download.cpp
similarity index 100%
rename from source/Prompts/prompt_theme_download.cpp
rename to main/source/Prompts/prompt_theme_download.cpp
diff --git a/source/Prompts/prompt_update.cpp b/main/source/Prompts/prompt_update.cpp
similarity index 100%
rename from source/Prompts/prompt_update.cpp
rename to main/source/Prompts/prompt_update.cpp
diff --git a/source/Prompts/prompt_window.cpp b/main/source/Prompts/prompt_window.cpp
similarity index 100%
rename from source/Prompts/prompt_window.cpp
rename to main/source/Prompts/prompt_window.cpp
diff --git a/source/Prompts/prompts.h b/main/source/Prompts/prompts.h
similarity index 100%
rename from source/Prompts/prompts.h
rename to main/source/Prompts/prompts.h
diff --git a/source/Tools/FontSystem.cpp b/main/source/Tools/FontSystem.cpp
similarity index 100%
rename from source/Tools/FontSystem.cpp
rename to main/source/Tools/FontSystem.cpp
diff --git a/source/Tools/FontSystem.h b/main/source/Tools/FontSystem.h
similarity index 100%
rename from source/Tools/FontSystem.h
rename to main/source/Tools/FontSystem.h
diff --git a/source/Tools/RuntimeIOSPatch.c b/main/source/Tools/RuntimeIOSPatch.c
similarity index 100%
rename from source/Tools/RuntimeIOSPatch.c
rename to main/source/Tools/RuntimeIOSPatch.c
diff --git a/source/Tools/RuntimeIOSPatch.h b/main/source/Tools/RuntimeIOSPatch.h
similarity index 100%
rename from source/Tools/RuntimeIOSPatch.h
rename to main/source/Tools/RuntimeIOSPatch.h
diff --git a/source/Tools/SelectIos.cpp b/main/source/Tools/SelectIos.cpp
similarity index 100%
rename from source/Tools/SelectIos.cpp
rename to main/source/Tools/SelectIos.cpp
diff --git a/source/Tools/SelectIos.h b/main/source/Tools/SelectIos.h
similarity index 100%
rename from source/Tools/SelectIos.h
rename to main/source/Tools/SelectIos.h
diff --git a/source/Tools/TakeScreenshot.cpp b/main/source/Tools/TakeScreenshot.cpp
similarity index 100%
rename from source/Tools/TakeScreenshot.cpp
rename to main/source/Tools/TakeScreenshot.cpp
diff --git a/source/Tools/TakeScreenshot.h b/main/source/Tools/TakeScreenshot.h
similarity index 100%
rename from source/Tools/TakeScreenshot.h
rename to main/source/Tools/TakeScreenshot.h
diff --git a/source/Tools/app_list.cpp b/main/source/Tools/app_list.cpp
similarity index 100%
rename from source/Tools/app_list.cpp
rename to main/source/Tools/app_list.cpp
diff --git a/source/Tools/app_list.h b/main/source/Tools/app_list.h
similarity index 100%
rename from source/Tools/app_list.h
rename to main/source/Tools/app_list.h
diff --git a/source/Tools/category.cpp b/main/source/Tools/category.cpp
similarity index 100%
rename from source/Tools/category.cpp
rename to main/source/Tools/category.cpp
diff --git a/source/Tools/category.h b/main/source/Tools/category.h
similarity index 100%
rename from source/Tools/category.h
rename to main/source/Tools/category.h
diff --git a/source/Tools/copy_app_in_category.cpp b/main/source/Tools/copy_app_in_category.cpp
similarity index 100%
rename from source/Tools/copy_app_in_category.cpp
rename to main/source/Tools/copy_app_in_category.cpp
diff --git a/source/Tools/copy_app_in_category.h b/main/source/Tools/copy_app_in_category.h
similarity index 100%
rename from source/Tools/copy_app_in_category.h
rename to main/source/Tools/copy_app_in_category.h
diff --git a/source/Tools/erase.cpp b/main/source/Tools/erase.cpp
similarity index 100%
rename from source/Tools/erase.cpp
rename to main/source/Tools/erase.cpp
diff --git a/source/Tools/erase.h b/main/source/Tools/erase.h
similarity index 100%
rename from source/Tools/erase.h
rename to main/source/Tools/erase.h
diff --git a/source/Tools/fileop.cpp b/main/source/Tools/fileop.cpp
similarity index 100%
rename from source/Tools/fileop.cpp
rename to main/source/Tools/fileop.cpp
diff --git a/source/Tools/fileop.h b/main/source/Tools/fileop.h
similarity index 100%
rename from source/Tools/fileop.h
rename to main/source/Tools/fileop.h
diff --git a/source/Tools/load.cpp b/main/source/Tools/load.cpp
similarity index 100%
rename from source/Tools/load.cpp
rename to main/source/Tools/load.cpp
diff --git a/source/Tools/load.h b/main/source/Tools/load.h
similarity index 100%
rename from source/Tools/load.h
rename to main/source/Tools/load.h
diff --git a/source/Tools/load_channel.cpp b/main/source/Tools/load_channel.cpp
similarity index 100%
rename from source/Tools/load_channel.cpp
rename to main/source/Tools/load_channel.cpp
diff --git a/source/Tools/load_channel.h b/main/source/Tools/load_channel.h
similarity index 100%
rename from source/Tools/load_channel.h
rename to main/source/Tools/load_channel.h
diff --git a/source/Tools/parser.cpp b/main/source/Tools/parser.cpp
similarity index 100%
rename from source/Tools/parser.cpp
rename to main/source/Tools/parser.cpp
diff --git a/source/Tools/parser.h b/main/source/Tools/parser.h
similarity index 100%
rename from source/Tools/parser.h
rename to main/source/Tools/parser.h
diff --git a/source/Tools/save.cpp b/main/source/Tools/save.cpp
similarity index 100%
rename from source/Tools/save.cpp
rename to main/source/Tools/save.cpp
diff --git a/source/Tools/save.h b/main/source/Tools/save.h
similarity index 100%
rename from source/Tools/save.h
rename to main/source/Tools/save.h
diff --git a/source/Tools/sort.cpp b/main/source/Tools/sort.cpp
similarity index 100%
rename from source/Tools/sort.cpp
rename to main/source/Tools/sort.cpp
diff --git a/source/Tools/sort.h b/main/source/Tools/sort.h
similarity index 100%
rename from source/Tools/sort.h
rename to main/source/Tools/sort.h
diff --git a/source/Tools/textline.cpp b/main/source/Tools/textline.cpp
similarity index 100%
rename from source/Tools/textline.cpp
rename to main/source/Tools/textline.cpp
diff --git a/source/Tools/textline.h b/main/source/Tools/textline.h
similarity index 100%
rename from source/Tools/textline.h
rename to main/source/Tools/textline.h
diff --git a/source/Tools/theme.cpp b/main/source/Tools/theme.cpp
similarity index 100%
rename from source/Tools/theme.cpp
rename to main/source/Tools/theme.cpp
diff --git a/source/Tools/theme.h b/main/source/Tools/theme.h
similarity index 100%
rename from source/Tools/theme.h
rename to main/source/Tools/theme.h
diff --git a/source/Tools/throbber.cpp b/main/source/Tools/throbber.cpp
similarity index 100%
rename from source/Tools/throbber.cpp
rename to main/source/Tools/throbber.cpp
diff --git a/source/Tools/throbber.h b/main/source/Tools/throbber.h
similarity index 100%
rename from source/Tools/throbber.h
rename to main/source/Tools/throbber.h
diff --git a/source/Tools/translate.cpp b/main/source/Tools/translate.cpp
similarity index 100%
rename from source/Tools/translate.cpp
rename to main/source/Tools/translate.cpp
diff --git a/source/Tools/translate.h b/main/source/Tools/translate.h
similarity index 100%
rename from source/Tools/translate.h
rename to main/source/Tools/translate.h
diff --git a/source/ahbfix.cpp b/main/source/ahbfix.cpp
similarity index 100%
rename from source/ahbfix.cpp
rename to main/source/ahbfix.cpp
diff --git a/source/ahbfix.h b/main/source/ahbfix.h
similarity index 100%
rename from source/ahbfix.h
rename to main/source/ahbfix.h
diff --git a/source/filelist.h b/main/source/filelist.h
similarity index 100%
rename from source/filelist.h
rename to main/source/filelist.h
diff --git a/source/gecko.c b/main/source/gecko.c
similarity index 100%
rename from source/gecko.c
rename to main/source/gecko.c
diff --git a/source/gecko.h b/main/source/gecko.h
similarity index 100%
rename from source/gecko.h
rename to main/source/gecko.h
diff --git a/source/input.cpp b/main/source/input.cpp
similarity index 100%
rename from source/input.cpp
rename to main/source/input.cpp
diff --git a/source/input.h b/main/source/input.h
similarity index 100%
rename from source/input.h
rename to main/source/input.h
diff --git a/source/libwiigui/gui.h b/main/source/libwiigui/gui.h
similarity index 100%
rename from source/libwiigui/gui.h
rename to main/source/libwiigui/gui.h
diff --git a/source/libwiigui/gui_button.cpp b/main/source/libwiigui/gui_button.cpp
similarity index 100%
rename from source/libwiigui/gui_button.cpp
rename to main/source/libwiigui/gui_button.cpp
diff --git a/source/libwiigui/gui_codeboard.cpp b/main/source/libwiigui/gui_codeboard.cpp
similarity index 100%
rename from source/libwiigui/gui_codeboard.cpp
rename to main/source/libwiigui/gui_codeboard.cpp
diff --git a/source/libwiigui/gui_element.cpp b/main/source/libwiigui/gui_element.cpp
similarity index 100%
rename from source/libwiigui/gui_element.cpp
rename to main/source/libwiigui/gui_element.cpp
diff --git a/source/libwiigui/gui_image.cpp b/main/source/libwiigui/gui_image.cpp
similarity index 100%
rename from source/libwiigui/gui_image.cpp
rename to main/source/libwiigui/gui_image.cpp
diff --git a/source/libwiigui/gui_imagedata.cpp b/main/source/libwiigui/gui_imagedata.cpp
similarity index 100%
rename from source/libwiigui/gui_imagedata.cpp
rename to main/source/libwiigui/gui_imagedata.cpp
diff --git a/source/libwiigui/gui_keyboard.cpp b/main/source/libwiigui/gui_keyboard.cpp
similarity index 100%
rename from source/libwiigui/gui_keyboard.cpp
rename to main/source/libwiigui/gui_keyboard.cpp
diff --git a/source/libwiigui/gui_optionbrowser.cpp b/main/source/libwiigui/gui_optionbrowser.cpp
similarity index 100%
rename from source/libwiigui/gui_optionbrowser.cpp
rename to main/source/libwiigui/gui_optionbrowser.cpp
diff --git a/source/libwiigui/gui_text.cpp b/main/source/libwiigui/gui_text.cpp
similarity index 100%
rename from source/libwiigui/gui_text.cpp
rename to main/source/libwiigui/gui_text.cpp
diff --git a/source/libwiigui/gui_trigger.cpp b/main/source/libwiigui/gui_trigger.cpp
similarity index 100%
rename from source/libwiigui/gui_trigger.cpp
rename to main/source/libwiigui/gui_trigger.cpp
diff --git a/source/libwiigui/gui_window.cpp b/main/source/libwiigui/gui_window.cpp
similarity index 100%
rename from source/libwiigui/gui_window.cpp
rename to main/source/libwiigui/gui_window.cpp
diff --git a/source/main.cpp b/main/source/main.cpp
similarity index 100%
rename from source/main.cpp
rename to main/source/main.cpp
diff --git a/source/main.h b/main/source/main.h
similarity index 98%
rename from source/main.h
rename to main/source/main.h
index 52f87ee..1624268 100644
--- a/source/main.h
+++ b/main/source/main.h
@@ -17,7 +17,7 @@
 #include "Tools/theme.h"
 #include "Tools/translate.h"
 #include "Tools/fileop.h"
-#include "../svnrev/svnrev.h"
+#include "../../svnrev/svnrev.h"
 
 #define HW_REG_BASE   0xcd800000
 #define HW_ARMIRQMASK (HW_REG_BASE + 0x03c)
diff --git a/source/menu.cpp b/main/source/menu.cpp
similarity index 100%
rename from source/menu.cpp
rename to main/source/menu.cpp
diff --git a/source/menu.h b/main/source/menu.h
similarity index 100%
rename from source/menu.h
rename to main/source/menu.h
diff --git a/source/pngu.c b/main/source/pngu.c
similarity index 100%
rename from source/pngu.c
rename to main/source/pngu.c
diff --git a/source/pngu.h b/main/source/pngu.h
similarity index 100%
rename from source/pngu.h
rename to main/source/pngu.h
diff --git a/source/pngu_impl.h b/main/source/pngu_impl.h
similarity index 100%
rename from source/pngu_impl.h
rename to main/source/pngu_impl.h
diff --git a/source/sigslot.h b/main/source/sigslot.h
similarity index 100%
rename from source/sigslot.h
rename to main/source/sigslot.h
diff --git a/source/video.cpp b/main/source/video.cpp
similarity index 100%
rename from source/video.cpp
rename to main/source/video.cpp
diff --git a/source/video.h b/main/source/video.h
similarity index 100%
rename from source/video.h
rename to main/source/video.h
diff --git a/source/wpad.c b/main/source/wpad.c
similarity index 100%
rename from source/wpad.c
rename to main/source/wpad.c
diff --git a/source/wpad.h b/main/source/wpad.h
similarity index 100%
rename from source/wpad.h
rename to main/source/wpad.h