diff --git a/HBC/META.XML b/HBC/META.XML
index 1d2d6924..85e75138 100644
--- a/HBC/META.XML
+++ b/HBC/META.XML
@@ -2,8 +2,8 @@
 	<app version="1">
 		<name> USB Loader GX</name>
 		<coder>USB Loader GX Team</coder>
-		<version>2.0 r1051</version>
-		<release_date>201101212059</release_date>
+		<version>2.0 r1052</version>
+		<release_date>201101212109</release_date>
 		<no_ios_reload/>
 		<short_description>Loads games from USB-devices</short_description>
 		<long_description>USB Loader GX is a libwiigui based USB iso loader with a wii-like GUI. You can install games to your HDDs and boot them with shorter loading times.
diff --git a/gui.pnproj b/gui.pnproj
index 3ab3b43d..53ad9a40 100644
--- a/gui.pnproj
+++ b/gui.pnproj
@@ -1 +1 @@
-<Project name="gui"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="source" path="source\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="banner" path="banner\"><File path="OpeningBNR.cpp"></File><File path="OpeningBNR.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="cheats" path="cheats\"><File path="cheatmenu.cpp"></File><File path="cheatmenu.h"></File><File path="gct.cpp"></File><File path="gct.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="Controls" path="Controls\"><File path="DeviceHandler.cpp"></File><File path="DeviceHandler.hpp"></File><File path="PartitionHandle.cpp"></File><File path="PartitionHandle.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="FileOperations" path="FileOperations\"><File path="DirList.cpp"></File><File path="DirList.h"></File><File path="File.cpp"></File><File path="File.hpp"></File><File path="fileops.cpp"></File><File path="fileops.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="fonts" path="fonts\"><File path="clock.ttf"></File><File path="font.ttf"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="homebrewboot" path="homebrewboot\"><File path="BootHomebrew.cpp"></File><File path="BootHomebrew.h"></File><File path="dolloader.c"></File><File path="dolloader.h"></File><File path="HomebrewBrowse.cpp"></File><File path="HomebrewBrowse.h"></File><File path="HomebrewBrowser.cpp"></File><File path="HomebrewBrowser.hpp"></File><File path="HomebrewFiles.cpp"></File><File path="HomebrewFiles.h"></File><File path="HomebrewXML.cpp"></File><File path="HomebrewXML.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="ImageOperations" path="ImageOperations\"><File path="TextureConverter.c"></File><File path="TextureConverter.h"></File><File path="TplImage.cpp"></File><File path="TplImage.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="images" path="images\"><File path="abcIcon.png"></File><File path="addressbar_textbox.png"></File><File path="arrangeCarousel.png"></File><File path="arrangeCarousel_gray.png"></File><File path="arrangeGrid.png"></File><File path="arrangeGrid_gray.png"></File><File path="arrangeList.png"></File><File path="arrangeList_gray.png"></File><File path="background.png"></File><File path="balanceboard.png"></File><File path="balanceboardR.png"></File><File path="battery.png"></File><File path="battery_bar.png"></File><File path="battery_bar_red.png"></File><File path="battery_bar_white.png"></File><File path="battery_red.png"></File><File path="battery_white.png"></File><File path="bg_browser.png"></File><File path="bg_browser_selection.png"></File><File path="bg_options.png"></File><File path="bg_options_entry.png"></File><File path="bg_options_settings.png"></File><File path="browser.png"></File><File path="browser_over.png"></File><File path="button_dialogue_box.png"></File><File path="button_install.png"></File><File path="button_install_over.png"></File><File path="cero_a.png"></File><File path="cero_b.png"></File><File path="cero_c.png"></File><File path="cero_d.png"></File><File path="cero_z.png"></File><File path="Channel_btn.png"></File><File path="classiccontroller.png"></File><File path="classiccontrollerR.png"></File><File path="closebutton.png"></File><File path="credits_bg.png"></File><File path="credits_button.png"></File><File path="credits_button_over.png"></File><File path="dancepad.png"></File><File path="dancepadR.png"></File><File path="dialogue_box.png"></File><File path="dialogue_box_startgame.png"></File><File path="drums.png"></File><File path="drumsR.png"></File><File path="dvd.png"></File><File path="dvd_gray.png"></File><File path="esrb_ao.png"></File><File path="esrb_e.png"></File><File path="esrb_ec.png"></File><File path="esrb_eten.png"></File><File path="esrb_m.png"></File><File path="esrb_t.png"></File><File path="exit_bottom.png"></File><File path="exit_bottom_over.png"></File><File path="exit_button.png"></File><File path="exit_top.png"></File><File path="exit_top_over.png"></File><File path="favIcon.png"></File><File path="favIcon_gray.png"></File><File path="favorite.png"></File><File path="gameinfo1.png"></File><File path="gameinfo1a.png"></File><File path="gameinfo2.png"></File><File path="gameinfo2a.png"></File><File path="gcncontroller.png"></File><File path="gcncontrollerR.png"></File><File path="guitar.png"></File><File path="guitarR.png"></File><File path="gxlogo.png"></File><File path="icon_folder.png"></File><File path="keyboard_backspace_over.png"></File><File path="keyboard_clear_over.png"></File><File path="keyboard_key.png"></File><File path="keyboard_key_over.png"></File><File path="keyboard_largekey_over.png"></File><File path="keyboard_mediumkey_over.png"></File><File path="keyboard_textbox.png"></File><File path="little_star.png"></File><File path="lock.png"></File><File path="lock_gray.png"></File><File path="menu_button.png"></File><File path="menu_button_over.png"></File><File path="microphone.png"></File><File path="microphoneR.png"></File><File path="motionplus.png"></File><File path="motionplusR.png"></File><File path="new.png"></File><File path="nintendods.png"></File><File path="nintendodsR.png"></File><File path="nocover.png"></File><File path="nocoverFlat.png"></File><File path="nodisc.png"></File><File path="norating.png"></File><File path="not_favorite.png"></File><File path="nunchuk.png"></File><File path="nunchukR.png"></File><File path="pageindicator.png"></File><File path="pegi_12.png"></File><File path="pegi_16.png"></File><File path="pegi_18.png"></File><File path="pegi_3.png"></File><File path="pegi_7.png"></File><File path="playCountIcon.png"></File><File path="player1_point.png"></File><File path="player2_point.png"></File><File path="player3_point.png"></File><File path="player4_point.png"></File><File path="progressbar.png"></File><File path="progressbar_empty.png"></File><File path="progressbar_outline.png"></File><File path="rankIcon.png"></File><File path="rplayer1_point.png"></File><File path="rplayer2_point.png"></File><File path="rplayer3_point.png"></File><File path="rplayer4_point.png"></File><File path="scrollbar.png"></File><File path="scrollbar_arrowdown.png"></File><File path="scrollbar_arrowup.png"></File><File path="scrollbar_box.png"></File><File path="sdcard.png"></File><File path="sdcard_over.png"></File><File path="searchIcon.png"></File><File path="searchIcon_gray.png"></File><File path="settings_background.png"></File><File path="settings_button.png"></File><File path="settings_button_over.png"></File><File path="settings_title.png"></File><File path="settings_title_over.png"></File><File path="startgame_arrow_left.png"></File><File path="startgame_arrow_right.png"></File><File path="theme_box.png"></File><File path="theme_dialogue_box.png"></File><File path="tooltip_left.png"></File><File path="tooltip_right.png"></File><File path="tooltip_tile.png"></File><File path="unlock.png"></File><File path="unlock_gray.png"></File><File path="usbport.png"></File><File path="wbackground.png"></File><File path="wdialogue_box_startgame.png"></File><File path="wheel.png"></File><File path="wheelR.png"></File><File path="wifi1.png"></File><File path="wifi12.png"></File><File path="wifi16.png"></File><File path="wifi2.png"></File><File path="wifi3.png"></File><File path="wifi32.png"></File><File path="wifi4.png"></File><File path="wifi8.png"></File><File path="Wifi_btn.png"></File><File path="wiimote.png"></File><File path="Wiimote1.png"></File><File path="Wiimote2.png"></File><File path="Wiimote3.png"></File><File path="Wiimote4.png"></File><File path="wiimote_poweroff.png"></File><File path="wiimote_poweroff_over.png"></File><File path="wiispeak.png"></File><File path="wiispeakR.png"></File><File path="zapper.png"></File><File path="zapperR.png"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="language" path="language\"><File path="gettext.c"></File><File path="gettext.h"></File><File path="UpdateLanguage.cpp"></File><File path="UpdateLanguage.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libs" path="libs\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libext2fs" path="libext2fs\"><File path="ext2_frag.h"></File><File path="libcustomext2fs.a"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libfat" path="libfat\"><File path="fatfile_frag.h"></File><File path="libcustomfat.a"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libntfs" path="libntfs\"><File path="libcustomntfs.a"></File><File path="ntfsfile_frag.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libwbfs" path="libwbfs\"><File path="libwbfs.c"></File><File path="libwbfs.h"></File><File path="libwbfs_os.h"></File><File path="rijndael.c"></File><File path="wiidisc.c"></File><File path="wiidisc.h"></File></MagicFolder></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libwiigui" path="libwiigui\"><File path="gui.h"></File><File path="gui_button.cpp"></File><File path="gui_customoptionbrowser.cpp"></File><File path="gui_customoptionbrowser.h"></File><File path="gui_diskcover.cpp"></File><File path="gui_diskcover.h"></File><File path="gui_element.cpp"></File><File path="gui_filebrowser.cpp"></File><File path="gui_gamebrowser.cpp"></File><File path="gui_gamebrowser.h"></File><File path="gui_gamecarousel.cpp"></File><File path="gui_gamecarousel.h"></File><File path="gui_gamegrid.cpp"></File><File path="gui_gamegrid.h"></File><File path="gui_image.cpp"></File><File path="gui_imagedata.cpp"></File><File path="gui_imagedata.h"></File><File path="gui_image_async.cpp"></File><File path="gui_image_async.h"></File><File path="gui_keyboard.cpp"></File><File path="gui_numpad.cpp"></File><File path="gui_optionbrowser.cpp"></File><File path="gui_searchbar.cpp"></File><File path="gui_searchbar.h"></File><File path="gui_text.cpp"></File><File path="gui_tooltip.cpp"></File><File path="gui_trigger.cpp"></File><File path="gui_window.cpp"></File><File path="LoadCoverImage.cpp"></File><File path="LoadCoverImage.h"></File><File path="OptionList.cpp"></File><File path="OptionList.hpp"></File><File path="Text.cpp"></File><File path="Text.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="memory" path="memory\"><File path="mem2.cpp"></File><File path="mem2.h"></File><File path="mem2alloc.cpp"></File><File path="mem2alloc.hpp"></File><File path="memory.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="menu" path="menu\"><File path="GameBrowseMenu.cpp"></File><File path="GameBrowseMenu.hpp"></File><File path="menus.h"></File><File path="menu_install.cpp"></File><File path="menu_partition_selection.cpp"></File><File path="WDMMenu.cpp"></File><File path="WDMMenu.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="mload" path="mload\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="modules" path="modules\"><File path="dip_plugin_249.c"></File><File path="dip_plugin_249.h"></File><File path="ehcmodule_5.c"></File><File path="ehcmodule_5.h"></File><File path="odip_frag.c"></File><File path="odip_frag.h"></File></MagicFolder><File path="mload.c"></File><File path="mload.h"></File><File path="mload_modules.c"></File><File path="mload_modules.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="network" path="network\"><File path="CoverDownload.cpp"></File><File path="CoverDownload.h"></File><File path="dns.c"></File><File path="dns.h"></File><File path="FileDownloader.cpp"></File><File path="FileDownloader.h"></File><File path="HTML_Stream.cpp"></File><File path="HTML_Stream.h"></File><File path="http.c"></File><File path="http.h"></File><File path="networkops.cpp"></File><File path="networkops.h"></File><File path="update.cpp"></File><File path="update.h"></File><File path="URL_List.cpp"></File><File path="URL_List.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="patches" path="patches\"><File path="codehandler.h"></File><File path="codehandleronly.h"></File><File path="dolpatcher.c"></File><File path="dolpatcher.h"></File><File path="dvd_broadway.c"></File><File path="dvd_broadway.h"></File><File path="fst.c"></File><File path="fst.h"></File><File path="fwrite_patch.h"></File><File path="gamepatches.c"></File><File path="gamepatches.h"></File><File path="geckomenu.h"></File><File path="kenobiwii.h"></File><File path="multidol.c"></File><File path="multidol.h"></File><File path="patchcode.c"></File><File path="patchcode.h"></File><File path="patchhook.S"></File><File path="ppc.h"></File><File path="wip.cpp"></File><File path="wip.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="prompts" path="prompts\"><File path="DiscBrowser.cpp"></File><File path="DiscBrowser.h"></File><File path="filebrowser.cpp"></File><File path="filebrowser.h"></File><File path="gameinfo.cpp"></File><File path="gameinfo.h"></File><File path="GameWindow.cpp"></File><File path="GameWindow.hpp"></File><File path="ProgressWindow.cpp"></File><File path="ProgressWindow.h"></File><File path="PromptWindows.cpp"></File><File path="PromptWindows.h"></File><File path="TitleBrowser.cpp"></File><File path="TitleBrowser.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="settings" path="settings\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="menus" path="menus\"><File path="CustomPathsSM.cpp"></File><File path="CustomPathsSM.hpp"></File><File path="FlyingButtonsMenu.cpp"></File><File path="FlyingButtonsMenu.hpp"></File><File path="GameLoadSM.cpp"></File><File path="GameLoadSM.hpp"></File><File path="GameSettingsMenu.cpp"></File><File path="GameSettingsMenu.hpp"></File><File path="GlobalSettings.cpp"></File><File path="GlobalSettings.hpp"></File><File path="GUISettingsMenu.cpp"></File><File path="GUISettingsMenu.hpp"></File><File path="LoaderSettings.cpp"></File><File path="LoaderSettings.hpp"></File><File path="ParentalControlSM.cpp"></File><File path="ParentalControlSM.hpp"></File><File path="SettingsMenu.cpp"></File><File path="SettingsMenu.hpp"></File><File path="SoundSettingsMenu.cpp"></File><File path="SoundSettingsMenu.hpp"></File><File path="UninstallSM.cpp"></File><File path="UninstallSM.hpp"></File></MagicFolder><File path="CGameSettings.cpp"></File><File path="CGameSettings.h"></File><File path="CGameStatistics.cpp"></File><File path="CGameStatistics.h"></File><File path="CSettings.cpp"></File><File path="CSettings.h"></File><File path="GameTitles.cpp"></File><File path="GameTitles.h"></File><File path="newtitles.cpp"></File><File path="newtitles.h"></File><File path="Settings.cpp"></File><File path="Settings.h"></File><File path="SettingsEnums.h"></File><File path="SettingsPrompts.cpp"></File><File path="SettingsPrompts.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="SoundOperations" path="SoundOperations\"><File path="AifDecoder.cpp"></File><File path="AifDecoder.hpp"></File><File path="BNSDecoder.cpp"></File><File path="BNSDecoder.hpp"></File><File path="BufferCircle.cpp"></File><File path="BufferCircle.hpp"></File><File path="gui_bgm.cpp"></File><File path="gui_bgm.h"></File><File path="gui_sound.cpp"></File><File path="gui_sound.h"></File><File path="Mp3Decoder.cpp"></File><File path="Mp3Decoder.hpp"></File><File path="OggDecoder.cpp"></File><File path="OggDecoder.hpp"></File><File path="SoundDecoder.cpp"></File><File path="SoundDecoder.hpp"></File><File path="SoundHandler.cpp"></File><File path="SoundHandler.hpp"></File><File path="WavDecoder.cpp"></File><File path="WavDecoder.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="sounds" path="sounds\"><File path="bg_music.ogg"></File><File path="button_click.wav"></File><File path="button_click2.wav"></File><File path="button_over.wav"></File><File path="credits_music.ogg"></File><File path="menuin.ogg"></File><File path="menuout.ogg"></File><File path="success.ogg"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="system" path="system\"><File path="IosLoader.cpp"></File><File path="IosLoader.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="themes" path="themes\"><File path="CTheme.cpp"></File><File path="CTheme.h"></File><File path="gettheme.c"></File><File path="gettheme.h"></File><File path="Resources.cpp"></File><File path="Resources.h"></File><File path="ThemeDownloader.cpp"></File><File path="ThemeDownloader.h"></File><File path="Theme_List.cpp"></File><File path="Theme_List.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="usbloader" path="usbloader\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="wbfs" path="wbfs\"><File path="wbfs_base.cpp"></File><File path="wbfs_base.h"></File><File path="wbfs_ext.cpp"></File><File path="wbfs_ext.h"></File><File path="wbfs_fat.cpp"></File><File path="wbfs_fat.h"></File><File path="wbfs_ntfs.cpp"></File><File path="wbfs_ntfs.h"></File><File path="wbfs_rw.c"></File><File path="wbfs_rw.h"></File><File path="wbfs_wbfs.cpp"></File><File path="wbfs_wbfs.h"></File></MagicFolder><File path="alternatedol.c"></File><File path="alternatedol.h"></File><File path="AlternateDOLOffsets.cpp"></File><File path="AlternateDOLOffsets.h"></File><File path="apploader.c"></File><File path="apploader.h"></File><File path="disc.c"></File><File path="disc.h"></File><File path="frag.c"></File><File path="frag.h"></File><File path="fstfile.c"></File><File path="fstfile.h"></File><File path="GameList.cpp"></File><File path="GameList.h"></File><File path="GetMissingGameFiles.cpp"></File><File path="GetMissingGameFiles.hpp"></File><File path="MountGamePartition.cpp"></File><File path="MountGamePartition.h"></File><File path="playlog.c"></File><File path="playlog.h"></File><File path="sdhc.c"></File><File path="sdhc.h"></File><File path="splits.c"></File><File path="splits.h"></File><File path="usbstorage2.c"></File><File path="usbstorage2.h"></File><File path="utils.c"></File><File path="utils.h"></File><File path="wbfs.cpp"></File><File path="wbfs.h"></File><File path="WDMFile.cpp"></File><File path="WDMFile.hpp"></File><File path="wdvd.c"></File><File path="wdvd.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="utils" path="utils\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="minizip" path="minizip\"><File path="miniunz.c"></File><File path="miniunz.h"></File></MagicFolder><File path="Callback.hpp"></File><File path="encrypt.c"></File><File path="encrypt.h"></File><File path="MD5.c"></File><File path="MD5.h"></File><File path="PasswordCheck.cpp"></File><File path="PasswordCheck.h"></File><File path="ResourceManager.cpp"></File><File path="ResourceManager.h"></File><File path="rockout.cpp"></File><File path="rockout.h"></File><File path="ShowError.cpp"></File><File path="ShowError.h"></File><File path="StringTools.c"></File><File path="StringTools.h"></File><File path="ThreadedTask.cpp"></File><File path="ThreadedTask.hpp"></File><File path="timer.c"></File><File path="timer.h"></File><File path="tools.h"></File><File path="uncompress.c"></File><File path="uncompress.h"></File><File path="wifi_gecko.c"></File><File path="wifi_gecko.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="wad" path="wad\"><File path="nandtitle.cpp"></File><File path="nandtitle.h"></File><File path="utils.h"></File><File path="wad.cpp"></File><File path="wad.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="xml" path="xml\"><File path="WiiTDB.cpp"></File><File path="WiiTDB.hpp"></File><File path="xml.cpp"></File><File path="xml.h"></File></MagicFolder><File path="audio.cpp"></File><File path="audio.h"></File><File path="buildtype.h"></File><File path="filelist.h"></File><File path="FreeTypeGX.cpp"></File><File path="FreeTypeGX.h"></File><File path="GameBootProcess.cpp"></File><File path="GameBootProcess.h"></File><File path="gecko.c"></File><File path="gecko.h"></File><File path="input.cpp"></File><File path="input.h"></File><File path="lstub.cpp"></File><File path="lstub.h"></File><File path="main.cpp"></File><File path="main.h"></File><File path="menu.cpp"></File><File path="menu.h"></File><File path="StartUpProcess.cpp"></File><File path="StartUpProcess.h"></File><File path="svnrev.c"></File><File path="svnrev.h"></File><File path="sys.cpp"></File><File path="sys.h"></File><File path="video.cpp"></File><File path="video.h"></File><File path="wpad.c"></File><File path="wpad.h"></File><File path="wstring.cpp"></File><File path="wstring.hpp"></File><File path="ZipFile.cpp"></File><File path="ZipFile.h"></File></MagicFolder></Project>
\ No newline at end of file
+<Project name="gui"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="source" path="source\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="banner" path="banner\"><File path="OpeningBNR.cpp"></File><File path="OpeningBNR.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="cheats" path="cheats\"><File path="cheatmenu.cpp"></File><File path="cheatmenu.h"></File><File path="gct.cpp"></File><File path="gct.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="Controls" path="Controls\"><File path="DeviceHandler.cpp"></File><File path="DeviceHandler.hpp"></File><File path="PartitionHandle.cpp"></File><File path="PartitionHandle.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="FileOperations" path="FileOperations\"><File path="DirList.cpp"></File><File path="DirList.h"></File><File path="File.cpp"></File><File path="File.hpp"></File><File path="fileops.cpp"></File><File path="fileops.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="fonts" path="fonts\"><File path="clock.ttf"></File><File path="font.ttf"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="homebrewboot" path="homebrewboot\"><File path="BootHomebrew.cpp"></File><File path="BootHomebrew.h"></File><File path="dolloader.c"></File><File path="dolloader.h"></File><File path="HomebrewBrowse.cpp"></File><File path="HomebrewBrowse.h"></File><File path="HomebrewBrowser.cpp"></File><File path="HomebrewBrowser.hpp"></File><File path="HomebrewFiles.cpp"></File><File path="HomebrewFiles.h"></File><File path="HomebrewXML.cpp"></File><File path="HomebrewXML.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="ImageOperations" path="ImageOperations\"><File path="TextureConverter.c"></File><File path="TextureConverter.h"></File><File path="TplImage.cpp"></File><File path="TplImage.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="images" path="images\"><File path="abcIcon.png"></File><File path="addressbar_textbox.png"></File><File path="arrangeCarousel.png"></File><File path="arrangeCarousel_gray.png"></File><File path="arrangeGrid.png"></File><File path="arrangeGrid_gray.png"></File><File path="arrangeList.png"></File><File path="arrangeList_gray.png"></File><File path="background.png"></File><File path="balanceboard.png"></File><File path="balanceboardR.png"></File><File path="battery.png"></File><File path="battery_bar.png"></File><File path="battery_bar_red.png"></File><File path="battery_bar_white.png"></File><File path="battery_red.png"></File><File path="battery_white.png"></File><File path="bg_browser.png"></File><File path="bg_browser_selection.png"></File><File path="bg_options.png"></File><File path="bg_options_entry.png"></File><File path="bg_options_settings.png"></File><File path="browser.png"></File><File path="browser_over.png"></File><File path="button_dialogue_box.png"></File><File path="button_install.png"></File><File path="button_install_over.png"></File><File path="cero_a.png"></File><File path="cero_b.png"></File><File path="cero_c.png"></File><File path="cero_d.png"></File><File path="cero_z.png"></File><File path="Channel_btn.png"></File><File path="classiccontroller.png"></File><File path="classiccontrollerR.png"></File><File path="closebutton.png"></File><File path="credits_bg.png"></File><File path="credits_button.png"></File><File path="credits_button_over.png"></File><File path="dancepad.png"></File><File path="dancepadR.png"></File><File path="dialogue_box.png"></File><File path="dialogue_box_startgame.png"></File><File path="drums.png"></File><File path="drumsR.png"></File><File path="dvd.png"></File><File path="dvd_gray.png"></File><File path="esrb_ao.png"></File><File path="esrb_e.png"></File><File path="esrb_ec.png"></File><File path="esrb_eten.png"></File><File path="esrb_m.png"></File><File path="esrb_t.png"></File><File path="exit_bottom.png"></File><File path="exit_bottom_over.png"></File><File path="exit_button.png"></File><File path="exit_top.png"></File><File path="exit_top_over.png"></File><File path="favIcon.png"></File><File path="favIcon_gray.png"></File><File path="favorite.png"></File><File path="gameinfo1.png"></File><File path="gameinfo1a.png"></File><File path="gameinfo2.png"></File><File path="gameinfo2a.png"></File><File path="gcncontroller.png"></File><File path="gcncontrollerR.png"></File><File path="guitar.png"></File><File path="guitarR.png"></File><File path="gxlogo.png"></File><File path="icon_folder.png"></File><File path="keyboard_backspace_over.png"></File><File path="keyboard_clear_over.png"></File><File path="keyboard_key.png"></File><File path="keyboard_key_over.png"></File><File path="keyboard_largekey_over.png"></File><File path="keyboard_mediumkey_over.png"></File><File path="keyboard_textbox.png"></File><File path="little_star.png"></File><File path="lock.png"></File><File path="lock_gray.png"></File><File path="menu_button.png"></File><File path="menu_button_over.png"></File><File path="microphone.png"></File><File path="microphoneR.png"></File><File path="motionplus.png"></File><File path="motionplusR.png"></File><File path="new.png"></File><File path="nintendods.png"></File><File path="nintendodsR.png"></File><File path="nocover.png"></File><File path="nocoverFlat.png"></File><File path="nodisc.png"></File><File path="norating.png"></File><File path="not_favorite.png"></File><File path="nunchuk.png"></File><File path="nunchukR.png"></File><File path="pageindicator.png"></File><File path="pegi_12.png"></File><File path="pegi_16.png"></File><File path="pegi_18.png"></File><File path="pegi_3.png"></File><File path="pegi_7.png"></File><File path="playCountIcon.png"></File><File path="player1_point.png"></File><File path="player2_point.png"></File><File path="player3_point.png"></File><File path="player4_point.png"></File><File path="progressbar.png"></File><File path="progressbar_empty.png"></File><File path="progressbar_outline.png"></File><File path="rankIcon.png"></File><File path="rplayer1_point.png"></File><File path="rplayer2_point.png"></File><File path="rplayer3_point.png"></File><File path="rplayer4_point.png"></File><File path="scrollbar.png"></File><File path="scrollbar_arrowdown.png"></File><File path="scrollbar_arrowup.png"></File><File path="scrollbar_box.png"></File><File path="sdcard.png"></File><File path="sdcard_over.png"></File><File path="searchIcon.png"></File><File path="searchIcon_gray.png"></File><File path="settings_background.png"></File><File path="settings_button.png"></File><File path="settings_button_over.png"></File><File path="settings_title.png"></File><File path="settings_title_over.png"></File><File path="startgame_arrow_left.png"></File><File path="startgame_arrow_right.png"></File><File path="theme_box.png"></File><File path="theme_dialogue_box.png"></File><File path="tooltip_left.png"></File><File path="tooltip_right.png"></File><File path="tooltip_tile.png"></File><File path="unlock.png"></File><File path="unlock_gray.png"></File><File path="usbport.png"></File><File path="wbackground.png"></File><File path="wdialogue_box_startgame.png"></File><File path="wheel.png"></File><File path="wheelR.png"></File><File path="wifi1.png"></File><File path="wifi12.png"></File><File path="wifi16.png"></File><File path="wifi2.png"></File><File path="wifi3.png"></File><File path="wifi32.png"></File><File path="wifi4.png"></File><File path="wifi8.png"></File><File path="Wifi_btn.png"></File><File path="wiimote.png"></File><File path="Wiimote1.png"></File><File path="Wiimote2.png"></File><File path="Wiimote3.png"></File><File path="Wiimote4.png"></File><File path="wiimote_poweroff.png"></File><File path="wiimote_poweroff_over.png"></File><File path="wiispeak.png"></File><File path="wiispeakR.png"></File><File path="zapper.png"></File><File path="zapperR.png"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="language" path="language\"><File path="gettext.c"></File><File path="gettext.h"></File><File path="UpdateLanguage.cpp"></File><File path="UpdateLanguage.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libs" path="libs\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libext2fs" path="libext2fs\"><File path="ext2_frag.h"></File><File path="libcustomext2fs.a"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libfat" path="libfat\"><File path="fatfile_frag.h"></File><File path="libcustomfat.a"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libntfs" path="libntfs\"><File path="libcustomntfs.a"></File><File path="ntfsfile_frag.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libwbfs" path="libwbfs\"><File path="libwbfs.c"></File><File path="libwbfs.h"></File><File path="libwbfs_os.h"></File><File path="rijndael.c"></File><File path="wiidisc.c"></File><File path="wiidisc.h"></File></MagicFolder></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libwiigui" path="libwiigui\"><File path="gui.h"></File><File path="gui_button.cpp"></File><File path="gui_customoptionbrowser.cpp"></File><File path="gui_customoptionbrowser.h"></File><File path="gui_diskcover.cpp"></File><File path="gui_diskcover.h"></File><File path="gui_element.cpp"></File><File path="gui_filebrowser.cpp"></File><File path="gui_gamebrowser.cpp"></File><File path="gui_gamebrowser.h"></File><File path="gui_gamecarousel.cpp"></File><File path="gui_gamecarousel.h"></File><File path="gui_gamegrid.cpp"></File><File path="gui_gamegrid.h"></File><File path="gui_image.cpp"></File><File path="gui_imagedata.cpp"></File><File path="gui_imagedata.h"></File><File path="gui_image_async.cpp"></File><File path="gui_image_async.h"></File><File path="gui_keyboard.cpp"></File><File path="gui_numpad.cpp"></File><File path="gui_optionbrowser.cpp"></File><File path="gui_searchbar.cpp"></File><File path="gui_searchbar.h"></File><File path="gui_text.cpp"></File><File path="gui_tooltip.cpp"></File><File path="gui_trigger.cpp"></File><File path="gui_window.cpp"></File><File path="LoadCoverImage.cpp"></File><File path="LoadCoverImage.h"></File><File path="OptionList.cpp"></File><File path="OptionList.hpp"></File><File path="Text.cpp"></File><File path="Text.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="memory" path="memory\"><File path="mem2.cpp"></File><File path="mem2.h"></File><File path="mem2alloc.cpp"></File><File path="mem2alloc.hpp"></File><File path="memory.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="menu" path="menu\"><File path="GameBrowseMenu.cpp"></File><File path="GameBrowseMenu.hpp"></File><File path="menus.h"></File><File path="menu_install.cpp"></File><File path="menu_partition_selection.cpp"></File><File path="WDMMenu.cpp"></File><File path="WDMMenu.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="mload" path="mload\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="modules" path="modules\"><File path="dip_plugin_249.c"></File><File path="dip_plugin_249.h"></File><File path="ehcmodule_5.c"></File><File path="ehcmodule_5.h"></File><File path="odip_frag.c"></File><File path="odip_frag.h"></File></MagicFolder><File path="mload.c"></File><File path="mload.h"></File><File path="mload_modules.c"></File><File path="mload_modules.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="network" path="network\"><File path="CoverDownload.cpp"></File><File path="CoverDownload.h"></File><File path="dns.c"></File><File path="dns.h"></File><File path="FileDownloader.cpp"></File><File path="FileDownloader.h"></File><File path="HTML_Stream.cpp"></File><File path="HTML_Stream.h"></File><File path="http.c"></File><File path="http.h"></File><File path="networkops.cpp"></File><File path="networkops.h"></File><File path="update.cpp"></File><File path="update.h"></File><File path="URL_List.cpp"></File><File path="URL_List.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="patches" path="patches\"><File path="codehandler.h"></File><File path="codehandleronly.h"></File><File path="dolpatcher.c"></File><File path="dolpatcher.h"></File><File path="dvd_broadway.c"></File><File path="dvd_broadway.h"></File><File path="fst.c"></File><File path="fst.h"></File><File path="fwrite_patch.h"></File><File path="gamepatches.c"></File><File path="gamepatches.h"></File><File path="geckomenu.h"></File><File path="kenobiwii.h"></File><File path="multidol.c"></File><File path="multidol.h"></File><File path="patchcode.c"></File><File path="patchcode.h"></File><File path="patchhook.S"></File><File path="ppc.h"></File><File path="wip.cpp"></File><File path="wip.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="prompts" path="prompts\"><File path="DiscBrowser.cpp"></File><File path="DiscBrowser.h"></File><File path="filebrowser.cpp"></File><File path="filebrowser.h"></File><File path="gameinfo.cpp"></File><File path="gameinfo.h"></File><File path="GameWindow.cpp"></File><File path="GameWindow.hpp"></File><File path="ProgressWindow.cpp"></File><File path="ProgressWindow.h"></File><File path="PromptWindows.cpp"></File><File path="PromptWindows.h"></File><File path="TitleBrowser.cpp"></File><File path="TitleBrowser.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="settings" path="settings\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="menus" path="menus\"><File path="CustomPathsSM.cpp"></File><File path="CustomPathsSM.hpp"></File><File path="FlyingButtonsMenu.cpp"></File><File path="FlyingButtonsMenu.hpp"></File><File path="GameLoadSM.cpp"></File><File path="GameLoadSM.hpp"></File><File path="GameSettingsMenu.cpp"></File><File path="GameSettingsMenu.hpp"></File><File path="GlobalSettings.cpp"></File><File path="GlobalSettings.hpp"></File><File path="GUISettingsMenu.cpp"></File><File path="GUISettingsMenu.hpp"></File><File path="LoaderSettings.cpp"></File><File path="LoaderSettings.hpp"></File><File path="ParentalControlSM.cpp"></File><File path="ParentalControlSM.hpp"></File><File path="SettingsMenu.cpp"></File><File path="SettingsMenu.hpp"></File><File path="SoundSettingsMenu.cpp"></File><File path="SoundSettingsMenu.hpp"></File><File path="UninstallSM.cpp"></File><File path="UninstallSM.hpp"></File></MagicFolder><File path="CGameSettings.cpp"></File><File path="CGameSettings.h"></File><File path="CGameStatistics.cpp"></File><File path="CGameStatistics.h"></File><File path="CSettings.cpp"></File><File path="CSettings.h"></File><File path="GameTitles.cpp"></File><File path="GameTitles.h"></File><File path="newtitles.cpp"></File><File path="newtitles.h"></File><File path="Settings.cpp"></File><File path="Settings.h"></File><File path="SettingsEnums.h"></File><File path="SettingsPrompts.cpp"></File><File path="SettingsPrompts.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="SoundOperations" path="SoundOperations\"><File path="AifDecoder.cpp"></File><File path="AifDecoder.hpp"></File><File path="BNSDecoder.cpp"></File><File path="BNSDecoder.hpp"></File><File path="BufferCircle.cpp"></File><File path="BufferCircle.hpp"></File><File path="gui_bgm.cpp"></File><File path="gui_bgm.h"></File><File path="gui_sound.cpp"></File><File path="gui_sound.h"></File><File path="Mp3Decoder.cpp"></File><File path="Mp3Decoder.hpp"></File><File path="OggDecoder.cpp"></File><File path="OggDecoder.hpp"></File><File path="SoundDecoder.cpp"></File><File path="SoundDecoder.hpp"></File><File path="SoundHandler.cpp"></File><File path="SoundHandler.hpp"></File><File path="WavDecoder.cpp"></File><File path="WavDecoder.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="sounds" path="sounds\"><File path="bg_music.ogg"></File><File path="button_click.wav"></File><File path="button_click2.wav"></File><File path="button_over.wav"></File><File path="credits_music.ogg"></File><File path="menuin.ogg"></File><File path="menuout.ogg"></File><File path="success.ogg"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="system" path="system\"><File path="IosLoader.cpp"></File><File path="IosLoader.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="themes" path="themes\"><File path="CTheme.cpp"></File><File path="CTheme.h"></File><File path="gettheme.c"></File><File path="gettheme.h"></File><File path="Resources.cpp"></File><File path="Resources.h"></File><File path="ThemeDownloader.cpp"></File><File path="ThemeDownloader.h"></File><File path="Theme_List.cpp"></File><File path="Theme_List.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="usbloader" path="usbloader\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="wbfs" path="wbfs\"><File path="wbfs_base.cpp"></File><File path="wbfs_base.h"></File><File path="wbfs_ext.cpp"></File><File path="wbfs_ext.h"></File><File path="wbfs_fat.cpp"></File><File path="wbfs_fat.h"></File><File path="wbfs_ntfs.cpp"></File><File path="wbfs_ntfs.h"></File><File path="wbfs_rw.c"></File><File path="wbfs_rw.h"></File><File path="wbfs_wbfs.cpp"></File><File path="wbfs_wbfs.h"></File></MagicFolder><File path="alternatedol.c"></File><File path="alternatedol.h"></File><File path="AlternateDOLOffsets.cpp"></File><File path="AlternateDOLOffsets.h"></File><File path="apploader.c"></File><File path="apploader.h"></File><File path="disc.c"></File><File path="disc.h"></File><File path="frag.c"></File><File path="frag.h"></File><File path="fstfile.c"></File><File path="fstfile.h"></File><File path="GameBooter.cpp"></File><File path="GameBooter.h"></File><File path="GameList.cpp"></File><File path="GameList.h"></File><File path="GetMissingGameFiles.cpp"></File><File path="GetMissingGameFiles.hpp"></File><File path="MountGamePartition.cpp"></File><File path="MountGamePartition.h"></File><File path="playlog.c"></File><File path="playlog.h"></File><File path="sdhc.c"></File><File path="sdhc.h"></File><File path="splits.c"></File><File path="splits.h"></File><File path="usbstorage2.c"></File><File path="usbstorage2.h"></File><File path="utils.c"></File><File path="utils.h"></File><File path="wbfs.cpp"></File><File path="wbfs.h"></File><File path="WDMFile.cpp"></File><File path="WDMFile.hpp"></File><File path="wdvd.c"></File><File path="wdvd.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="utils" path="utils\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="minizip" path="minizip\"><File path="miniunz.c"></File><File path="miniunz.h"></File></MagicFolder><File path="Callback.hpp"></File><File path="encrypt.c"></File><File path="encrypt.h"></File><File path="MD5.c"></File><File path="MD5.h"></File><File path="PasswordCheck.cpp"></File><File path="PasswordCheck.h"></File><File path="ResourceManager.cpp"></File><File path="ResourceManager.h"></File><File path="rockout.cpp"></File><File path="rockout.h"></File><File path="ShowError.cpp"></File><File path="ShowError.h"></File><File path="StringTools.c"></File><File path="StringTools.h"></File><File path="ThreadedTask.cpp"></File><File path="ThreadedTask.hpp"></File><File path="timer.c"></File><File path="timer.h"></File><File path="tools.h"></File><File path="uncompress.c"></File><File path="uncompress.h"></File><File path="wifi_gecko.c"></File><File path="wifi_gecko.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="wad" path="wad\"><File path="nandtitle.cpp"></File><File path="nandtitle.h"></File><File path="utils.h"></File><File path="wad.cpp"></File><File path="wad.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="xml" path="xml\"><File path="WiiTDB.cpp"></File><File path="WiiTDB.hpp"></File><File path="xml.cpp"></File><File path="xml.h"></File></MagicFolder><File path="audio.cpp"></File><File path="audio.h"></File><File path="buildtype.h"></File><File path="filelist.h"></File><File path="FreeTypeGX.cpp"></File><File path="FreeTypeGX.h"></File><File path="gecko.c"></File><File path="gecko.h"></File><File path="input.cpp"></File><File path="input.h"></File><File path="lstub.cpp"></File><File path="lstub.h"></File><File path="main.cpp"></File><File path="main.h"></File><File path="menu.cpp"></File><File path="menu.h"></File><File path="StartUpProcess.cpp"></File><File path="StartUpProcess.h"></File><File path="svnrev.c"></File><File path="svnrev.h"></File><File path="sys.cpp"></File><File path="sys.h"></File><File path="video.cpp"></File><File path="video.h"></File><File path="wpad.c"></File><File path="wpad.h"></File><File path="wstring.cpp"></File><File path="wstring.hpp"></File><File path="ZipFile.cpp"></File><File path="ZipFile.h"></File></MagicFolder></Project>
\ No newline at end of file
diff --git a/source/GameBootProcess.h b/source/GameBootProcess.h
deleted file mode 100644
index 5c8106d4..00000000
--- a/source/GameBootProcess.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef GAMEBOOTPROCESS_H_
-#define GAMEBOOTPROCESS_H_
-
-int BootGame(const char * gameID);
-
-#endif
diff --git a/source/main.cpp b/source/main.cpp
index 0f49434b..bababfd2 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -28,8 +28,8 @@
 #include "wad/nandtitle.h"
 #include "system/IosLoader.h"
 #include "usbloader/MountGamePartition.h"
+#include "usbloader/GameBooter.hpp"
 #include "StartUpProcess.h"
-#include "GameBootProcess.h"
 #include "sys.h"
 
 extern "C"
@@ -44,7 +44,7 @@ static int QuickGameBoot(const char * gameID)
     Settings.Load();
 
     MountGamePartition(false);
-    return BootGame(gameID);
+    return GameBooter::BootGame(gameID);
 }
 
 int main(int argc, char *argv[])
diff --git a/source/menu/GameBrowseMenu.cpp b/source/menu/GameBrowseMenu.cpp
index fcaf8ca3..b4851ca8 100644
--- a/source/menu/GameBrowseMenu.cpp
+++ b/source/menu/GameBrowseMenu.cpp
@@ -12,6 +12,7 @@
 #include "usbloader/wdvd.h"
 #include "usbloader/GameList.h"
 #include "usbloader/AlternateDOLOffsets.h"
+#include "usbloader/GameBooter.hpp"
 #include "network/networkops.h"
 #include "network/update.h"
 #include "network/CoverDownload.h"
@@ -22,7 +23,6 @@
 #include "settings/CGameSettings.h"
 #include "settings/GameTitles.h"
 #include "utils/StringTools.h"
-#include "GameBootProcess.h"
 #include "utils/rockout.h"
 #include "utils/ShowError.h"
 #include "utils/tools.h"
@@ -1308,7 +1308,7 @@ int GameBrowseMenu::OpenClickedGame()
                 GameStatistics.Save();
 
                 //Just calling that shuts down everything and starts game
-                BootGame(IDfull);
+                GameBooter::BootGame(IDfull);
             }
         }
         else if (choice == 2)
diff --git a/source/GameBootProcess.cpp b/source/usbloader/GameBooter.cpp
similarity index 63%
rename from source/GameBootProcess.cpp
rename to source/usbloader/GameBooter.cpp
index 456fc3f7..1da79c48 100644
--- a/source/GameBootProcess.cpp
+++ b/source/usbloader/GameBooter.cpp
@@ -24,6 +24,7 @@
 #include "wad/nandtitle.h"
 #include "menu/menus.h"
 #include "memory/memory.h"
+#include "GameBooter.hpp"
 #include "sys.h"
 
 //appentrypoint has to be global because of asm
@@ -33,9 +34,17 @@ struct discHdr *dvdheader = NULL;
 extern int wbfs_part_fs;
 extern int mountMethod;
 
+int GameBooter::BootGCMode()
+{
+    ExitApp();
+    gprintf("\nLoading BC for GameCube");
+    WII_Initialize();
+    return WII_LaunchTitle(0x0000000100000100ULL);
+}
 
-static u32 BootPartition(char * dolpath, u8 videoselected, u8 languageChoice, u8 cheat, u8 vipatch, u8 patchcountrystring,
-	u8 alternatedol, u32 alternatedoloffset, u32 returnTo, u8 fix002)
+
+u32 GameBooter::BootPartition(char * dolpath, u8 videoselected, u8 languageChoice, u8 cheat, u8 vipatch, u8 patchcountrystring,
+                              u8 alternatedol, u32 alternatedoloffset, u32 returnTo, u8 fix002)
 {
     gprintf("booting partition IOS %u r%u\n", IOS_GetVersion(), IOS_GetRevision());
     entry_point p_entry;
@@ -73,24 +82,8 @@ static u32 BootPartition(char * dolpath, u8 videoselected, u8 languageChoice, u8
     return (u32) p_entry;
 }
 
-int BootGame(const char * gameID)
+int GameBooter::FindDiscHeader(const char * gameID, struct discHdr &gameHeader)
 {
-    if(!gameID || strlen(gameID) < 3)
-        return -1;
-
-    if (mountMethod == 2)
-    {
-        ExitApp();
-        gprintf("\nLoading BC for GameCube");
-        WII_Initialize();
-        return WII_LaunchTitle(0x0000000100000100ULL);
-    }
-
-    AppCleanUp();
-
-    gprintf("\tSettings.partition: %d\n", Settings.partition);
-
-    struct discHdr gameHeader;
     gameList.LoadUnfiltered();
 
     if(mountMethod == 0 && !gameList.GetDiscHeader(gameID))
@@ -111,8 +104,92 @@ int BootGame(const char * gameID)
 
     gameList.clear();
 
-    int ret = 0;
+    return 0;
+}
 
+void GameBooter::SetupAltDOL(u8 * gameID, u8 &alternatedol, u32 &alternatedoloffset)
+{
+    if(alternatedol == ALT_DOL_ON_LAUNCH)
+    {
+        alternatedol = ALT_DOL_FROM_GAME;
+        alternatedoloffset = WDMMenu::GetAlternateDolOffset();
+    }
+    else if(alternatedol == ALT_DOL_DEFAULT)
+    {
+        alternatedol = ALT_DOL_FROM_GAME;
+        alternatedoloffset = defaultAltDol((char *) gameID);
+    }
+
+    if(alternatedol == ALT_DOL_FROM_GAME && alternatedoloffset == 0)
+        alternatedol = OFF;
+}
+
+int GameBooter::SetupDisc(u8 * gameID)
+{
+    if (mountMethod)
+    {
+        gprintf("\tloading DVD\n");
+        return Disc_Open();
+    }
+
+    int ret = -1;
+
+    if(IosLoader::IsWaninkokoIOS() && IOS_GetRevision() < 18)
+    {
+        gprintf("Disc_SetUSB...");
+        ret = Disc_SetUSB(gameID);
+        gprintf("%d\n", ret);
+        if(ret < 0) return ret;
+    }
+    else
+    {
+        gprintf("Loading fragment list...");
+        ret = get_frag_list(gameID);
+        gprintf("%d\n", ret);
+        if(ret < 0) return ret;
+        ret = set_frag_list(gameID);
+        if(ret < 0) return ret;
+        gprintf("\tUSB set to game\n");
+    }
+
+    gprintf("Disc_Open()...");
+    ret = Disc_Open();
+    gprintf("%d\n", ret);
+
+    return ret;
+}
+
+bool GameBooter::LoadOcarina(u8 *gameID)
+{
+    if (ocarina_load_code(gameID) > 0)
+    {
+        ocarina_do_code();
+        return true;
+    }
+
+    return false;
+}
+
+int GameBooter::BootGame(const char * gameID)
+{
+    if(!gameID || strlen(gameID) < 3)
+        return -1;
+
+    if (mountMethod == 2)
+        return BootGCMode();
+
+    AppCleanUp();
+
+    gprintf("\tSettings.partition: %d\n", Settings.partition);
+
+    struct discHdr gameHeader;
+
+    //! Find disc header in the game list first
+    int ret = FindDiscHeader(gameID, gameHeader);
+    if(ret < 0)
+        return ret;
+
+    //! Setup game configuration from game settings. If no game settings exist use global/default.
     GameCFG * game_cfg = GameSettings.GetGameCFG(gameHeader.id);
     u8 videoChoice = game_cfg->video;
     u8 languageChoice = game_cfg->language;
@@ -126,17 +203,22 @@ int BootGame(const char * gameID)
     u8 reloadblock = game_cfg->iosreloadblock;
     u8 returnToLoaderGV = game_cfg->returnTo;
 
-    if(alternatedol == ALT_DOL_ON_LAUNCH)
+    //! Prepare alternate dol settings
+    SetupAltDOL(gameHeader.id, alternatedol, alternatedoloffset);
+
+    //! Setup the return to Loader option
+    u32 channel = 0;
+    if (returnToLoaderGV)
     {
-        alternatedol = ALT_DOL_FROM_GAME;
-        alternatedoloffset = WDMMenu::GetAlternateDolOffset();
-    }
-    else if(alternatedol == ALT_DOL_DEFAULT)
-    {
-        alternatedol = ALT_DOL_FROM_GAME;
-        alternatedoloffset = defaultAltDol((char *) gameHeader.id);
+        int idx = NandTitles.FindU32(Settings.returnTo);
+        if (idx >= 0) channel = TITLE_LOWER( NandTitles.At( idx ) );
     }
 
+    //! This is temporary - C <-> C++ transfer
+    SetCheatFilepath(Settings.Cheatcodespath);
+    SetBCAFilepath(Settings.BcaCodepath);
+
+    //! Reload game settings cIOS for this game
     if(iosChoice != IOS_GetVersion())
     {
         gprintf("Reloading into game cIOS: %i...\n", iosChoice);
@@ -145,40 +227,17 @@ int BootGame(const char * gameID)
             return -1;
     }
 
-    if (!mountMethod)
-    {
-        if(IosLoader::IsWaninkokoIOS() && IOS_GetRevision() < 18)
-        {
-            gprintf("Disc_SetUSB...");
-            ret = Disc_SetUSB(gameHeader.id);
-            gprintf("%d\n", ret);
-        }
-        else
-        {
-            gprintf("Loading fragment list...");
-            ret = get_frag_list(gameHeader.id);
-            gprintf("%d\n", ret);
-            ret = set_frag_list(gameHeader.id);
-            if (ret < 0) Sys_BackToLoader();
-            gprintf("\tUSB set to game\n");
-        }
-    }
-    else
-    {
-        gprintf("\tUSB not set, loading DVD\n");
-    }
-
-    gprintf("Disc_Open()...");
-    ret = Disc_Open();
-    gprintf("%d\n", ret);
-
+    //! Setup disc in cIOS and open it
+    ret = SetupDisc(gameHeader.id);
     if (ret < 0)
         Sys_BackToLoader();
 
+    //! Load BCA data for the game
     gprintf("Loading BCA data...");
     ret = do_bca_code(gameHeader.id);
     gprintf("%d\n", ret);
 
+    //! Setup IOS reload block - only possible on Hermes cIOS
     if (reloadblock == ON && IosLoader::IsHermesIOS())
     {
         enable_ES_ioctlv_vector();
@@ -186,50 +245,36 @@ int BootGame(const char * gameID)
             mload_close();
     }
 
-    u32 channel = 0;
-    if (returnToLoaderGV)
-    {
-        int idx = NandTitles.FindU32(Settings.returnTo);
-        if (idx >= 0) channel = TITLE_LOWER( NandTitles.At( idx ) );
-    }
-
-    //This is temporary
-    SetCheatFilepath(Settings.Cheatcodespath);
-    SetBCAFilepath(Settings.BcaCodepath);
-
+    //! Load main.dol or alternative dol into memory, start the game apploader and get game entrypoint
     gprintf("\tDisc_wiiBoot\n");
-
-    /* Boot partition */
     AppEntrypoint = BootPartition(Settings.dolpath, videoChoice, languageChoice, ocarinaChoice, viChoice, countrystrings,
                         alternatedol, alternatedoloffset, channel, fix002);
 
+    //! No entrypoint found...back to HBC/SystemMenu
     if(AppEntrypoint == 0)
     {
         WDVD_ClosePartition();
         Sys_BackToLoader();
     }
 
+    //! Load Ocarina codes
     bool enablecheat = false;
-
     if (ocarinaChoice)
-    {
-        // OCARINA STUFF - FISHEARS
-        if (ocarina_load_code((u8 *) Disc_ID) > 0)
-        {
-            ocarina_do_code();
-            enablecheat = true;
-        }
-    }
+        enablecheat = LoadOcarina(gameHeader.id);
 
+    //! Shadow mload - Only needed on some games with Hermes v5.1 (Check is inside the function)
     shadow_mload();
+
+    //! Flush all caches and close up all devices
     WBFS_Close();
     DeviceHandler::DestroyInstance();
     USB_Deinitialize();
 
+    //! Modify Wii Message Board to display the game starting here
     if(Settings.PlaylogUpdate)
-        Playlog_Update((char *) Disc_ID, BNRInstance::Instance()->GetIMETTitle(CONF_GetLanguage()));
+        Playlog_Update((char *) gameHeader.id, BNRInstance::Instance()->GetIMETTitle(CONF_GetLanguage()));
 
+    //! Jump to the entrypoint of the game - the last function of the USB Loader
     gprintf("Jumping to game entrypoint: 0x%08X.\n", AppEntrypoint);
-
     return Disc_JumpToEntrypoint(videoChoice, enablecheat, WDMMenu::GetDolParameter());
 }
diff --git a/source/usbloader/GameBooter.hpp b/source/usbloader/GameBooter.hpp
new file mode 100644
index 00000000..5ecb3f8f
--- /dev/null
+++ b/source/usbloader/GameBooter.hpp
@@ -0,0 +1,20 @@
+#ifndef GAMEBOOTER_HPP_
+#define GAMEBOOTER_HPP_
+
+#include <gctypes.h>
+
+class GameBooter
+{
+    public:
+        static int BootGame(const char * gameID);
+        static int BootGCMode();
+    private:
+        static int FindDiscHeader(const char * gameID, struct discHdr &gameHeader);
+        static void SetupAltDOL(u8 * gameID, u8 &alternatedol, u32 &alternatedoloffset);
+        static int SetupDisc(u8 *gameID);
+        static bool LoadOcarina(u8 *gameID);
+        static u32 BootPartition(char * dolpath, u8 videoselected, u8 languageChoice, u8 cheat, u8 vipatch,
+                                 u8 patchcountrystring, u8 alternatedol, u32 alternatedoloffset, u32 returnTo, u8 fix002);
+};
+
+#endif