diff --git a/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
similarity index 100%
rename from AndroidManifest.xml
rename to app/src/main/AndroidManifest.xml
diff --git a/assets/boot_slot_5 b/app/src/main/assets/boot_slot_5
similarity index 100%
rename from assets/boot_slot_5
rename to app/src/main/assets/boot_slot_5
diff --git a/assets/boot_slot_6 b/app/src/main/assets/boot_slot_6
similarity index 100%
rename from assets/boot_slot_6
rename to app/src/main/assets/boot_slot_6
diff --git a/assets/boot_slot_7 b/app/src/main/assets/boot_slot_7
similarity index 100%
rename from assets/boot_slot_7
rename to app/src/main/assets/boot_slot_7
diff --git a/assets/default b/app/src/main/assets/default
similarity index 100%
rename from assets/default
rename to app/src/main/assets/default
diff --git a/src/com/froop/app/kegs/AssetImages.java b/app/src/main/java/com/froop/app/kegs/AssetImages.java
similarity index 100%
rename from src/com/froop/app/kegs/AssetImages.java
rename to app/src/main/java/com/froop/app/kegs/AssetImages.java
diff --git a/src/com/froop/app/kegs/BitmapSize.java b/app/src/main/java/com/froop/app/kegs/BitmapSize.java
similarity index 100%
rename from src/com/froop/app/kegs/BitmapSize.java
rename to app/src/main/java/com/froop/app/kegs/BitmapSize.java
diff --git a/src/com/froop/app/kegs/ConfigFile.java b/app/src/main/java/com/froop/app/kegs/ConfigFile.java
similarity index 100%
rename from src/com/froop/app/kegs/ConfigFile.java
rename to app/src/main/java/com/froop/app/kegs/ConfigFile.java
diff --git a/src/com/froop/app/kegs/CopyHelper.java b/app/src/main/java/com/froop/app/kegs/CopyHelper.java
similarity index 100%
rename from src/com/froop/app/kegs/CopyHelper.java
rename to app/src/main/java/com/froop/app/kegs/CopyHelper.java
diff --git a/src/com/froop/app/kegs/DownloadHelper.java b/app/src/main/java/com/froop/app/kegs/DownloadHelper.java
similarity index 100%
rename from src/com/froop/app/kegs/DownloadHelper.java
rename to app/src/main/java/com/froop/app/kegs/DownloadHelper.java
diff --git a/src/com/froop/app/kegs/ErrorDialogFragment.java b/app/src/main/java/com/froop/app/kegs/ErrorDialogFragment.java
similarity index 100%
rename from src/com/froop/app/kegs/ErrorDialogFragment.java
rename to app/src/main/java/com/froop/app/kegs/ErrorDialogFragment.java
diff --git a/src/com/froop/app/kegs/Event.java b/app/src/main/java/com/froop/app/kegs/Event.java
similarity index 100%
rename from src/com/froop/app/kegs/Event.java
rename to app/src/main/java/com/froop/app/kegs/Event.java
diff --git a/src/com/froop/app/kegs/InputFix.java b/app/src/main/java/com/froop/app/kegs/InputFix.java
similarity index 100%
rename from src/com/froop/app/kegs/InputFix.java
rename to app/src/main/java/com/froop/app/kegs/InputFix.java
diff --git a/src/com/froop/app/kegs/KegsKeyboard.java b/app/src/main/java/com/froop/app/kegs/KegsKeyboard.java
similarity index 100%
rename from src/com/froop/app/kegs/KegsKeyboard.java
rename to app/src/main/java/com/froop/app/kegs/KegsKeyboard.java
diff --git a/src/com/froop/app/kegs/KegsMain.java b/app/src/main/java/com/froop/app/kegs/KegsMain.java
similarity index 100%
rename from src/com/froop/app/kegs/KegsMain.java
rename to app/src/main/java/com/froop/app/kegs/KegsMain.java
diff --git a/src/com/froop/app/kegs/KegsRenderer.java b/app/src/main/java/com/froop/app/kegs/KegsRenderer.java
similarity index 100%
rename from src/com/froop/app/kegs/KegsRenderer.java
rename to app/src/main/java/com/froop/app/kegs/KegsRenderer.java
diff --git a/src/com/froop/app/kegs/KegsThread.java b/app/src/main/java/com/froop/app/kegs/KegsThread.java
similarity index 100%
rename from src/com/froop/app/kegs/KegsThread.java
rename to app/src/main/java/com/froop/app/kegs/KegsThread.java
diff --git a/src/com/froop/app/kegs/KegsViewGL.java b/app/src/main/java/com/froop/app/kegs/KegsViewGL.java
similarity index 100%
rename from src/com/froop/app/kegs/KegsViewGL.java
rename to app/src/main/java/com/froop/app/kegs/KegsViewGL.java
diff --git a/src/com/froop/app/kegs/KeyTable.java b/app/src/main/java/com/froop/app/kegs/KeyTable.java
similarity index 100%
rename from src/com/froop/app/kegs/KeyTable.java
rename to app/src/main/java/com/froop/app/kegs/KeyTable.java
diff --git a/src/com/froop/app/kegs/RomDialogFragment.java b/app/src/main/java/com/froop/app/kegs/RomDialogFragment.java
similarity index 100%
rename from src/com/froop/app/kegs/RomDialogFragment.java
rename to app/src/main/java/com/froop/app/kegs/RomDialogFragment.java
diff --git a/src/com/froop/app/kegs/SpecialProgressDialog.java b/app/src/main/java/com/froop/app/kegs/SpecialProgressDialog.java
similarity index 100%
rename from src/com/froop/app/kegs/SpecialProgressDialog.java
rename to app/src/main/java/com/froop/app/kegs/SpecialProgressDialog.java
diff --git a/src/com/froop/app/kegs/SpecialRelativeLayout.java b/app/src/main/java/com/froop/app/kegs/SpecialRelativeLayout.java
similarity index 100%
rename from src/com/froop/app/kegs/SpecialRelativeLayout.java
rename to app/src/main/java/com/froop/app/kegs/SpecialRelativeLayout.java
diff --git a/src/com/froop/app/kegs/SpeedFragment.java b/app/src/main/java/com/froop/app/kegs/SpeedFragment.java
similarity index 100%
rename from src/com/froop/app/kegs/SpeedFragment.java
rename to app/src/main/java/com/froop/app/kegs/SpeedFragment.java
diff --git a/src/com/froop/app/kegs/SpeedSetting.java b/app/src/main/java/com/froop/app/kegs/SpeedSetting.java
similarity index 100%
rename from src/com/froop/app/kegs/SpeedSetting.java
rename to app/src/main/java/com/froop/app/kegs/SpeedSetting.java
diff --git a/src/com/froop/app/kegs/TouchJoystick.java b/app/src/main/java/com/froop/app/kegs/TouchJoystick.java
similarity index 100%
rename from src/com/froop/app/kegs/TouchJoystick.java
rename to app/src/main/java/com/froop/app/kegs/TouchJoystick.java
diff --git a/src/com/froop/app/kegs/TouchMouse.java b/app/src/main/java/com/froop/app/kegs/TouchMouse.java
similarity index 100%
rename from src/com/froop/app/kegs/TouchMouse.java
rename to app/src/main/java/com/froop/app/kegs/TouchMouse.java
diff --git a/src/com/froop/app/kegs/TouchSpecialZone.java b/app/src/main/java/com/froop/app/kegs/TouchSpecialZone.java
similarity index 100%
rename from src/com/froop/app/kegs/TouchSpecialZone.java
rename to app/src/main/java/com/froop/app/kegs/TouchSpecialZone.java
diff --git a/src/com/froop/app/kegs/diskimage/DiskImage.java b/app/src/main/java/com/froop/app/kegs/diskimage/DiskImage.java
similarity index 100%
rename from src/com/froop/app/kegs/diskimage/DiskImage.java
rename to app/src/main/java/com/froop/app/kegs/diskimage/DiskImage.java
diff --git a/src/com/froop/app/kegs/diskimage/DiskImageFragment.java b/app/src/main/java/com/froop/app/kegs/diskimage/DiskImageFragment.java
similarity index 100%
rename from src/com/froop/app/kegs/diskimage/DiskImageFragment.java
rename to app/src/main/java/com/froop/app/kegs/diskimage/DiskImageFragment.java
diff --git a/src/com/froop/app/kegs/diskimage/DiskLoader.java b/app/src/main/java/com/froop/app/kegs/diskimage/DiskLoader.java
similarity index 100%
rename from src/com/froop/app/kegs/diskimage/DiskLoader.java
rename to app/src/main/java/com/froop/app/kegs/diskimage/DiskLoader.java
diff --git a/src/com/froop/app/kegs/diskimage/SwapDiskFragment.java b/app/src/main/java/com/froop/app/kegs/diskimage/SwapDiskFragment.java
similarity index 100%
rename from src/com/froop/app/kegs/diskimage/SwapDiskFragment.java
rename to app/src/main/java/com/froop/app/kegs/diskimage/SwapDiskFragment.java
diff --git a/src/com/froop/app/kegs/diskimage/ZipDiskFragment.java b/app/src/main/java/com/froop/app/kegs/diskimage/ZipDiskFragment.java
similarity index 100%
rename from src/com/froop/app/kegs/diskimage/ZipDiskFragment.java
rename to app/src/main/java/com/froop/app/kegs/diskimage/ZipDiskFragment.java
diff --git a/jni/16inst_c.h b/app/src/main/jni/16inst_c.h
similarity index 100%
rename from jni/16inst_c.h
rename to app/src/main/jni/16inst_c.h
diff --git a/jni/8inst_c.h b/app/src/main/jni/8inst_c.h
similarity index 100%
rename from jni/8inst_c.h
rename to app/src/main/jni/8inst_c.h
diff --git a/jni/Android.mk b/app/src/main/jni/Android.mk
similarity index 100%
rename from jni/Android.mk
rename to app/src/main/jni/Android.mk
diff --git a/jni/Application.mk b/app/src/main/jni/Application.mk
similarity index 100%
rename from jni/Application.mk
rename to app/src/main/jni/Application.mk
diff --git a/jni/COPYING.txt b/app/src/main/jni/COPYING.txt
similarity index 100%
rename from jni/COPYING.txt
rename to app/src/main/jni/COPYING.txt
diff --git a/jni/adb.c b/app/src/main/jni/adb.c
similarity index 100%
rename from jni/adb.c
rename to app/src/main/jni/adb.c
diff --git a/jni/adb.h b/app/src/main/jni/adb.h
similarity index 100%
rename from jni/adb.h
rename to app/src/main/jni/adb.h
diff --git a/jni/android_driver.c b/app/src/main/jni/android_driver.c
similarity index 100%
rename from jni/android_driver.c
rename to app/src/main/jni/android_driver.c
diff --git a/jni/android_sound_driver.c b/app/src/main/jni/android_sound_driver.c
similarity index 100%
rename from jni/android_sound_driver.c
rename to app/src/main/jni/android_sound_driver.c
diff --git a/jni/clock.c b/app/src/main/jni/clock.c
similarity index 100%
rename from jni/clock.c
rename to app/src/main/jni/clock.c
diff --git a/jni/compile_time.c b/app/src/main/jni/compile_time.c
similarity index 100%
rename from jni/compile_time.c
rename to app/src/main/jni/compile_time.c
diff --git a/jni/config.h b/app/src/main/jni/config.h
similarity index 100%
rename from jni/config.h
rename to app/src/main/jni/config.h
diff --git a/jni/config_generic.c b/app/src/main/jni/config_generic.c
similarity index 100%
rename from jni/config_generic.c
rename to app/src/main/jni/config_generic.c
diff --git a/jni/config_kegs.c b/app/src/main/jni/config_kegs.c
similarity index 100%
rename from jni/config_kegs.c
rename to app/src/main/jni/config_kegs.c
diff --git a/jni/defc.h b/app/src/main/jni/defc.h
similarity index 100%
rename from jni/defc.h
rename to app/src/main/jni/defc.h
diff --git a/jni/defcomm.h b/app/src/main/jni/defcomm.h
similarity index 100%
rename from jni/defcomm.h
rename to app/src/main/jni/defcomm.h
diff --git a/jni/defs.h b/app/src/main/jni/defs.h
similarity index 100%
rename from jni/defs.h
rename to app/src/main/jni/defs.h
diff --git a/jni/defs_instr.h b/app/src/main/jni/defs_instr.h
similarity index 100%
rename from jni/defs_instr.h
rename to app/src/main/jni/defs_instr.h
diff --git a/jni/dirent-win32.h b/app/src/main/jni/dirent-win32.h
similarity index 100%
rename from jni/dirent-win32.h
rename to app/src/main/jni/dirent-win32.h
diff --git a/jni/dis.c b/app/src/main/jni/dis.c
similarity index 100%
rename from jni/dis.c
rename to app/src/main/jni/dis.c
diff --git a/jni/disas.h b/app/src/main/jni/disas.h
similarity index 100%
rename from jni/disas.h
rename to app/src/main/jni/disas.h
diff --git a/jni/engine_c.c b/app/src/main/jni/engine_c.c
similarity index 100%
rename from jni/engine_c.c
rename to app/src/main/jni/engine_c.c
diff --git a/jni/instable.h b/app/src/main/jni/instable.h
similarity index 100%
rename from jni/instable.h
rename to app/src/main/jni/instable.h
diff --git a/jni/iwm.c b/app/src/main/jni/iwm.c
similarity index 100%
rename from jni/iwm.c
rename to app/src/main/jni/iwm.c
diff --git a/jni/iwm.h b/app/src/main/jni/iwm.h
similarity index 100%
rename from jni/iwm.h
rename to app/src/main/jni/iwm.h
diff --git a/jni/iwm_35_525.h b/app/src/main/jni/iwm_35_525.h
similarity index 100%
rename from jni/iwm_35_525.h
rename to app/src/main/jni/iwm_35_525.h
diff --git a/jni/joystick_dummy.c b/app/src/main/jni/joystick_dummy.c
similarity index 100%
rename from jni/joystick_dummy.c
rename to app/src/main/jni/joystick_dummy.c
diff --git a/jni/joystick_linux.c b/app/src/main/jni/joystick_linux.c
similarity index 100%
rename from jni/joystick_linux.c
rename to app/src/main/jni/joystick_linux.c
diff --git a/jni/joystick_win.c b/app/src/main/jni/joystick_win.c
similarity index 100%
rename from jni/joystick_win.c
rename to app/src/main/jni/joystick_win.c
diff --git a/jni/kegsfont.h b/app/src/main/jni/kegsfont.h
similarity index 100%
rename from jni/kegsfont.h
rename to app/src/main/jni/kegsfont.h
diff --git a/jni/macdriver_generic.c b/app/src/main/jni/macdriver_generic.c
similarity index 100%
rename from jni/macdriver_generic.c
rename to app/src/main/jni/macdriver_generic.c
diff --git a/jni/macdriver_kegs.c b/app/src/main/jni/macdriver_kegs.c
similarity index 100%
rename from jni/macdriver_kegs.c
rename to app/src/main/jni/macdriver_kegs.c
diff --git a/jni/macsnd_driver.c b/app/src/main/jni/macsnd_driver.c
similarity index 100%
rename from jni/macsnd_driver.c
rename to app/src/main/jni/macsnd_driver.c
diff --git a/jni/moremem.c b/app/src/main/jni/moremem.c
similarity index 100%
rename from jni/moremem.c
rename to app/src/main/jni/moremem.c
diff --git a/jni/op_routs.h b/app/src/main/jni/op_routs.h
similarity index 100%
rename from jni/op_routs.h
rename to app/src/main/jni/op_routs.h
diff --git a/jni/paddles.c b/app/src/main/jni/paddles.c
similarity index 100%
rename from jni/paddles.c
rename to app/src/main/jni/paddles.c
diff --git a/jni/partls.c b/app/src/main/jni/partls.c
similarity index 100%
rename from jni/partls.c
rename to app/src/main/jni/partls.c
diff --git a/jni/prodos.h b/app/src/main/jni/prodos.h
similarity index 100%
rename from jni/prodos.h
rename to app/src/main/jni/prodos.h
diff --git a/jni/prodos_protos.h b/app/src/main/jni/prodos_protos.h
similarity index 100%
rename from jni/prodos_protos.h
rename to app/src/main/jni/prodos_protos.h
diff --git a/jni/protos.h b/app/src/main/jni/protos.h
similarity index 100%
rename from jni/protos.h
rename to app/src/main/jni/protos.h
diff --git a/jni/protos_engine_c.h b/app/src/main/jni/protos_engine_c.h
similarity index 100%
rename from jni/protos_engine_c.h
rename to app/src/main/jni/protos_engine_c.h
diff --git a/jni/protos_macdriver.h b/app/src/main/jni/protos_macdriver.h
similarity index 100%
rename from jni/protos_macdriver.h
rename to app/src/main/jni/protos_macdriver.h
diff --git a/jni/protos_macsnd_driver.h b/app/src/main/jni/protos_macsnd_driver.h
similarity index 100%
rename from jni/protos_macsnd_driver.h
rename to app/src/main/jni/protos_macsnd_driver.h
diff --git a/jni/protos_windriver.h b/app/src/main/jni/protos_windriver.h
similarity index 100%
rename from jni/protos_windriver.h
rename to app/src/main/jni/protos_windriver.h
diff --git a/jni/protos_xdriver.h b/app/src/main/jni/protos_xdriver.h
similarity index 100%
rename from jni/protos_xdriver.h
rename to app/src/main/jni/protos_xdriver.h
diff --git a/jni/scc.c b/app/src/main/jni/scc.c
similarity index 100%
rename from jni/scc.c
rename to app/src/main/jni/scc.c
diff --git a/jni/scc.h b/app/src/main/jni/scc.h
similarity index 100%
rename from jni/scc.h
rename to app/src/main/jni/scc.h
diff --git a/jni/scc_macdriver.c b/app/src/main/jni/scc_macdriver.c
similarity index 100%
rename from jni/scc_macdriver.c
rename to app/src/main/jni/scc_macdriver.c
diff --git a/jni/scc_socket_driver.c b/app/src/main/jni/scc_socket_driver.c
similarity index 100%
rename from jni/scc_socket_driver.c
rename to app/src/main/jni/scc_socket_driver.c
diff --git a/jni/scc_windriver.c b/app/src/main/jni/scc_windriver.c
similarity index 100%
rename from jni/scc_windriver.c
rename to app/src/main/jni/scc_windriver.c
diff --git a/jni/sim65816.c b/app/src/main/jni/sim65816.c
similarity index 100%
rename from jni/sim65816.c
rename to app/src/main/jni/sim65816.c
diff --git a/jni/size_c.h b/app/src/main/jni/size_c.h
similarity index 100%
rename from jni/size_c.h
rename to app/src/main/jni/size_c.h
diff --git a/jni/size_tab.h b/app/src/main/jni/size_tab.h
similarity index 100%
rename from jni/size_tab.h
rename to app/src/main/jni/size_tab.h
diff --git a/jni/smartport.c b/app/src/main/jni/smartport.c
similarity index 100%
rename from jni/smartport.c
rename to app/src/main/jni/smartport.c
diff --git a/jni/sound.c b/app/src/main/jni/sound.c
similarity index 100%
rename from jni/sound.c
rename to app/src/main/jni/sound.c
diff --git a/jni/sound.h b/app/src/main/jni/sound.h
similarity index 100%
rename from jni/sound.h
rename to app/src/main/jni/sound.h
diff --git a/jni/sound_driver.c b/app/src/main/jni/sound_driver.c
similarity index 100%
rename from jni/sound_driver.c
rename to app/src/main/jni/sound_driver.c
diff --git a/jni/superhires.h b/app/src/main/jni/superhires.h
similarity index 100%
rename from jni/superhires.h
rename to app/src/main/jni/superhires.h
diff --git a/jni/to_pro.c b/app/src/main/jni/to_pro.c
similarity index 100%
rename from jni/to_pro.c
rename to app/src/main/jni/to_pro.c
diff --git a/jni/video.c b/app/src/main/jni/video.c
similarity index 100%
rename from jni/video.c
rename to app/src/main/jni/video.c
diff --git a/jni/win32snd_driver.c b/app/src/main/jni/win32snd_driver.c
similarity index 100%
rename from jni/win32snd_driver.c
rename to app/src/main/jni/win32snd_driver.c
diff --git a/jni/win_console.c b/app/src/main/jni/win_console.c
similarity index 100%
rename from jni/win_console.c
rename to app/src/main/jni/win_console.c
diff --git a/jni/win_generic.c b/app/src/main/jni/win_generic.c
similarity index 100%
rename from jni/win_generic.c
rename to app/src/main/jni/win_generic.c
diff --git a/jni/winresource.h b/app/src/main/jni/winresource.h
similarity index 100%
rename from jni/winresource.h
rename to app/src/main/jni/winresource.h
diff --git a/jni/xdriver.c b/app/src/main/jni/xdriver.c
similarity index 100%
rename from jni/xdriver.c
rename to app/src/main/jni/xdriver.c
diff --git a/res/drawable-xhdpi/dial.png b/app/src/main/res/drawable-xhdpi/dial.png
similarity index 100%
rename from res/drawable-xhdpi/dial.png
rename to app/src/main/res/drawable-xhdpi/dial.png
diff --git a/res/drawable-xhdpi/ic_bt_keyboard_hid.png b/app/src/main/res/drawable-xhdpi/ic_bt_keyboard_hid.png
similarity index 100%
rename from res/drawable-xhdpi/ic_bt_keyboard_hid.png
rename to app/src/main/res/drawable-xhdpi/ic_bt_keyboard_hid.png
diff --git a/res/drawable-xhdpi/ic_bt_misc_hid.png b/app/src/main/res/drawable-xhdpi/ic_bt_misc_hid.png
similarity index 100%
rename from res/drawable-xhdpi/ic_bt_misc_hid.png
rename to app/src/main/res/drawable-xhdpi/ic_bt_misc_hid.png
diff --git a/res/drawable-xhdpi/ic_bt_pointing_hid.png b/app/src/main/res/drawable-xhdpi/ic_bt_pointing_hid.png
similarity index 100%
rename from res/drawable-xhdpi/ic_bt_pointing_hid.png
rename to app/src/main/res/drawable-xhdpi/ic_bt_pointing_hid.png
diff --git a/res/drawable-xhdpi/ic_dialog_alert_holo_dark.png b/app/src/main/res/drawable-xhdpi/ic_dialog_alert_holo_dark.png
similarity index 100%
rename from res/drawable-xhdpi/ic_dialog_alert_holo_dark.png
rename to app/src/main/res/drawable-xhdpi/ic_dialog_alert_holo_dark.png
diff --git a/res/drawable-xhdpi/ic_menu_save.png b/app/src/main/res/drawable-xhdpi/ic_menu_save.png
similarity index 100%
rename from res/drawable-xhdpi/ic_menu_save.png
rename to app/src/main/res/drawable-xhdpi/ic_menu_save.png
diff --git a/res/drawable-xhdpi/icon.png b/app/src/main/res/drawable-xhdpi/icon.png
similarity index 100%
rename from res/drawable-xhdpi/icon.png
rename to app/src/main/res/drawable-xhdpi/icon.png
diff --git a/res/drawable-xhdpi/jog_tab_target_green.png b/app/src/main/res/drawable-xhdpi/jog_tab_target_green.png
similarity index 100%
rename from res/drawable-xhdpi/jog_tab_target_green.png
rename to app/src/main/res/drawable-xhdpi/jog_tab_target_green.png
diff --git a/res/layout/main.xml b/app/src/main/res/layout/main.xml
similarity index 100%
rename from res/layout/main.xml
rename to app/src/main/res/layout/main.xml
diff --git a/res/menu/actions.xml b/app/src/main/res/menu/actions.xml
similarity index 100%
rename from res/menu/actions.xml
rename to app/src/main/res/menu/actions.xml
diff --git a/res/values-v11/styles.xml b/app/src/main/res/values-v11/styles.xml
similarity index 100%
rename from res/values-v11/styles.xml
rename to app/src/main/res/values-v11/styles.xml
diff --git a/res/values/colors.xml b/app/src/main/res/values/colors.xml
similarity index 100%
rename from res/values/colors.xml
rename to app/src/main/res/values/colors.xml
diff --git a/res/values/strings.xml b/app/src/main/res/values/strings.xml
similarity index 100%
rename from res/values/strings.xml
rename to app/src/main/res/values/strings.xml
diff --git a/res/values/styles.xml b/app/src/main/res/values/styles.xml
similarity index 100%
rename from res/values/styles.xml
rename to app/src/main/res/values/styles.xml