diff --git a/Android/Script/buildAssets.cmd b/Android/Script/buildAssets.cmd index 21d2c4945..e2fa62079 100644 --- a/Android/Script/buildAssets.cmd +++ b/Android/Script/buildAssets.cmd @@ -8,24 +8,29 @@ set base_dir=%cd% cd /d %origdir% echo Building Lang files -xcopy "%base_dir%/Lang" "%base_dir%/Android/assets/project64_data/Lang/" /D /I /F /Y /E +xcopy "%base_dir%/Lang" "%base_dir%/Android/app/src/main/assets/project64_data/Lang/" /D /I /F /Y /E IF %ERRORLEVEL% NEQ 0 (exit /B 1) echo Copy config files -IF NOT EXIST "%base_dir%/Android/assets/project64_data/Config/" mkdir "%base_dir%/Android/assets/project64_data/Config/" -copy "%base_dir%\Config\Audio.rdb" "%base_dir%\Android\assets\project64_data\Config\" +IF NOT EXIST "%base_dir%/Android/app/src/main/assets/project64_data/Config/" mkdir "%base_dir%/Android/app/src/main/assets/project64_data/Config/" +copy "%base_dir%\Config\Audio.rdb" "%base_dir%\Android\app\src\main\assets\project64_data\Config\" IF %ERRORLEVEL% NEQ 0 (exit /B 1) -copy "%base_dir%\Config\Video.rdb" "%base_dir%\Android\assets\project64_data\Config\" +copy "%base_dir%\Config\Video.rdb" "%base_dir%\Android\app\src\main\assets\project64_data\Config\" IF %ERRORLEVEL% NEQ 0 (exit /B 1) -copy "%base_dir%\Config\Project64.cht" "%base_dir%\Android\assets\project64_data\Config\" +copy "%base_dir%\Config\Project64.rdb" "%base_dir%\Android\app\src\main\assets\project64_data\Config\" IF %ERRORLEVEL% NEQ 0 (exit /B 1) -copy "%base_dir%\Config\Project64.rdb" "%base_dir%\Android\assets\project64_data\Config\" +copy "%base_dir%\Config\Project64.rdx" "%base_dir%\Android\app\src\main\assets\project64_data\Config\" IF %ERRORLEVEL% NEQ 0 (exit /B 1) -copy "%base_dir%\Config\Project64.rdx" "%base_dir%\Android\assets\project64_data\Config\" +IF NOT EXIST "%base_dir%/Android/app/src/main/assets/project64_data/Config/Cheats/" mkdir "%base_dir%/Android/app/src/main/assets/project64_data/Config/Cheats/" +xcopy "%base_dir%/Config/Cheats" "%base_dir%/Android/app/src/main/assets/project64_data/Config/Cheats/" /D /I /F /Y /E +IF %ERRORLEVEL% NEQ 0 (exit /B 1) + +IF NOT EXIST "%base_dir%/Android/app/src/main/assets/project64_data/Config/Enhancement/" mkdir "%base_dir%/Android/app/src/main/assets/project64_data/Config/Enhancement/" +xcopy "%base_dir%/Config/Enhancement" "%base_dir%/Android/app/src/main/assets/project64_data/Config/Enhancement/" /D /I /F /Y /E IF %ERRORLEVEL% NEQ 0 (exit /B 1) goto :end diff --git a/Android/AndroidManifest.xml b/Android/app/src/main/AndroidManifest.xml similarity index 100% rename from Android/AndroidManifest.xml rename to Android/app/src/main/AndroidManifest.xml diff --git a/Android/assets/licence.htm b/Android/app/src/main/assets/licence.htm similarity index 100% rename from Android/assets/licence.htm rename to Android/app/src/main/assets/licence.htm diff --git a/Android/assets/loading.htm b/Android/app/src/main/assets/loading.htm similarity index 100% rename from Android/assets/loading.htm rename to Android/app/src/main/assets/loading.htm diff --git a/Android/assets/project64_data/profiles/touchscreen.cfg b/Android/app/src/main/assets/project64_data/profiles/touchscreen.cfg similarity index 100% rename from Android/assets/project64_data/profiles/touchscreen.cfg rename to Android/app/src/main/assets/project64_data/profiles/touchscreen.cfg diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/.nomedia b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/.nomedia similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/.nomedia rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/.nomedia diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/analog-back.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/analog-back.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/analog-back.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/analog-back.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/analog-fore.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/analog-fore.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/analog-fore.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/analog-fore.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/analog.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/analog.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/analog.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/analog.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/buttonL-holdL.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonL-holdL.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/buttonL-holdL.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonL-holdL.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/buttonL-mask.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonL-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/buttonL-mask.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonL-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/buttonL.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonL.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/buttonL.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonL.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/buttonR-holdR.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonR-holdR.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/buttonR-holdR.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonR-holdR.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/buttonR-mask.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonR-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/buttonR-mask.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonR-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/buttonR.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonR.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/buttonR.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonR.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/buttonS-holdS.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonS-holdS.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/buttonS-holdS.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonS-holdS.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/buttonS-mask.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonS-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/buttonS-mask.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonS-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/buttonS.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonS.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/buttonS.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonS.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/buttonZ-holdZ.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonZ-holdZ.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/buttonZ-holdZ.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonZ-holdZ.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/buttonZ-mask.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonZ-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/buttonZ-mask.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonZ-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/buttonZ.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonZ.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/buttonZ.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/buttonZ.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/dpad-mask.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/dpad-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/dpad-mask.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/dpad-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/dpad.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/dpad.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/dpad.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/dpad.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/groupAB-holdA.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupAB-holdA.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/groupAB-holdA.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupAB-holdA.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/groupAB-holdB.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupAB-holdB.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/groupAB-holdB.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupAB-holdB.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/groupAB-mask.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupAB-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/groupAB-mask.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupAB-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/groupAB.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupAB.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/groupAB.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupAB.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/groupC-holdCd.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupC-holdCd.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/groupC-holdCd.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupC-holdCd.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/groupC-holdCl.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupC-holdCl.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/groupC-holdCl.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupC-holdCl.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/groupC-holdCr.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupC-holdCr.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/groupC-holdCr.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupC-holdCr.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/groupC-holdCu.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupC-holdCu.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/groupC-holdCu.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupC-holdCu.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/groupC-mask.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupC-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/groupC-mask.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupC-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/groupC.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupC.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/groupC.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/groupC.png diff --git a/Android/assets/project64_data/skins/touchscreen/Outline/skin.ini b/Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/skin.ini similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Outline/skin.ini rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Outline/skin.ini diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/.nomedia b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/.nomedia similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/.nomedia rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/.nomedia diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/analog-back.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/analog-back.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/analog-back.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/analog-back.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/analog-fore.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/analog-fore.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/analog-fore.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/analog-fore.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/analog.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/analog.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/analog.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/analog.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/buttonL-holdL.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonL-holdL.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/buttonL-holdL.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonL-holdL.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/buttonL-mask.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonL-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/buttonL-mask.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonL-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/buttonL.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonL.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/buttonL.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonL.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/buttonR-holdR.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonR-holdR.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/buttonR-holdR.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonR-holdR.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/buttonR-mask.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonR-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/buttonR-mask.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonR-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/buttonR.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonR.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/buttonR.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonR.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/buttonS-holdS.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonS-holdS.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/buttonS-holdS.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonS-holdS.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/buttonS-mask.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonS-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/buttonS-mask.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonS-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/buttonS.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonS.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/buttonS.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonS.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/buttonZ-holdZ.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonZ-holdZ.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/buttonZ-holdZ.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonZ-holdZ.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/buttonZ-mask.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonZ-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/buttonZ-mask.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonZ-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/buttonZ.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonZ.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/buttonZ.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/buttonZ.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/dpad-mask.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/dpad-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/dpad-mask.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/dpad-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/dpad.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/dpad.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/dpad.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/dpad.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/groupAB-holdA.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupAB-holdA.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/groupAB-holdA.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupAB-holdA.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/groupAB-holdB.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupAB-holdB.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/groupAB-holdB.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupAB-holdB.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/groupAB-mask.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupAB-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/groupAB-mask.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupAB-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/groupAB.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupAB.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/groupAB.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupAB.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCd.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCd.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCd.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCd.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCl.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCl.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCl.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCl.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCr.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCr.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCr.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCr.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCu.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCu.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCu.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupC-holdCu.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/groupC-mask.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupC-mask.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/groupC-mask.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupC-mask.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/groupC.png b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupC.png similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/groupC.png rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/groupC.png diff --git a/Android/assets/project64_data/skins/touchscreen/Shaded/skin.ini b/Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/skin.ini similarity index 100% rename from Android/assets/project64_data/skins/touchscreen/Shaded/skin.ini rename to Android/app/src/main/assets/project64_data/skins/touchscreen/Shaded/skin.ini diff --git a/Android/src/com/android/vending/billing/IInAppBillingService.aidl b/Android/app/src/main/java/com/android/vending/billing/IInAppBillingService.aidl similarity index 100% rename from Android/src/com/android/vending/billing/IInAppBillingService.aidl rename to Android/app/src/main/java/com/android/vending/billing/IInAppBillingService.aidl diff --git a/Android/src/emu/project64/AboutActivity.java b/Android/app/src/main/java/emu/project64/AboutActivity.java similarity index 100% rename from Android/src/emu/project64/AboutActivity.java rename to Android/app/src/main/java/emu/project64/AboutActivity.java diff --git a/Android/src/emu/project64/AboutPagerAdapter.java b/Android/app/src/main/java/emu/project64/AboutPagerAdapter.java similarity index 100% rename from Android/src/emu/project64/AboutPagerAdapter.java rename to Android/app/src/main/java/emu/project64/AboutPagerAdapter.java diff --git a/Android/src/emu/project64/AndroidDevice.java b/Android/app/src/main/java/emu/project64/AndroidDevice.java similarity index 100% rename from Android/src/emu/project64/AndroidDevice.java rename to Android/app/src/main/java/emu/project64/AndroidDevice.java diff --git a/Android/src/emu/project64/GalleryActivity.java b/Android/app/src/main/java/emu/project64/GalleryActivity.java similarity index 100% rename from Android/src/emu/project64/GalleryActivity.java rename to Android/app/src/main/java/emu/project64/GalleryActivity.java diff --git a/Android/src/emu/project64/GalleryItem.java b/Android/app/src/main/java/emu/project64/GalleryItem.java similarity index 100% rename from Android/src/emu/project64/GalleryItem.java rename to Android/app/src/main/java/emu/project64/GalleryItem.java diff --git a/Android/src/emu/project64/MenuListView.java b/Android/app/src/main/java/emu/project64/MenuListView.java similarity index 100% rename from Android/src/emu/project64/MenuListView.java rename to Android/app/src/main/java/emu/project64/MenuListView.java diff --git a/Android/src/emu/project64/Project64Application.java b/Android/app/src/main/java/emu/project64/Project64Application.java similarity index 100% rename from Android/src/emu/project64/Project64Application.java rename to Android/app/src/main/java/emu/project64/Project64Application.java diff --git a/Android/src/emu/project64/ScanRomsActivity.java b/Android/app/src/main/java/emu/project64/ScanRomsActivity.java similarity index 100% rename from Android/src/emu/project64/ScanRomsActivity.java rename to Android/app/src/main/java/emu/project64/ScanRomsActivity.java diff --git a/Android/src/emu/project64/SplashActivity.java b/Android/app/src/main/java/emu/project64/SplashActivity.java similarity index 100% rename from Android/src/emu/project64/SplashActivity.java rename to Android/app/src/main/java/emu/project64/SplashActivity.java diff --git a/Android/src/emu/project64/compat/AppCompatPreferenceActivity.java b/Android/app/src/main/java/emu/project64/compat/AppCompatPreferenceActivity.java similarity index 100% rename from Android/src/emu/project64/compat/AppCompatPreferenceActivity.java rename to Android/app/src/main/java/emu/project64/compat/AppCompatPreferenceActivity.java diff --git a/Android/src/emu/project64/dialog/ProgressDialog.java b/Android/app/src/main/java/emu/project64/dialog/ProgressDialog.java similarity index 100% rename from Android/src/emu/project64/dialog/ProgressDialog.java rename to Android/app/src/main/java/emu/project64/dialog/ProgressDialog.java diff --git a/Android/src/emu/project64/game/GameActivity.java b/Android/app/src/main/java/emu/project64/game/GameActivity.java similarity index 100% rename from Android/src/emu/project64/game/GameActivity.java rename to Android/app/src/main/java/emu/project64/game/GameActivity.java diff --git a/Android/src/emu/project64/game/GameActivityXperiaPlay.java b/Android/app/src/main/java/emu/project64/game/GameActivityXperiaPlay.java similarity index 100% rename from Android/src/emu/project64/game/GameActivityXperiaPlay.java rename to Android/app/src/main/java/emu/project64/game/GameActivityXperiaPlay.java diff --git a/Android/src/emu/project64/game/GameLifecycleHandler.java b/Android/app/src/main/java/emu/project64/game/GameLifecycleHandler.java similarity index 100% rename from Android/src/emu/project64/game/GameLifecycleHandler.java rename to Android/app/src/main/java/emu/project64/game/GameLifecycleHandler.java diff --git a/Android/src/emu/project64/game/GameMenuHandler.java b/Android/app/src/main/java/emu/project64/game/GameMenuHandler.java similarity index 100% rename from Android/src/emu/project64/game/GameMenuHandler.java rename to Android/app/src/main/java/emu/project64/game/GameMenuHandler.java diff --git a/Android/src/emu/project64/game/GameOverlay.java b/Android/app/src/main/java/emu/project64/game/GameOverlay.java similarity index 100% rename from Android/src/emu/project64/game/GameOverlay.java rename to Android/app/src/main/java/emu/project64/game/GameOverlay.java diff --git a/Android/src/emu/project64/game/GameSurface.java b/Android/app/src/main/java/emu/project64/game/GameSurface.java similarity index 100% rename from Android/src/emu/project64/game/GameSurface.java rename to Android/app/src/main/java/emu/project64/game/GameSurface.java diff --git a/Android/src/emu/project64/hack/MogaHack.java b/Android/app/src/main/java/emu/project64/hack/MogaHack.java similarity index 100% rename from Android/src/emu/project64/hack/MogaHack.java rename to Android/app/src/main/java/emu/project64/hack/MogaHack.java diff --git a/Android/src/emu/project64/inAppPurchase/IabBroadcastReceiver.java b/Android/app/src/main/java/emu/project64/inAppPurchase/IabBroadcastReceiver.java similarity index 100% rename from Android/src/emu/project64/inAppPurchase/IabBroadcastReceiver.java rename to Android/app/src/main/java/emu/project64/inAppPurchase/IabBroadcastReceiver.java diff --git a/Android/src/emu/project64/inAppPurchase/IabException.java b/Android/app/src/main/java/emu/project64/inAppPurchase/IabException.java similarity index 100% rename from Android/src/emu/project64/inAppPurchase/IabException.java rename to Android/app/src/main/java/emu/project64/inAppPurchase/IabException.java diff --git a/Android/src/emu/project64/inAppPurchase/IabHelper.java b/Android/app/src/main/java/emu/project64/inAppPurchase/IabHelper.java similarity index 100% rename from Android/src/emu/project64/inAppPurchase/IabHelper.java rename to Android/app/src/main/java/emu/project64/inAppPurchase/IabHelper.java diff --git a/Android/src/emu/project64/inAppPurchase/IabResult.java b/Android/app/src/main/java/emu/project64/inAppPurchase/IabResult.java similarity index 100% rename from Android/src/emu/project64/inAppPurchase/IabResult.java rename to Android/app/src/main/java/emu/project64/inAppPurchase/IabResult.java diff --git a/Android/src/emu/project64/inAppPurchase/Inventory.java b/Android/app/src/main/java/emu/project64/inAppPurchase/Inventory.java similarity index 100% rename from Android/src/emu/project64/inAppPurchase/Inventory.java rename to Android/app/src/main/java/emu/project64/inAppPurchase/Inventory.java diff --git a/Android/src/emu/project64/inAppPurchase/Purchase.java b/Android/app/src/main/java/emu/project64/inAppPurchase/Purchase.java similarity index 100% rename from Android/src/emu/project64/inAppPurchase/Purchase.java rename to Android/app/src/main/java/emu/project64/inAppPurchase/Purchase.java diff --git a/Android/src/emu/project64/inAppPurchase/Security.java b/Android/app/src/main/java/emu/project64/inAppPurchase/Security.java similarity index 100% rename from Android/src/emu/project64/inAppPurchase/Security.java rename to Android/app/src/main/java/emu/project64/inAppPurchase/Security.java diff --git a/Android/src/emu/project64/inAppPurchase/SkuDetails.java b/Android/app/src/main/java/emu/project64/inAppPurchase/SkuDetails.java similarity index 100% rename from Android/src/emu/project64/inAppPurchase/SkuDetails.java rename to Android/app/src/main/java/emu/project64/inAppPurchase/SkuDetails.java diff --git a/Android/src/emu/project64/input/AbstractController.java b/Android/app/src/main/java/emu/project64/input/AbstractController.java similarity index 100% rename from Android/src/emu/project64/input/AbstractController.java rename to Android/app/src/main/java/emu/project64/input/AbstractController.java diff --git a/Android/src/emu/project64/input/PeripheralController.java b/Android/app/src/main/java/emu/project64/input/PeripheralController.java similarity index 100% rename from Android/src/emu/project64/input/PeripheralController.java rename to Android/app/src/main/java/emu/project64/input/PeripheralController.java diff --git a/Android/src/emu/project64/input/TouchController.java b/Android/app/src/main/java/emu/project64/input/TouchController.java similarity index 100% rename from Android/src/emu/project64/input/TouchController.java rename to Android/app/src/main/java/emu/project64/input/TouchController.java diff --git a/Android/src/emu/project64/input/map/AxisMap.java b/Android/app/src/main/java/emu/project64/input/map/AxisMap.java similarity index 100% rename from Android/src/emu/project64/input/map/AxisMap.java rename to Android/app/src/main/java/emu/project64/input/map/AxisMap.java diff --git a/Android/src/emu/project64/input/map/InputMap.java b/Android/app/src/main/java/emu/project64/input/map/InputMap.java similarity index 100% rename from Android/src/emu/project64/input/map/InputMap.java rename to Android/app/src/main/java/emu/project64/input/map/InputMap.java diff --git a/Android/src/emu/project64/input/map/SerializableMap.java b/Android/app/src/main/java/emu/project64/input/map/SerializableMap.java similarity index 100% rename from Android/src/emu/project64/input/map/SerializableMap.java rename to Android/app/src/main/java/emu/project64/input/map/SerializableMap.java diff --git a/Android/src/emu/project64/input/map/TouchMap.java b/Android/app/src/main/java/emu/project64/input/map/TouchMap.java similarity index 100% rename from Android/src/emu/project64/input/map/TouchMap.java rename to Android/app/src/main/java/emu/project64/input/map/TouchMap.java diff --git a/Android/src/emu/project64/input/map/VisibleTouchMap.java b/Android/app/src/main/java/emu/project64/input/map/VisibleTouchMap.java similarity index 100% rename from Android/src/emu/project64/input/map/VisibleTouchMap.java rename to Android/app/src/main/java/emu/project64/input/map/VisibleTouchMap.java diff --git a/Android/src/emu/project64/input/provider/AbstractProvider.java b/Android/app/src/main/java/emu/project64/input/provider/AbstractProvider.java similarity index 100% rename from Android/src/emu/project64/input/provider/AbstractProvider.java rename to Android/app/src/main/java/emu/project64/input/provider/AbstractProvider.java diff --git a/Android/src/emu/project64/input/provider/AxisProvider.java b/Android/app/src/main/java/emu/project64/input/provider/AxisProvider.java similarity index 100% rename from Android/src/emu/project64/input/provider/AxisProvider.java rename to Android/app/src/main/java/emu/project64/input/provider/AxisProvider.java diff --git a/Android/src/emu/project64/input/provider/KeyProvider.java b/Android/app/src/main/java/emu/project64/input/provider/KeyProvider.java similarity index 100% rename from Android/src/emu/project64/input/provider/KeyProvider.java rename to Android/app/src/main/java/emu/project64/input/provider/KeyProvider.java diff --git a/Android/src/emu/project64/input/provider/MogaProvider.java b/Android/app/src/main/java/emu/project64/input/provider/MogaProvider.java similarity index 100% rename from Android/src/emu/project64/input/provider/MogaProvider.java rename to Android/app/src/main/java/emu/project64/input/provider/MogaProvider.java diff --git a/Android/src/emu/project64/jni/AudioSettingID.java b/Android/app/src/main/java/emu/project64/jni/AudioSettingID.java similarity index 100% rename from Android/src/emu/project64/jni/AudioSettingID.java rename to Android/app/src/main/java/emu/project64/jni/AudioSettingID.java diff --git a/Android/src/emu/project64/jni/LanguageStringID.java b/Android/app/src/main/java/emu/project64/jni/LanguageStringID.java similarity index 100% rename from Android/src/emu/project64/jni/LanguageStringID.java rename to Android/app/src/main/java/emu/project64/jni/LanguageStringID.java diff --git a/Android/src/emu/project64/jni/NativeConstants.java b/Android/app/src/main/java/emu/project64/jni/NativeConstants.java similarity index 100% rename from Android/src/emu/project64/jni/NativeConstants.java rename to Android/app/src/main/java/emu/project64/jni/NativeConstants.java diff --git a/Android/src/emu/project64/jni/NativeExports.java b/Android/app/src/main/java/emu/project64/jni/NativeExports.java similarity index 100% rename from Android/src/emu/project64/jni/NativeExports.java rename to Android/app/src/main/java/emu/project64/jni/NativeExports.java diff --git a/Android/src/emu/project64/jni/NativeInput.java b/Android/app/src/main/java/emu/project64/jni/NativeInput.java similarity index 100% rename from Android/src/emu/project64/jni/NativeInput.java rename to Android/app/src/main/java/emu/project64/jni/NativeInput.java diff --git a/Android/src/emu/project64/jni/NativeVideo.java b/Android/app/src/main/java/emu/project64/jni/NativeVideo.java similarity index 100% rename from Android/src/emu/project64/jni/NativeVideo.java rename to Android/app/src/main/java/emu/project64/jni/NativeVideo.java diff --git a/Android/src/emu/project64/jni/NativeXperiaTouchpad.java b/Android/app/src/main/java/emu/project64/jni/NativeXperiaTouchpad.java similarity index 100% rename from Android/src/emu/project64/jni/NativeXperiaTouchpad.java rename to Android/app/src/main/java/emu/project64/jni/NativeXperiaTouchpad.java diff --git a/Android/src/emu/project64/jni/SettingsID.java b/Android/app/src/main/java/emu/project64/jni/SettingsID.java similarity index 100% rename from Android/src/emu/project64/jni/SettingsID.java rename to Android/app/src/main/java/emu/project64/jni/SettingsID.java diff --git a/Android/src/emu/project64/jni/SystemEvent.java b/Android/app/src/main/java/emu/project64/jni/SystemEvent.java similarity index 100% rename from Android/src/emu/project64/jni/SystemEvent.java rename to Android/app/src/main/java/emu/project64/jni/SystemEvent.java diff --git a/Android/src/emu/project64/jni/UISettingID.java b/Android/app/src/main/java/emu/project64/jni/UISettingID.java similarity index 100% rename from Android/src/emu/project64/jni/UISettingID.java rename to Android/app/src/main/java/emu/project64/jni/UISettingID.java diff --git a/Android/src/emu/project64/jni/VideoSettingID.java b/Android/app/src/main/java/emu/project64/jni/VideoSettingID.java similarity index 100% rename from Android/src/emu/project64/jni/VideoSettingID.java rename to Android/app/src/main/java/emu/project64/jni/VideoSettingID.java diff --git a/Android/src/emu/project64/persistent/ConfigFile.java b/Android/app/src/main/java/emu/project64/persistent/ConfigFile.java similarity index 100% rename from Android/src/emu/project64/persistent/ConfigFile.java rename to Android/app/src/main/java/emu/project64/persistent/ConfigFile.java diff --git a/Android/src/emu/project64/profile/ControllerProfileActivity.java b/Android/app/src/main/java/emu/project64/profile/ControllerProfileActivity.java similarity index 100% rename from Android/src/emu/project64/profile/ControllerProfileActivity.java rename to Android/app/src/main/java/emu/project64/profile/ControllerProfileActivity.java diff --git a/Android/src/emu/project64/profile/Profile.java b/Android/app/src/main/java/emu/project64/profile/Profile.java similarity index 100% rename from Android/src/emu/project64/profile/Profile.java rename to Android/app/src/main/java/emu/project64/profile/Profile.java diff --git a/Android/src/emu/project64/settings/AdvancedFragment.java b/Android/app/src/main/java/emu/project64/settings/AdvancedFragment.java similarity index 100% rename from Android/src/emu/project64/settings/AdvancedFragment.java rename to Android/app/src/main/java/emu/project64/settings/AdvancedFragment.java diff --git a/Android/src/emu/project64/settings/AudioFragment.java b/Android/app/src/main/java/emu/project64/settings/AudioFragment.java similarity index 100% rename from Android/src/emu/project64/settings/AudioFragment.java rename to Android/app/src/main/java/emu/project64/settings/AudioFragment.java diff --git a/Android/src/emu/project64/settings/BaseSettingsFragment.java b/Android/app/src/main/java/emu/project64/settings/BaseSettingsFragment.java similarity index 100% rename from Android/src/emu/project64/settings/BaseSettingsFragment.java rename to Android/app/src/main/java/emu/project64/settings/BaseSettingsFragment.java diff --git a/Android/src/emu/project64/settings/GameListFragment.java b/Android/app/src/main/java/emu/project64/settings/GameListFragment.java similarity index 100% rename from Android/src/emu/project64/settings/GameListFragment.java rename to Android/app/src/main/java/emu/project64/settings/GameListFragment.java diff --git a/Android/src/emu/project64/settings/GameSettingsActivity.java b/Android/app/src/main/java/emu/project64/settings/GameSettingsActivity.java similarity index 100% rename from Android/src/emu/project64/settings/GameSettingsActivity.java rename to Android/app/src/main/java/emu/project64/settings/GameSettingsActivity.java diff --git a/Android/src/emu/project64/settings/GameSettingsFragment.java b/Android/app/src/main/java/emu/project64/settings/GameSettingsFragment.java similarity index 100% rename from Android/src/emu/project64/settings/GameSettingsFragment.java rename to Android/app/src/main/java/emu/project64/settings/GameSettingsFragment.java diff --git a/Android/src/emu/project64/settings/GamepadScreenFragment.java b/Android/app/src/main/java/emu/project64/settings/GamepadScreenFragment.java similarity index 100% rename from Android/src/emu/project64/settings/GamepadScreenFragment.java rename to Android/app/src/main/java/emu/project64/settings/GamepadScreenFragment.java diff --git a/Android/src/emu/project64/settings/InputFragment.java b/Android/app/src/main/java/emu/project64/settings/InputFragment.java similarity index 100% rename from Android/src/emu/project64/settings/InputFragment.java rename to Android/app/src/main/java/emu/project64/settings/InputFragment.java diff --git a/Android/src/emu/project64/settings/LogLevelPreference.java b/Android/app/src/main/java/emu/project64/settings/LogLevelPreference.java similarity index 100% rename from Android/src/emu/project64/settings/LogLevelPreference.java rename to Android/app/src/main/java/emu/project64/settings/LogLevelPreference.java diff --git a/Android/src/emu/project64/settings/LoggingAudio.java b/Android/app/src/main/java/emu/project64/settings/LoggingAudio.java similarity index 100% rename from Android/src/emu/project64/settings/LoggingAudio.java rename to Android/app/src/main/java/emu/project64/settings/LoggingAudio.java diff --git a/Android/src/emu/project64/settings/LoggingProject64Core.java b/Android/app/src/main/java/emu/project64/settings/LoggingProject64Core.java similarity index 100% rename from Android/src/emu/project64/settings/LoggingProject64Core.java rename to Android/app/src/main/java/emu/project64/settings/LoggingProject64Core.java diff --git a/Android/src/emu/project64/settings/LoggingVideo.java b/Android/app/src/main/java/emu/project64/settings/LoggingVideo.java similarity index 100% rename from Android/src/emu/project64/settings/LoggingVideo.java rename to Android/app/src/main/java/emu/project64/settings/LoggingVideo.java diff --git a/Android/src/emu/project64/settings/SeekBarPreference.java b/Android/app/src/main/java/emu/project64/settings/SeekBarPreference.java similarity index 100% rename from Android/src/emu/project64/settings/SeekBarPreference.java rename to Android/app/src/main/java/emu/project64/settings/SeekBarPreference.java diff --git a/Android/src/emu/project64/settings/SeekBarPreferencePreferenceDialogFragmentCompat.java b/Android/app/src/main/java/emu/project64/settings/SeekBarPreferencePreferenceDialogFragmentCompat.java similarity index 100% rename from Android/src/emu/project64/settings/SeekBarPreferencePreferenceDialogFragmentCompat.java rename to Android/app/src/main/java/emu/project64/settings/SeekBarPreferencePreferenceDialogFragmentCompat.java diff --git a/Android/src/emu/project64/settings/SettingsActivity.java b/Android/app/src/main/java/emu/project64/settings/SettingsActivity.java similarity index 100% rename from Android/src/emu/project64/settings/SettingsActivity.java rename to Android/app/src/main/java/emu/project64/settings/SettingsActivity.java diff --git a/Android/src/emu/project64/settings/SettingsFragment.java b/Android/app/src/main/java/emu/project64/settings/SettingsFragment.java similarity index 100% rename from Android/src/emu/project64/settings/SettingsFragment.java rename to Android/app/src/main/java/emu/project64/settings/SettingsFragment.java diff --git a/Android/src/emu/project64/settings/TouchScreenFragment.java b/Android/app/src/main/java/emu/project64/settings/TouchScreenFragment.java similarity index 100% rename from Android/src/emu/project64/settings/TouchScreenFragment.java rename to Android/app/src/main/java/emu/project64/settings/TouchScreenFragment.java diff --git a/Android/src/emu/project64/settings/TwoLinesListPreference.java b/Android/app/src/main/java/emu/project64/settings/TwoLinesListPreference.java similarity index 100% rename from Android/src/emu/project64/settings/TwoLinesListPreference.java rename to Android/app/src/main/java/emu/project64/settings/TwoLinesListPreference.java diff --git a/Android/src/emu/project64/settings/TwoLinesListPreferenceDialogFragmentCompat.java b/Android/app/src/main/java/emu/project64/settings/TwoLinesListPreferenceDialogFragmentCompat.java similarity index 100% rename from Android/src/emu/project64/settings/TwoLinesListPreferenceDialogFragmentCompat.java rename to Android/app/src/main/java/emu/project64/settings/TwoLinesListPreferenceDialogFragmentCompat.java diff --git a/Android/src/emu/project64/settings/VideoFragment.java b/Android/app/src/main/java/emu/project64/settings/VideoFragment.java similarity index 100% rename from Android/src/emu/project64/settings/VideoFragment.java rename to Android/app/src/main/java/emu/project64/settings/VideoFragment.java diff --git a/Android/src/emu/project64/task/ExtractAssetsTask.java b/Android/app/src/main/java/emu/project64/task/ExtractAssetsTask.java similarity index 100% rename from Android/src/emu/project64/task/ExtractAssetsTask.java rename to Android/app/src/main/java/emu/project64/task/ExtractAssetsTask.java diff --git a/Android/src/emu/project64/util/DeviceUtil.java b/Android/app/src/main/java/emu/project64/util/DeviceUtil.java similarity index 100% rename from Android/src/emu/project64/util/DeviceUtil.java rename to Android/app/src/main/java/emu/project64/util/DeviceUtil.java diff --git a/Android/src/emu/project64/util/FileUtil.java b/Android/app/src/main/java/emu/project64/util/FileUtil.java similarity index 100% rename from Android/src/emu/project64/util/FileUtil.java rename to Android/app/src/main/java/emu/project64/util/FileUtil.java diff --git a/Android/src/emu/project64/util/Image.java b/Android/app/src/main/java/emu/project64/util/Image.java similarity index 100% rename from Android/src/emu/project64/util/Image.java rename to Android/app/src/main/java/emu/project64/util/Image.java diff --git a/Android/src/emu/project64/util/Notifier.java b/Android/app/src/main/java/emu/project64/util/Notifier.java similarity index 100% rename from Android/src/emu/project64/util/Notifier.java rename to Android/app/src/main/java/emu/project64/util/Notifier.java diff --git a/Android/src/emu/project64/util/SafeMethods.java b/Android/app/src/main/java/emu/project64/util/SafeMethods.java similarity index 100% rename from Android/src/emu/project64/util/SafeMethods.java rename to Android/app/src/main/java/emu/project64/util/SafeMethods.java diff --git a/Android/src/emu/project64/util/Strings.java b/Android/app/src/main/java/emu/project64/util/Strings.java similarity index 100% rename from Android/src/emu/project64/util/Strings.java rename to Android/app/src/main/java/emu/project64/util/Strings.java diff --git a/Android/src/emu/project64/util/Utility.java b/Android/app/src/main/java/emu/project64/util/Utility.java similarity index 100% rename from Android/src/emu/project64/util/Utility.java rename to Android/app/src/main/java/emu/project64/util/Utility.java diff --git a/Android/res/drawable-hdpi/ic_arrow_d.png b/Android/app/src/main/res/drawable-hdpi/ic_arrow_d.png similarity index 100% rename from Android/res/drawable-hdpi/ic_arrow_d.png rename to Android/app/src/main/res/drawable-hdpi/ic_arrow_d.png diff --git a/Android/res/drawable-hdpi/ic_arrow_l.png b/Android/app/src/main/res/drawable-hdpi/ic_arrow_l.png similarity index 100% rename from Android/res/drawable-hdpi/ic_arrow_l.png rename to Android/app/src/main/res/drawable-hdpi/ic_arrow_l.png diff --git a/Android/res/drawable-hdpi/ic_arrow_r.png b/Android/app/src/main/res/drawable-hdpi/ic_arrow_r.png similarity index 100% rename from Android/res/drawable-hdpi/ic_arrow_r.png rename to Android/app/src/main/res/drawable-hdpi/ic_arrow_r.png diff --git a/Android/res/drawable-hdpi/ic_arrow_u.png b/Android/app/src/main/res/drawable-hdpi/ic_arrow_u.png similarity index 100% rename from Android/res/drawable-hdpi/ic_arrow_u.png rename to Android/app/src/main/res/drawable-hdpi/ic_arrow_u.png diff --git a/Android/res/drawable-hdpi/ic_box.png b/Android/app/src/main/res/drawable-hdpi/ic_box.png similarity index 100% rename from Android/res/drawable-hdpi/ic_box.png rename to Android/app/src/main/res/drawable-hdpi/ic_box.png diff --git a/Android/res/drawable-hdpi/ic_bug.png b/Android/app/src/main/res/drawable-hdpi/ic_bug.png similarity index 100% rename from Android/res/drawable-hdpi/ic_bug.png rename to Android/app/src/main/res/drawable-hdpi/ic_bug.png diff --git a/Android/res/drawable-hdpi/ic_check.png b/Android/app/src/main/res/drawable-hdpi/ic_check.png similarity index 100% rename from Android/res/drawable-hdpi/ic_check.png rename to Android/app/src/main/res/drawable-hdpi/ic_check.png diff --git a/Android/res/drawable-hdpi/ic_controller.png b/Android/app/src/main/res/drawable-hdpi/ic_controller.png similarity index 100% rename from Android/res/drawable-hdpi/ic_controller.png rename to Android/app/src/main/res/drawable-hdpi/ic_controller.png diff --git a/Android/res/drawable-hdpi/ic_debug.png b/Android/app/src/main/res/drawable-hdpi/ic_debug.png similarity index 100% rename from Android/res/drawable-hdpi/ic_debug.png rename to Android/app/src/main/res/drawable-hdpi/ic_debug.png diff --git a/Android/res/drawable-hdpi/ic_discord.png b/Android/app/src/main/res/drawable-hdpi/ic_discord.png similarity index 100% rename from Android/res/drawable-hdpi/ic_discord.png rename to Android/app/src/main/res/drawable-hdpi/ic_discord.png diff --git a/Android/res/drawable-hdpi/ic_folder.png b/Android/app/src/main/res/drawable-hdpi/ic_folder.png similarity index 100% rename from Android/res/drawable-hdpi/ic_folder.png rename to Android/app/src/main/res/drawable-hdpi/ic_folder.png diff --git a/Android/res/drawable-hdpi/ic_gamepad.png b/Android/app/src/main/res/drawable-hdpi/ic_gamepad.png similarity index 100% rename from Android/res/drawable-hdpi/ic_gamepad.png rename to Android/app/src/main/res/drawable-hdpi/ic_gamepad.png diff --git a/Android/res/drawable-hdpi/ic_lock.png b/Android/app/src/main/res/drawable-hdpi/ic_lock.png similarity index 100% rename from Android/res/drawable-hdpi/ic_lock.png rename to Android/app/src/main/res/drawable-hdpi/ic_lock.png diff --git a/Android/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_dark.png b/Android/app/src/main/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_dark.png similarity index 100% rename from Android/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_dark.png rename to Android/app/src/main/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_dark.png diff --git a/Android/res/drawable-hdpi/ic_phone.png b/Android/app/src/main/res/drawable-hdpi/ic_phone.png similarity index 100% rename from Android/res/drawable-hdpi/ic_phone.png rename to Android/app/src/main/res/drawable-hdpi/ic_phone.png diff --git a/Android/res/drawable-hdpi/ic_picture.png b/Android/app/src/main/res/drawable-hdpi/ic_picture.png similarity index 100% rename from Android/res/drawable-hdpi/ic_picture.png rename to Android/app/src/main/res/drawable-hdpi/ic_picture.png diff --git a/Android/res/drawable-hdpi/ic_play.png b/Android/app/src/main/res/drawable-hdpi/ic_play.png similarity index 100% rename from Android/res/drawable-hdpi/ic_play.png rename to Android/app/src/main/res/drawable-hdpi/ic_play.png diff --git a/Android/res/drawable-hdpi/ic_refresh.png b/Android/app/src/main/res/drawable-hdpi/ic_refresh.png similarity index 100% rename from Android/res/drawable-hdpi/ic_refresh.png rename to Android/app/src/main/res/drawable-hdpi/ic_refresh.png diff --git a/Android/res/drawable-hdpi/ic_review.png b/Android/app/src/main/res/drawable-hdpi/ic_review.png similarity index 100% rename from Android/res/drawable-hdpi/ic_review.png rename to Android/app/src/main/res/drawable-hdpi/ic_review.png diff --git a/Android/res/drawable-hdpi/ic_search.png b/Android/app/src/main/res/drawable-hdpi/ic_search.png similarity index 100% rename from Android/res/drawable-hdpi/ic_search.png rename to Android/app/src/main/res/drawable-hdpi/ic_search.png diff --git a/Android/res/drawable-hdpi/ic_sliders.png b/Android/app/src/main/res/drawable-hdpi/ic_sliders.png similarity index 100% rename from Android/res/drawable-hdpi/ic_sliders.png rename to Android/app/src/main/res/drawable-hdpi/ic_sliders.png diff --git a/Android/res/drawable-hdpi/ic_speaker.png b/Android/app/src/main/res/drawable-hdpi/ic_speaker.png similarity index 100% rename from Android/res/drawable-hdpi/ic_speaker.png rename to Android/app/src/main/res/drawable-hdpi/ic_speaker.png diff --git a/Android/res/drawable-hdpi/ic_storage.png b/Android/app/src/main/res/drawable-hdpi/ic_storage.png similarity index 100% rename from Android/res/drawable-hdpi/ic_storage.png rename to Android/app/src/main/res/drawable-hdpi/ic_storage.png diff --git a/Android/res/drawable-hdpi/ic_undo.png b/Android/app/src/main/res/drawable-hdpi/ic_undo.png similarity index 100% rename from Android/res/drawable-hdpi/ic_undo.png rename to Android/app/src/main/res/drawable-hdpi/ic_undo.png diff --git a/Android/res/drawable-hdpi/icon.png b/Android/app/src/main/res/drawable-hdpi/icon.png similarity index 100% rename from Android/res/drawable-hdpi/icon.png rename to Android/app/src/main/res/drawable-hdpi/icon.png diff --git a/Android/res/drawable-ldpi/ic_menu_moreoverflow_normal_holo_dark.png b/Android/app/src/main/res/drawable-ldpi/ic_menu_moreoverflow_normal_holo_dark.png similarity index 100% rename from Android/res/drawable-ldpi/ic_menu_moreoverflow_normal_holo_dark.png rename to Android/app/src/main/res/drawable-ldpi/ic_menu_moreoverflow_normal_holo_dark.png diff --git a/Android/res/drawable-ldpi/icon.png b/Android/app/src/main/res/drawable-ldpi/icon.png similarity index 100% rename from Android/res/drawable-ldpi/icon.png rename to Android/app/src/main/res/drawable-ldpi/icon.png diff --git a/Android/res/drawable-mdpi/ic_about.png b/Android/app/src/main/res/drawable-mdpi/ic_about.png similarity index 100% rename from Android/res/drawable-mdpi/ic_about.png rename to Android/app/src/main/res/drawable-mdpi/ic_about.png diff --git a/Android/res/drawable-mdpi/ic_arrow_d.png b/Android/app/src/main/res/drawable-mdpi/ic_arrow_d.png similarity index 100% rename from Android/res/drawable-mdpi/ic_arrow_d.png rename to Android/app/src/main/res/drawable-mdpi/ic_arrow_d.png diff --git a/Android/res/drawable-mdpi/ic_arrow_l.png b/Android/app/src/main/res/drawable-mdpi/ic_arrow_l.png similarity index 100% rename from Android/res/drawable-mdpi/ic_arrow_l.png rename to Android/app/src/main/res/drawable-mdpi/ic_arrow_l.png diff --git a/Android/res/drawable-mdpi/ic_arrow_r.png b/Android/app/src/main/res/drawable-mdpi/ic_arrow_r.png similarity index 100% rename from Android/res/drawable-mdpi/ic_arrow_r.png rename to Android/app/src/main/res/drawable-mdpi/ic_arrow_r.png diff --git a/Android/res/drawable-mdpi/ic_arrow_u.png b/Android/app/src/main/res/drawable-mdpi/ic_arrow_u.png similarity index 100% rename from Android/res/drawable-mdpi/ic_arrow_u.png rename to Android/app/src/main/res/drawable-mdpi/ic_arrow_u.png diff --git a/Android/res/drawable-mdpi/ic_box.png b/Android/app/src/main/res/drawable-mdpi/ic_box.png similarity index 100% rename from Android/res/drawable-mdpi/ic_box.png rename to Android/app/src/main/res/drawable-mdpi/ic_box.png diff --git a/Android/res/drawable-mdpi/ic_bug.png b/Android/app/src/main/res/drawable-mdpi/ic_bug.png similarity index 100% rename from Android/res/drawable-mdpi/ic_bug.png rename to Android/app/src/main/res/drawable-mdpi/ic_bug.png diff --git a/Android/res/drawable-mdpi/ic_check.png b/Android/app/src/main/res/drawable-mdpi/ic_check.png similarity index 100% rename from Android/res/drawable-mdpi/ic_check.png rename to Android/app/src/main/res/drawable-mdpi/ic_check.png diff --git a/Android/res/drawable-mdpi/ic_controller.png b/Android/app/src/main/res/drawable-mdpi/ic_controller.png similarity index 100% rename from Android/res/drawable-mdpi/ic_controller.png rename to Android/app/src/main/res/drawable-mdpi/ic_controller.png diff --git a/Android/res/drawable-mdpi/ic_debug.png b/Android/app/src/main/res/drawable-mdpi/ic_debug.png similarity index 100% rename from Android/res/drawable-mdpi/ic_debug.png rename to Android/app/src/main/res/drawable-mdpi/ic_debug.png diff --git a/Android/res/drawable-mdpi/ic_discord.png b/Android/app/src/main/res/drawable-mdpi/ic_discord.png similarity index 100% rename from Android/res/drawable-mdpi/ic_discord.png rename to Android/app/src/main/res/drawable-mdpi/ic_discord.png diff --git a/Android/res/drawable-mdpi/ic_folder.png b/Android/app/src/main/res/drawable-mdpi/ic_folder.png similarity index 100% rename from Android/res/drawable-mdpi/ic_folder.png rename to Android/app/src/main/res/drawable-mdpi/ic_folder.png diff --git a/Android/res/drawable-mdpi/ic_gamepad.png b/Android/app/src/main/res/drawable-mdpi/ic_gamepad.png similarity index 100% rename from Android/res/drawable-mdpi/ic_gamepad.png rename to Android/app/src/main/res/drawable-mdpi/ic_gamepad.png diff --git a/Android/res/drawable-mdpi/ic_lock.png b/Android/app/src/main/res/drawable-mdpi/ic_lock.png similarity index 100% rename from Android/res/drawable-mdpi/ic_lock.png rename to Android/app/src/main/res/drawable-mdpi/ic_lock.png diff --git a/Android/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_dark.png b/Android/app/src/main/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_dark.png similarity index 100% rename from Android/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_dark.png rename to Android/app/src/main/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_dark.png diff --git a/Android/res/drawable-mdpi/ic_phone.png b/Android/app/src/main/res/drawable-mdpi/ic_phone.png similarity index 100% rename from Android/res/drawable-mdpi/ic_phone.png rename to Android/app/src/main/res/drawable-mdpi/ic_phone.png diff --git a/Android/res/drawable-mdpi/ic_picture.png b/Android/app/src/main/res/drawable-mdpi/ic_picture.png similarity index 100% rename from Android/res/drawable-mdpi/ic_picture.png rename to Android/app/src/main/res/drawable-mdpi/ic_picture.png diff --git a/Android/res/drawable-mdpi/ic_play.png b/Android/app/src/main/res/drawable-mdpi/ic_play.png similarity index 100% rename from Android/res/drawable-mdpi/ic_play.png rename to Android/app/src/main/res/drawable-mdpi/ic_play.png diff --git a/Android/res/drawable-mdpi/ic_refresh.png b/Android/app/src/main/res/drawable-mdpi/ic_refresh.png similarity index 100% rename from Android/res/drawable-mdpi/ic_refresh.png rename to Android/app/src/main/res/drawable-mdpi/ic_refresh.png diff --git a/Android/res/drawable-mdpi/ic_review.png b/Android/app/src/main/res/drawable-mdpi/ic_review.png similarity index 100% rename from Android/res/drawable-mdpi/ic_review.png rename to Android/app/src/main/res/drawable-mdpi/ic_review.png diff --git a/Android/res/drawable-mdpi/ic_search.png b/Android/app/src/main/res/drawable-mdpi/ic_search.png similarity index 100% rename from Android/res/drawable-mdpi/ic_search.png rename to Android/app/src/main/res/drawable-mdpi/ic_search.png diff --git a/Android/res/drawable-mdpi/ic_settings.png b/Android/app/src/main/res/drawable-mdpi/ic_settings.png similarity index 100% rename from Android/res/drawable-mdpi/ic_settings.png rename to Android/app/src/main/res/drawable-mdpi/ic_settings.png diff --git a/Android/res/drawable-mdpi/ic_sliders.png b/Android/app/src/main/res/drawable-mdpi/ic_sliders.png similarity index 100% rename from Android/res/drawable-mdpi/ic_sliders.png rename to Android/app/src/main/res/drawable-mdpi/ic_sliders.png diff --git a/Android/res/drawable-mdpi/ic_speaker.png b/Android/app/src/main/res/drawable-mdpi/ic_speaker.png similarity index 100% rename from Android/res/drawable-mdpi/ic_speaker.png rename to Android/app/src/main/res/drawable-mdpi/ic_speaker.png diff --git a/Android/res/drawable-mdpi/ic_storage.png b/Android/app/src/main/res/drawable-mdpi/ic_storage.png similarity index 100% rename from Android/res/drawable-mdpi/ic_storage.png rename to Android/app/src/main/res/drawable-mdpi/ic_storage.png diff --git a/Android/res/drawable-mdpi/ic_support.png b/Android/app/src/main/res/drawable-mdpi/ic_support.png similarity index 100% rename from Android/res/drawable-mdpi/ic_support.png rename to Android/app/src/main/res/drawable-mdpi/ic_support.png diff --git a/Android/res/drawable-mdpi/ic_undo.png b/Android/app/src/main/res/drawable-mdpi/ic_undo.png similarity index 100% rename from Android/res/drawable-mdpi/ic_undo.png rename to Android/app/src/main/res/drawable-mdpi/ic_undo.png diff --git a/Android/res/drawable-mdpi/icon.png b/Android/app/src/main/res/drawable-mdpi/icon.png similarity index 100% rename from Android/res/drawable-mdpi/icon.png rename to Android/app/src/main/res/drawable-mdpi/icon.png diff --git a/Android/res/drawable-nodpi/publisherlogo.9.png b/Android/app/src/main/res/drawable-nodpi/publisherlogo.9.png similarity index 100% rename from Android/res/drawable-nodpi/publisherlogo.9.png rename to Android/app/src/main/res/drawable-nodpi/publisherlogo.9.png diff --git a/Android/res/drawable-nodpi/publisherlogo_ouya.9.png b/Android/app/src/main/res/drawable-nodpi/publisherlogo_ouya.9.png similarity index 100% rename from Android/res/drawable-nodpi/publisherlogo_ouya.9.png rename to Android/app/src/main/res/drawable-nodpi/publisherlogo_ouya.9.png diff --git a/Android/res/drawable-xhdpi/ic_about.png b/Android/app/src/main/res/drawable-xhdpi/ic_about.png similarity index 100% rename from Android/res/drawable-xhdpi/ic_about.png rename to Android/app/src/main/res/drawable-xhdpi/ic_about.png diff --git a/Android/res/drawable-xhdpi/ic_arrow_l.png b/Android/app/src/main/res/drawable-xhdpi/ic_arrow_l.png similarity index 100% rename from Android/res/drawable-xhdpi/ic_arrow_l.png rename to Android/app/src/main/res/drawable-xhdpi/ic_arrow_l.png diff --git a/Android/res/drawable-xhdpi/ic_arrow_r.png b/Android/app/src/main/res/drawable-xhdpi/ic_arrow_r.png similarity index 100% rename from Android/res/drawable-xhdpi/ic_arrow_r.png rename to Android/app/src/main/res/drawable-xhdpi/ic_arrow_r.png diff --git a/Android/res/drawable-xhdpi/ic_bug.png b/Android/app/src/main/res/drawable-xhdpi/ic_bug.png similarity index 100% rename from Android/res/drawable-xhdpi/ic_bug.png rename to Android/app/src/main/res/drawable-xhdpi/ic_bug.png diff --git a/Android/res/drawable-xhdpi/ic_controller.png b/Android/app/src/main/res/drawable-xhdpi/ic_controller.png similarity index 100% rename from Android/res/drawable-xhdpi/ic_controller.png rename to Android/app/src/main/res/drawable-xhdpi/ic_controller.png diff --git a/Android/res/drawable-xhdpi/ic_debug.png b/Android/app/src/main/res/drawable-xhdpi/ic_debug.png similarity index 100% rename from Android/res/drawable-xhdpi/ic_debug.png rename to Android/app/src/main/res/drawable-xhdpi/ic_debug.png diff --git a/Android/res/drawable-xhdpi/ic_discord.png b/Android/app/src/main/res/drawable-xhdpi/ic_discord.png similarity index 100% rename from Android/res/drawable-xhdpi/ic_discord.png rename to Android/app/src/main/res/drawable-xhdpi/ic_discord.png diff --git a/Android/res/drawable-xhdpi/ic_gamepad.png b/Android/app/src/main/res/drawable-xhdpi/ic_gamepad.png similarity index 100% rename from Android/res/drawable-xhdpi/ic_gamepad.png rename to Android/app/src/main/res/drawable-xhdpi/ic_gamepad.png diff --git a/Android/res/drawable-xhdpi/ic_lock.png b/Android/app/src/main/res/drawable-xhdpi/ic_lock.png similarity index 100% rename from Android/res/drawable-xhdpi/ic_lock.png rename to Android/app/src/main/res/drawable-xhdpi/ic_lock.png diff --git a/Android/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_dark.png b/Android/app/src/main/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_dark.png similarity index 100% rename from Android/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_dark.png rename to Android/app/src/main/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_dark.png diff --git a/Android/res/drawable-xhdpi/ic_phone.png b/Android/app/src/main/res/drawable-xhdpi/ic_phone.png similarity index 100% rename from Android/res/drawable-xhdpi/ic_phone.png rename to Android/app/src/main/res/drawable-xhdpi/ic_phone.png diff --git a/Android/res/drawable-xhdpi/ic_picture.png b/Android/app/src/main/res/drawable-xhdpi/ic_picture.png similarity index 100% rename from Android/res/drawable-xhdpi/ic_picture.png rename to Android/app/src/main/res/drawable-xhdpi/ic_picture.png diff --git a/Android/res/drawable-xhdpi/ic_play.png b/Android/app/src/main/res/drawable-xhdpi/ic_play.png similarity index 100% rename from Android/res/drawable-xhdpi/ic_play.png rename to Android/app/src/main/res/drawable-xhdpi/ic_play.png diff --git a/Android/res/drawable-xhdpi/ic_refresh.png b/Android/app/src/main/res/drawable-xhdpi/ic_refresh.png similarity index 100% rename from Android/res/drawable-xhdpi/ic_refresh.png rename to Android/app/src/main/res/drawable-xhdpi/ic_refresh.png diff --git a/Android/res/drawable-xhdpi/ic_review.png b/Android/app/src/main/res/drawable-xhdpi/ic_review.png similarity index 100% rename from Android/res/drawable-xhdpi/ic_review.png rename to Android/app/src/main/res/drawable-xhdpi/ic_review.png diff --git a/Android/res/drawable-xhdpi/ic_settings.png b/Android/app/src/main/res/drawable-xhdpi/ic_settings.png similarity index 100% rename from Android/res/drawable-xhdpi/ic_settings.png rename to Android/app/src/main/res/drawable-xhdpi/ic_settings.png diff --git a/Android/res/drawable-xhdpi/ic_sliders.png b/Android/app/src/main/res/drawable-xhdpi/ic_sliders.png similarity index 100% rename from Android/res/drawable-xhdpi/ic_sliders.png rename to Android/app/src/main/res/drawable-xhdpi/ic_sliders.png diff --git a/Android/res/drawable-xhdpi/ic_speaker.png b/Android/app/src/main/res/drawable-xhdpi/ic_speaker.png similarity index 100% rename from Android/res/drawable-xhdpi/ic_speaker.png rename to Android/app/src/main/res/drawable-xhdpi/ic_speaker.png diff --git a/Android/res/drawable-xhdpi/ic_storage.png b/Android/app/src/main/res/drawable-xhdpi/ic_storage.png similarity index 100% rename from Android/res/drawable-xhdpi/ic_storage.png rename to Android/app/src/main/res/drawable-xhdpi/ic_storage.png diff --git a/Android/res/drawable-xhdpi/ic_support.png b/Android/app/src/main/res/drawable-xhdpi/ic_support.png similarity index 100% rename from Android/res/drawable-xhdpi/ic_support.png rename to Android/app/src/main/res/drawable-xhdpi/ic_support.png diff --git a/Android/res/drawable-xhdpi/ic_undo.png b/Android/app/src/main/res/drawable-xhdpi/ic_undo.png similarity index 100% rename from Android/res/drawable-xhdpi/ic_undo.png rename to Android/app/src/main/res/drawable-xhdpi/ic_undo.png diff --git a/Android/res/drawable-xhdpi/icon.png b/Android/app/src/main/res/drawable-xhdpi/icon.png similarity index 100% rename from Android/res/drawable-xhdpi/icon.png rename to Android/app/src/main/res/drawable-xhdpi/icon.png diff --git a/Android/res/drawable/analog_ring.xml b/Android/app/src/main/res/drawable/analog_ring.xml similarity index 100% rename from Android/res/drawable/analog_ring.xml rename to Android/app/src/main/res/drawable/analog_ring.xml diff --git a/Android/res/drawable/button_a.xml b/Android/app/src/main/res/drawable/button_a.xml similarity index 100% rename from Android/res/drawable/button_a.xml rename to Android/app/src/main/res/drawable/button_a.xml diff --git a/Android/res/drawable/button_apad.xml b/Android/app/src/main/res/drawable/button_apad.xml similarity index 100% rename from Android/res/drawable/button_apad.xml rename to Android/app/src/main/res/drawable/button_apad.xml diff --git a/Android/res/drawable/button_b.xml b/Android/app/src/main/res/drawable/button_b.xml similarity index 100% rename from Android/res/drawable/button_b.xml rename to Android/app/src/main/res/drawable/button_b.xml diff --git a/Android/res/drawable/button_cpad.xml b/Android/app/src/main/res/drawable/button_cpad.xml similarity index 100% rename from Android/res/drawable/button_cpad.xml rename to Android/app/src/main/res/drawable/button_cpad.xml diff --git a/Android/res/drawable/button_gray.xml b/Android/app/src/main/res/drawable/button_gray.xml similarity index 100% rename from Android/res/drawable/button_gray.xml rename to Android/app/src/main/res/drawable/button_gray.xml diff --git a/Android/res/drawable/button_start.xml b/Android/app/src/main/res/drawable/button_start.xml similarity index 100% rename from Android/res/drawable/button_start.xml rename to Android/app/src/main/res/drawable/button_start.xml diff --git a/Android/res/layout/a_pad.xml b/Android/app/src/main/res/layout/a_pad.xml similarity index 100% rename from Android/res/layout/a_pad.xml rename to Android/app/src/main/res/layout/a_pad.xml diff --git a/Android/res/layout/about_activity.xml b/Android/app/src/main/res/layout/about_activity.xml similarity index 100% rename from Android/res/layout/about_activity.xml rename to Android/app/src/main/res/layout/about_activity.xml diff --git a/Android/res/layout/about_licence.xml b/Android/app/src/main/res/layout/about_licence.xml similarity index 100% rename from Android/res/layout/about_licence.xml rename to Android/app/src/main/res/layout/about_licence.xml diff --git a/Android/res/layout/about_main.xml b/Android/app/src/main/res/layout/about_main.xml similarity index 100% rename from Android/res/layout/about_main.xml rename to Android/app/src/main/res/layout/about_main.xml diff --git a/Android/res/layout/b_pad.xml b/Android/app/src/main/res/layout/b_pad.xml similarity index 100% rename from Android/res/layout/b_pad.xml rename to Android/app/src/main/res/layout/b_pad.xml diff --git a/Android/res/layout/c_pad.xml b/Android/app/src/main/res/layout/c_pad.xml similarity index 100% rename from Android/res/layout/c_pad.xml rename to Android/app/src/main/res/layout/c_pad.xml diff --git a/Android/res/layout/controller_profile_activity.xml b/Android/app/src/main/res/layout/controller_profile_activity.xml similarity index 100% rename from Android/res/layout/controller_profile_activity.xml rename to Android/app/src/main/res/layout/controller_profile_activity.xml diff --git a/Android/res/layout/controller_profile_activity_port.xml b/Android/app/src/main/res/layout/controller_profile_activity_port.xml similarity index 100% rename from Android/res/layout/controller_profile_activity_port.xml rename to Android/app/src/main/res/layout/controller_profile_activity_port.xml diff --git a/Android/res/layout/d_pad.xml b/Android/app/src/main/res/layout/d_pad.xml similarity index 100% rename from Android/res/layout/d_pad.xml rename to Android/app/src/main/res/layout/d_pad.xml diff --git a/Android/res/layout/gallery_activity.xml b/Android/app/src/main/res/layout/gallery_activity.xml similarity index 100% rename from Android/res/layout/gallery_activity.xml rename to Android/app/src/main/res/layout/gallery_activity.xml diff --git a/Android/res/layout/gallery_item_adapter.xml b/Android/app/src/main/res/layout/gallery_item_adapter.xml similarity index 100% rename from Android/res/layout/gallery_item_adapter.xml rename to Android/app/src/main/res/layout/gallery_item_adapter.xml diff --git a/Android/res/layout/game_activity.xml b/Android/app/src/main/res/layout/game_activity.xml similarity index 100% rename from Android/res/layout/game_activity.xml rename to Android/app/src/main/res/layout/game_activity.xml diff --git a/Android/res/layout/input_text.xml b/Android/app/src/main/res/layout/input_text.xml similarity index 100% rename from Android/res/layout/input_text.xml rename to Android/app/src/main/res/layout/input_text.xml diff --git a/Android/res/layout/list_item_menu.xml b/Android/app/src/main/res/layout/list_item_menu.xml similarity index 100% rename from Android/res/layout/list_item_menu.xml rename to Android/app/src/main/res/layout/list_item_menu.xml diff --git a/Android/res/layout/list_item_two_text_icon.xml b/Android/app/src/main/res/layout/list_item_two_text_icon.xml similarity index 100% rename from Android/res/layout/list_item_two_text_icon.xml rename to Android/app/src/main/res/layout/list_item_two_text_icon.xml diff --git a/Android/res/layout/progress_dialog.xml b/Android/app/src/main/res/layout/progress_dialog.xml similarity index 100% rename from Android/res/layout/progress_dialog.xml rename to Android/app/src/main/res/layout/progress_dialog.xml diff --git a/Android/res/layout/scan_roms_activity.xml b/Android/app/src/main/res/layout/scan_roms_activity.xml similarity index 100% rename from Android/res/layout/scan_roms_activity.xml rename to Android/app/src/main/res/layout/scan_roms_activity.xml diff --git a/Android/res/layout/seek_bar_preference.xml b/Android/app/src/main/res/layout/seek_bar_preference.xml similarity index 100% rename from Android/res/layout/seek_bar_preference.xml rename to Android/app/src/main/res/layout/seek_bar_preference.xml diff --git a/Android/res/layout/settings_activity.xml b/Android/app/src/main/res/layout/settings_activity.xml similarity index 100% rename from Android/res/layout/settings_activity.xml rename to Android/app/src/main/res/layout/settings_activity.xml diff --git a/Android/res/layout/splash_activity.xml b/Android/app/src/main/res/layout/splash_activity.xml similarity index 100% rename from Android/res/layout/splash_activity.xml rename to Android/app/src/main/res/layout/splash_activity.xml diff --git a/Android/res/layout/tab_layout.xml b/Android/app/src/main/res/layout/tab_layout.xml similarity index 100% rename from Android/res/layout/tab_layout.xml rename to Android/app/src/main/res/layout/tab_layout.xml diff --git a/Android/res/layout/two_lines_list_preference_row.xml b/Android/app/src/main/res/layout/two_lines_list_preference_row.xml similarity index 100% rename from Android/res/layout/two_lines_list_preference_row.xml rename to Android/app/src/main/res/layout/two_lines_list_preference_row.xml diff --git a/Android/res/menu/gallery_activity.xml b/Android/app/src/main/res/menu/gallery_activity.xml similarity index 100% rename from Android/res/menu/gallery_activity.xml rename to Android/app/src/main/res/menu/gallery_activity.xml diff --git a/Android/res/menu/gallery_drawer.xml b/Android/app/src/main/res/menu/gallery_drawer.xml similarity index 100% rename from Android/res/menu/gallery_drawer.xml rename to Android/app/src/main/res/menu/gallery_drawer.xml diff --git a/Android/res/menu/game_activity.xml b/Android/app/src/main/res/menu/game_activity.xml similarity index 100% rename from Android/res/menu/game_activity.xml rename to Android/app/src/main/res/menu/game_activity.xml diff --git a/Android/res/values-es/strings.xml b/Android/app/src/main/res/values-es/strings.xml similarity index 100% rename from Android/res/values-es/strings.xml rename to Android/app/src/main/res/values-es/strings.xml diff --git a/Android/res/values-v11/styles.xml b/Android/app/src/main/res/values-v11/styles.xml similarity index 100% rename from Android/res/values-v11/styles.xml rename to Android/app/src/main/res/values-v11/styles.xml diff --git a/Android/res/values/attrs.xml b/Android/app/src/main/res/values/attrs.xml similarity index 100% rename from Android/res/values/attrs.xml rename to Android/app/src/main/res/values/attrs.xml diff --git a/Android/res/values/colors.xml b/Android/app/src/main/res/values/colors.xml similarity index 100% rename from Android/res/values/colors.xml rename to Android/app/src/main/res/values/colors.xml diff --git a/Android/res/values/dimens.xml b/Android/app/src/main/res/values/dimens.xml similarity index 100% rename from Android/res/values/dimens.xml rename to Android/app/src/main/res/values/dimens.xml diff --git a/Android/res/values/strings-no-translate.xml b/Android/app/src/main/res/values/strings-no-translate.xml similarity index 100% rename from Android/res/values/strings-no-translate.xml rename to Android/app/src/main/res/values/strings-no-translate.xml diff --git a/Android/res/values/strings.xml b/Android/app/src/main/res/values/strings.xml similarity index 100% rename from Android/res/values/strings.xml rename to Android/app/src/main/res/values/strings.xml diff --git a/Android/res/values/styles.xml b/Android/app/src/main/res/values/styles.xml similarity index 100% rename from Android/res/values/styles.xml rename to Android/app/src/main/res/values/styles.xml diff --git a/Android/res/xml/analytics.xml b/Android/app/src/main/res/xml/analytics.xml similarity index 100% rename from Android/res/xml/analytics.xml rename to Android/app/src/main/res/xml/analytics.xml diff --git a/Android/res/xml/game_settings.xml b/Android/app/src/main/res/xml/game_settings.xml similarity index 100% rename from Android/res/xml/game_settings.xml rename to Android/app/src/main/res/xml/game_settings.xml diff --git a/Android/res/xml/logging_audio.xml b/Android/app/src/main/res/xml/logging_audio.xml similarity index 100% rename from Android/res/xml/logging_audio.xml rename to Android/app/src/main/res/xml/logging_audio.xml diff --git a/Android/res/xml/logging_project64core.xml b/Android/app/src/main/res/xml/logging_project64core.xml similarity index 100% rename from Android/res/xml/logging_project64core.xml rename to Android/app/src/main/res/xml/logging_project64core.xml diff --git a/Android/res/xml/logging_video.xml b/Android/app/src/main/res/xml/logging_video.xml similarity index 100% rename from Android/res/xml/logging_video.xml rename to Android/app/src/main/res/xml/logging_video.xml diff --git a/Android/res/xml/setting_audio.xml b/Android/app/src/main/res/xml/setting_audio.xml similarity index 100% rename from Android/res/xml/setting_audio.xml rename to Android/app/src/main/res/xml/setting_audio.xml diff --git a/Android/res/xml/setting_gamelist.xml b/Android/app/src/main/res/xml/setting_gamelist.xml similarity index 100% rename from Android/res/xml/setting_gamelist.xml rename to Android/app/src/main/res/xml/setting_gamelist.xml diff --git a/Android/res/xml/setting_gamepad.xml b/Android/app/src/main/res/xml/setting_gamepad.xml similarity index 100% rename from Android/res/xml/setting_gamepad.xml rename to Android/app/src/main/res/xml/setting_gamepad.xml diff --git a/Android/res/xml/setting_input.xml b/Android/app/src/main/res/xml/setting_input.xml similarity index 100% rename from Android/res/xml/setting_input.xml rename to Android/app/src/main/res/xml/setting_input.xml diff --git a/Android/res/xml/setting_touch_screen.xml b/Android/app/src/main/res/xml/setting_touch_screen.xml similarity index 100% rename from Android/res/xml/setting_touch_screen.xml rename to Android/app/src/main/res/xml/setting_touch_screen.xml diff --git a/Android/res/xml/setting_video.xml b/Android/app/src/main/res/xml/setting_video.xml similarity index 100% rename from Android/res/xml/setting_video.xml rename to Android/app/src/main/res/xml/setting_video.xml diff --git a/Android/res/xml/settings.xml b/Android/app/src/main/res/xml/settings.xml similarity index 100% rename from Android/res/xml/settings.xml rename to Android/app/src/main/res/xml/settings.xml diff --git a/Android/res/xml/settings_advanced.xml b/Android/app/src/main/res/xml/settings_advanced.xml similarity index 100% rename from Android/res/xml/settings_advanced.xml rename to Android/app/src/main/res/xml/settings_advanced.xml diff --git a/Android/res/xml/settings_basic.xml b/Android/app/src/main/res/xml/settings_basic.xml similarity index 100% rename from Android/res/xml/settings_basic.xml rename to Android/app/src/main/res/xml/settings_basic.xml