diff --git a/source/ngc/fonts/font.ttf b/source/fonts/font.ttf
similarity index 100%
rename from source/ngc/fonts/font.ttf
rename to source/fonts/font.ttf
diff --git a/source/ngc/gui/gui.h b/source/gui/gui.h
similarity index 100%
rename from source/ngc/gui/gui.h
rename to source/gui/gui.h
diff --git a/source/ngc/gui/gui_button.cpp b/source/gui/gui_button.cpp
similarity index 100%
rename from source/ngc/gui/gui_button.cpp
rename to source/gui/gui_button.cpp
diff --git a/source/ngc/gui/gui_element.cpp b/source/gui/gui_element.cpp
similarity index 100%
rename from source/ngc/gui/gui_element.cpp
rename to source/gui/gui_element.cpp
diff --git a/source/ngc/gui/gui_filebrowser.cpp b/source/gui/gui_filebrowser.cpp
similarity index 100%
rename from source/ngc/gui/gui_filebrowser.cpp
rename to source/gui/gui_filebrowser.cpp
diff --git a/source/ngc/gui/gui_image.cpp b/source/gui/gui_image.cpp
similarity index 100%
rename from source/ngc/gui/gui_image.cpp
rename to source/gui/gui_image.cpp
diff --git a/source/ngc/gui/gui_imagedata.cpp b/source/gui/gui_imagedata.cpp
similarity index 100%
rename from source/ngc/gui/gui_imagedata.cpp
rename to source/gui/gui_imagedata.cpp
diff --git a/source/ngc/gui/gui_keyboard.cpp b/source/gui/gui_keyboard.cpp
similarity index 100%
rename from source/ngc/gui/gui_keyboard.cpp
rename to source/gui/gui_keyboard.cpp
diff --git a/source/ngc/gui/gui_optionbrowser.cpp b/source/gui/gui_optionbrowser.cpp
similarity index 100%
rename from source/ngc/gui/gui_optionbrowser.cpp
rename to source/gui/gui_optionbrowser.cpp
diff --git a/source/ngc/gui/gui_savebrowser.cpp b/source/gui/gui_savebrowser.cpp
similarity index 100%
rename from source/ngc/gui/gui_savebrowser.cpp
rename to source/gui/gui_savebrowser.cpp
diff --git a/source/ngc/gui/gui_sound.cpp b/source/gui/gui_sound.cpp
similarity index 100%
rename from source/ngc/gui/gui_sound.cpp
rename to source/gui/gui_sound.cpp
diff --git a/source/ngc/gui/gui_text.cpp b/source/gui/gui_text.cpp
similarity index 100%
rename from source/ngc/gui/gui_text.cpp
rename to source/gui/gui_text.cpp
diff --git a/source/ngc/gui/gui_trigger.cpp b/source/gui/gui_trigger.cpp
similarity index 100%
rename from source/ngc/gui/gui_trigger.cpp
rename to source/gui/gui_trigger.cpp
diff --git a/source/ngc/gui/gui_window.cpp b/source/gui/gui_window.cpp
similarity index 100%
rename from source/ngc/gui/gui_window.cpp
rename to source/gui/gui_window.cpp
diff --git a/source/ngc/images/battery.png b/source/images/battery.png
similarity index 100%
rename from source/ngc/images/battery.png
rename to source/images/battery.png
diff --git a/source/ngc/images/battery_bar.png b/source/images/battery_bar.png
similarity index 100%
rename from source/ngc/images/battery_bar.png
rename to source/images/battery_bar.png
diff --git a/source/ngc/images/battery_red.png b/source/images/battery_red.png
similarity index 100%
rename from source/ngc/images/battery_red.png
rename to source/images/battery_red.png
diff --git a/source/ngc/images/bg_bottom.png b/source/images/bg_bottom.png
similarity index 100%
rename from source/ngc/images/bg_bottom.png
rename to source/images/bg_bottom.png
diff --git a/source/ngc/images/bg_game_selection.png b/source/images/bg_game_selection.png
similarity index 100%
rename from source/ngc/images/bg_game_selection.png
rename to source/images/bg_game_selection.png
diff --git a/source/ngc/images/bg_game_selection_entry.png b/source/images/bg_game_selection_entry.png
similarity index 100%
rename from source/ngc/images/bg_game_selection_entry.png
rename to source/images/bg_game_selection_entry.png
diff --git a/source/ngc/images/bg_options.png b/source/images/bg_options.png
similarity index 100%
rename from source/ngc/images/bg_options.png
rename to source/images/bg_options.png
diff --git a/source/ngc/images/bg_options_entry.png b/source/images/bg_options_entry.png
similarity index 100%
rename from source/ngc/images/bg_options_entry.png
rename to source/images/bg_options_entry.png
diff --git a/source/ngc/images/bg_top.png b/source/images/bg_top.png
similarity index 100%
rename from source/ngc/images/bg_top.png
rename to source/images/bg_top.png
diff --git a/source/ngc/images/button.png b/source/images/button.png
similarity index 100%
rename from source/ngc/images/button.png
rename to source/images/button.png
diff --git a/source/ngc/images/button_arrow_down.png b/source/images/button_arrow_down.png
similarity index 100%
rename from source/ngc/images/button_arrow_down.png
rename to source/images/button_arrow_down.png
diff --git a/source/ngc/images/button_arrow_down_over.png b/source/images/button_arrow_down_over.png
similarity index 100%
rename from source/ngc/images/button_arrow_down_over.png
rename to source/images/button_arrow_down_over.png
diff --git a/source/ngc/images/button_arrow_left.png b/source/images/button_arrow_left.png
similarity index 100%
rename from source/ngc/images/button_arrow_left.png
rename to source/images/button_arrow_left.png
diff --git a/source/ngc/images/button_arrow_left_over.png b/source/images/button_arrow_left_over.png
similarity index 100%
rename from source/ngc/images/button_arrow_left_over.png
rename to source/images/button_arrow_left_over.png
diff --git a/source/ngc/images/button_arrow_right.png b/source/images/button_arrow_right.png
similarity index 100%
rename from source/ngc/images/button_arrow_right.png
rename to source/images/button_arrow_right.png
diff --git a/source/ngc/images/button_arrow_right_over.png b/source/images/button_arrow_right_over.png
similarity index 100%
rename from source/ngc/images/button_arrow_right_over.png
rename to source/images/button_arrow_right_over.png
diff --git a/source/ngc/images/button_arrow_up.png b/source/images/button_arrow_up.png
similarity index 100%
rename from source/ngc/images/button_arrow_up.png
rename to source/images/button_arrow_up.png
diff --git a/source/ngc/images/button_arrow_up_over.png b/source/images/button_arrow_up_over.png
similarity index 100%
rename from source/ngc/images/button_arrow_up_over.png
rename to source/images/button_arrow_up_over.png
diff --git a/source/ngc/images/button_gamesave.png b/source/images/button_gamesave.png
similarity index 100%
rename from source/ngc/images/button_gamesave.png
rename to source/images/button_gamesave.png
diff --git a/source/ngc/images/button_gamesave_blank.png b/source/images/button_gamesave_blank.png
similarity index 100%
rename from source/ngc/images/button_gamesave_blank.png
rename to source/images/button_gamesave_blank.png
diff --git a/source/ngc/images/button_gamesave_over.png b/source/images/button_gamesave_over.png
similarity index 100%
rename from source/ngc/images/button_gamesave_over.png
rename to source/images/button_gamesave_over.png
diff --git a/source/ngc/images/button_large.png b/source/images/button_large.png
similarity index 100%
rename from source/ngc/images/button_large.png
rename to source/images/button_large.png
diff --git a/source/ngc/images/button_large_over.png b/source/images/button_large_over.png
similarity index 100%
rename from source/ngc/images/button_large_over.png
rename to source/images/button_large_over.png
diff --git a/source/ngc/images/button_long.png b/source/images/button_long.png
similarity index 100%
rename from source/ngc/images/button_long.png
rename to source/images/button_long.png
diff --git a/source/ngc/images/button_long_over.png b/source/images/button_long_over.png
similarity index 100%
rename from source/ngc/images/button_long_over.png
rename to source/images/button_long_over.png
diff --git a/source/ngc/images/button_over.png b/source/images/button_over.png
similarity index 100%
rename from source/ngc/images/button_over.png
rename to source/images/button_over.png
diff --git a/source/ngc/images/button_short.png b/source/images/button_short.png
similarity index 100%
rename from source/ngc/images/button_short.png
rename to source/images/button_short.png
diff --git a/source/ngc/images/button_short_over.png b/source/images/button_short_over.png
similarity index 100%
rename from source/ngc/images/button_short_over.png
rename to source/images/button_short_over.png
diff --git a/source/ngc/images/button_small.png b/source/images/button_small.png
similarity index 100%
rename from source/ngc/images/button_small.png
rename to source/images/button_small.png
diff --git a/source/ngc/images/button_small_over.png b/source/images/button_small_over.png
similarity index 100%
rename from source/ngc/images/button_small_over.png
rename to source/images/button_small_over.png
diff --git a/source/ngc/images/credits_box.png b/source/images/credits_box.png
similarity index 100%
rename from source/ngc/images/credits_box.png
rename to source/images/credits_box.png
diff --git a/source/ngc/images/dialogue_box.png b/source/images/dialogue_box.png
similarity index 100%
rename from source/ngc/images/dialogue_box.png
rename to source/images/dialogue_box.png
diff --git a/source/ngc/images/icon_dvd.png b/source/images/icon_dvd.png
similarity index 100%
rename from source/ngc/images/icon_dvd.png
rename to source/images/icon_dvd.png
diff --git a/source/ngc/images/icon_folder.png b/source/images/icon_folder.png
similarity index 100%
rename from source/ngc/images/icon_folder.png
rename to source/images/icon_folder.png
diff --git a/source/ngc/images/icon_game_cheats.png b/source/images/icon_game_cheats.png
similarity index 100%
rename from source/ngc/images/icon_game_cheats.png
rename to source/images/icon_game_cheats.png
diff --git a/source/ngc/images/icon_game_load.png b/source/images/icon_game_load.png
similarity index 100%
rename from source/ngc/images/icon_game_load.png
rename to source/images/icon_game_load.png
diff --git a/source/ngc/images/icon_game_reset.png b/source/images/icon_game_reset.png
similarity index 100%
rename from source/ngc/images/icon_game_reset.png
rename to source/images/icon_game_reset.png
diff --git a/source/ngc/images/icon_game_save.png b/source/images/icon_game_save.png
similarity index 100%
rename from source/ngc/images/icon_game_save.png
rename to source/images/icon_game_save.png
diff --git a/source/ngc/images/icon_game_settings.png b/source/images/icon_game_settings.png
similarity index 100%
rename from source/ngc/images/icon_game_settings.png
rename to source/images/icon_game_settings.png
diff --git a/source/ngc/images/icon_home.png b/source/images/icon_home.png
similarity index 100%
rename from source/ngc/images/icon_home.png
rename to source/images/icon_home.png
diff --git a/source/ngc/images/icon_sd.png b/source/images/icon_sd.png
similarity index 100%
rename from source/ngc/images/icon_sd.png
rename to source/images/icon_sd.png
diff --git a/source/ngc/images/icon_settings.png b/source/images/icon_settings.png
similarity index 100%
rename from source/ngc/images/icon_settings.png
rename to source/images/icon_settings.png
diff --git a/source/ngc/images/icon_settings_classic.png b/source/images/icon_settings_classic.png
similarity index 100%
rename from source/ngc/images/icon_settings_classic.png
rename to source/images/icon_settings_classic.png
diff --git a/source/ngc/images/icon_settings_file.png b/source/images/icon_settings_file.png
similarity index 100%
rename from source/ngc/images/icon_settings_file.png
rename to source/images/icon_settings_file.png
diff --git a/source/ngc/images/icon_settings_gamecube.png b/source/images/icon_settings_gamecube.png
similarity index 100%
rename from source/ngc/images/icon_settings_gamecube.png
rename to source/images/icon_settings_gamecube.png
diff --git a/source/ngc/images/icon_settings_mappings.png b/source/images/icon_settings_mappings.png
similarity index 100%
rename from source/ngc/images/icon_settings_mappings.png
rename to source/images/icon_settings_mappings.png
diff --git a/source/ngc/images/icon_settings_menu.png b/source/images/icon_settings_menu.png
similarity index 100%
rename from source/ngc/images/icon_settings_menu.png
rename to source/images/icon_settings_menu.png
diff --git a/source/ngc/images/icon_settings_network.png b/source/images/icon_settings_network.png
similarity index 100%
rename from source/ngc/images/icon_settings_network.png
rename to source/images/icon_settings_network.png
diff --git a/source/ngc/images/icon_settings_nunchuk.png b/source/images/icon_settings_nunchuk.png
similarity index 100%
rename from source/ngc/images/icon_settings_nunchuk.png
rename to source/images/icon_settings_nunchuk.png
diff --git a/source/ngc/images/icon_settings_video.png b/source/images/icon_settings_video.png
similarity index 100%
rename from source/ngc/images/icon_settings_video.png
rename to source/images/icon_settings_video.png
diff --git a/source/ngc/images/icon_settings_wiimote.png b/source/images/icon_settings_wiimote.png
similarity index 100%
rename from source/ngc/images/icon_settings_wiimote.png
rename to source/images/icon_settings_wiimote.png
diff --git a/source/ngc/images/icon_smb.png b/source/images/icon_smb.png
similarity index 100%
rename from source/ngc/images/icon_smb.png
rename to source/images/icon_smb.png
diff --git a/source/ngc/images/icon_usb.png b/source/images/icon_usb.png
similarity index 100%
rename from source/ngc/images/icon_usb.png
rename to source/images/icon_usb.png
diff --git a/source/ngc/images/keyboard_key.png b/source/images/keyboard_key.png
similarity index 100%
rename from source/ngc/images/keyboard_key.png
rename to source/images/keyboard_key.png
diff --git a/source/ngc/images/keyboard_key_over.png b/source/images/keyboard_key_over.png
similarity index 100%
rename from source/ngc/images/keyboard_key_over.png
rename to source/images/keyboard_key_over.png
diff --git a/source/ngc/images/keyboard_largekey.png b/source/images/keyboard_largekey.png
similarity index 100%
rename from source/ngc/images/keyboard_largekey.png
rename to source/images/keyboard_largekey.png
diff --git a/source/ngc/images/keyboard_largekey_over.png b/source/images/keyboard_largekey_over.png
similarity index 100%
rename from source/ngc/images/keyboard_largekey_over.png
rename to source/images/keyboard_largekey_over.png
diff --git a/source/ngc/images/keyboard_mediumkey.png b/source/images/keyboard_mediumkey.png
similarity index 100%
rename from source/ngc/images/keyboard_mediumkey.png
rename to source/images/keyboard_mediumkey.png
diff --git a/source/ngc/images/keyboard_mediumkey_over.png b/source/images/keyboard_mediumkey_over.png
similarity index 100%
rename from source/ngc/images/keyboard_mediumkey_over.png
rename to source/images/keyboard_mediumkey_over.png
diff --git a/source/ngc/images/keyboard_textbox.png b/source/images/keyboard_textbox.png
similarity index 100%
rename from source/ngc/images/keyboard_textbox.png
rename to source/images/keyboard_textbox.png
diff --git a/source/ngc/images/logo.png b/source/images/logo.png
similarity index 100%
rename from source/ngc/images/logo.png
rename to source/images/logo.png
diff --git a/source/ngc/images/logo_over.png b/source/images/logo_over.png
similarity index 100%
rename from source/ngc/images/logo_over.png
rename to source/images/logo_over.png
diff --git a/source/ngc/images/player1_grab.png b/source/images/player1_grab.png
similarity index 100%
rename from source/ngc/images/player1_grab.png
rename to source/images/player1_grab.png
diff --git a/source/ngc/images/player1_point.png b/source/images/player1_point.png
similarity index 100%
rename from source/ngc/images/player1_point.png
rename to source/images/player1_point.png
diff --git a/source/ngc/images/player2_grab.png b/source/images/player2_grab.png
similarity index 100%
rename from source/ngc/images/player2_grab.png
rename to source/images/player2_grab.png
diff --git a/source/ngc/images/player2_point.png b/source/images/player2_point.png
similarity index 100%
rename from source/ngc/images/player2_point.png
rename to source/images/player2_point.png
diff --git a/source/ngc/images/player3_grab.png b/source/images/player3_grab.png
similarity index 100%
rename from source/ngc/images/player3_grab.png
rename to source/images/player3_grab.png
diff --git a/source/ngc/images/player3_point.png b/source/images/player3_point.png
similarity index 100%
rename from source/ngc/images/player3_point.png
rename to source/images/player3_point.png
diff --git a/source/ngc/images/player4_grab.png b/source/images/player4_grab.png
similarity index 100%
rename from source/ngc/images/player4_grab.png
rename to source/images/player4_grab.png
diff --git a/source/ngc/images/player4_point.png b/source/images/player4_point.png
similarity index 100%
rename from source/ngc/images/player4_point.png
rename to source/images/player4_point.png
diff --git a/source/ngc/images/progressbar.png b/source/images/progressbar.png
similarity index 100%
rename from source/ngc/images/progressbar.png
rename to source/images/progressbar.png
diff --git a/source/ngc/images/progressbar_empty.png b/source/images/progressbar_empty.png
similarity index 100%
rename from source/ngc/images/progressbar_empty.png
rename to source/images/progressbar_empty.png
diff --git a/source/ngc/images/progressbar_outline.png b/source/images/progressbar_outline.png
similarity index 100%
rename from source/ngc/images/progressbar_outline.png
rename to source/images/progressbar_outline.png
diff --git a/source/ngc/images/saveicon.h b/source/images/saveicon.h
similarity index 100%
rename from source/ngc/images/saveicon.h
rename to source/images/saveicon.h
diff --git a/source/ngc/images/screen_position.png b/source/images/screen_position.png
similarity index 100%
rename from source/ngc/images/screen_position.png
rename to source/images/screen_position.png
diff --git a/source/ngc/images/scrollbar.png b/source/images/scrollbar.png
similarity index 100%
rename from source/ngc/images/scrollbar.png
rename to source/images/scrollbar.png
diff --git a/source/ngc/images/scrollbar_arrowdown.png b/source/images/scrollbar_arrowdown.png
similarity index 100%
rename from source/ngc/images/scrollbar_arrowdown.png
rename to source/images/scrollbar_arrowdown.png
diff --git a/source/ngc/images/scrollbar_arrowdown_over.png b/source/images/scrollbar_arrowdown_over.png
similarity index 100%
rename from source/ngc/images/scrollbar_arrowdown_over.png
rename to source/images/scrollbar_arrowdown_over.png
diff --git a/source/ngc/images/scrollbar_arrowup.png b/source/images/scrollbar_arrowup.png
similarity index 100%
rename from source/ngc/images/scrollbar_arrowup.png
rename to source/images/scrollbar_arrowup.png
diff --git a/source/ngc/images/scrollbar_arrowup_over.png b/source/images/scrollbar_arrowup_over.png
similarity index 100%
rename from source/ngc/images/scrollbar_arrowup_over.png
rename to source/images/scrollbar_arrowup_over.png
diff --git a/source/ngc/images/scrollbar_box.png b/source/images/scrollbar_box.png
similarity index 100%
rename from source/ngc/images/scrollbar_box.png
rename to source/images/scrollbar_box.png
diff --git a/source/ngc/images/scrollbar_box_over.png b/source/images/scrollbar_box_over.png
similarity index 100%
rename from source/ngc/images/scrollbar_box_over.png
rename to source/images/scrollbar_box_over.png
diff --git a/source/ngc/images/throbber.png b/source/images/throbber.png
similarity index 100%
rename from source/ngc/images/throbber.png
rename to source/images/throbber.png
diff --git a/source/ngc/lang/de.lang b/source/lang/de.lang
similarity index 100%
rename from source/ngc/lang/de.lang
rename to source/lang/de.lang
diff --git a/source/ngc/lang/en.lang b/source/lang/en.lang
similarity index 100%
rename from source/ngc/lang/en.lang
rename to source/lang/en.lang
diff --git a/source/ngc/lang/es.lang b/source/lang/es.lang
similarity index 100%
rename from source/ngc/lang/es.lang
rename to source/lang/es.lang
diff --git a/source/ngc/lang/fr.lang b/source/lang/fr.lang
similarity index 100%
rename from source/ngc/lang/fr.lang
rename to source/lang/fr.lang
diff --git a/source/ngc/lang/it.lang b/source/lang/it.lang
similarity index 100%
rename from source/ngc/lang/it.lang
rename to source/lang/it.lang
diff --git a/source/ngc/lang/jp.lang b/source/lang/jp.lang
similarity index 100%
rename from source/ngc/lang/jp.lang
rename to source/lang/jp.lang
diff --git a/source/ngc/lang/ko.lang b/source/lang/ko.lang
similarity index 100%
rename from source/ngc/lang/ko.lang
rename to source/lang/ko.lang
diff --git a/source/ngc/lang/nl.lang b/source/lang/nl.lang
similarity index 100%
rename from source/ngc/lang/nl.lang
rename to source/lang/nl.lang
diff --git a/source/ngc/lang/zh.lang b/source/lang/zh.lang
similarity index 100%
rename from source/ngc/lang/zh.lang
rename to source/lang/zh.lang
diff --git a/source/ngc/sounds/bg_music.ogg b/source/sounds/bg_music.ogg
similarity index 100%
rename from source/ngc/sounds/bg_music.ogg
rename to source/sounds/bg_music.ogg
diff --git a/source/ngc/sounds/button_click.pcm b/source/sounds/button_click.pcm
similarity index 100%
rename from source/ngc/sounds/button_click.pcm
rename to source/sounds/button_click.pcm
diff --git a/source/ngc/sounds/button_over.pcm b/source/sounds/button_over.pcm
similarity index 100%
rename from source/ngc/sounds/button_over.pcm
rename to source/sounds/button_over.pcm
diff --git a/source/ngc/sounds/enter.ogg b/source/sounds/enter.ogg
similarity index 100%
rename from source/ngc/sounds/enter.ogg
rename to source/sounds/enter.ogg
diff --git a/source/ngc/sounds/exit.ogg b/source/sounds/exit.ogg
similarity index 100%
rename from source/ngc/sounds/exit.ogg
rename to source/sounds/exit.ogg
diff --git a/source/FreeTypeGX.cpp b/source/utils/FreeTypeGX.cpp
similarity index 100%
rename from source/FreeTypeGX.cpp
rename to source/utils/FreeTypeGX.cpp
diff --git a/source/FreeTypeGX.h b/source/utils/FreeTypeGX.h
similarity index 100%
rename from source/FreeTypeGX.h
rename to source/utils/FreeTypeGX.h
diff --git a/source/Metaphrasis.cpp b/source/utils/Metaphrasis.cpp
similarity index 100%
rename from source/Metaphrasis.cpp
rename to source/utils/Metaphrasis.cpp
diff --git a/source/Metaphrasis.h b/source/utils/Metaphrasis.h
similarity index 100%
rename from source/Metaphrasis.h
rename to source/utils/Metaphrasis.h
diff --git a/source/gettext.cpp b/source/utils/gettext.cpp
similarity index 100%
rename from source/gettext.cpp
rename to source/utils/gettext.cpp
diff --git a/source/gettext.h b/source/utils/gettext.h
similarity index 100%
rename from source/gettext.h
rename to source/utils/gettext.h
diff --git a/source/http.cpp b/source/utils/http.cpp
similarity index 100%
rename from source/http.cpp
rename to source/utils/http.cpp
diff --git a/source/http.h b/source/utils/http.h
similarity index 100%
rename from source/http.h
rename to source/utils/http.h
diff --git a/source/oggplayer.c b/source/utils/oggplayer.c
similarity index 100%
rename from source/oggplayer.c
rename to source/utils/oggplayer.c
diff --git a/source/oggplayer.h b/source/utils/oggplayer.h
similarity index 100%
rename from source/oggplayer.h
rename to source/utils/oggplayer.h
diff --git a/source/pngu.c b/source/utils/pngu.c
similarity index 100%
rename from source/pngu.c
rename to source/utils/pngu.c
diff --git a/source/pngu.h b/source/utils/pngu.h
similarity index 100%
rename from source/pngu.h
rename to source/utils/pngu.h