diff --git a/app/src/main/jni/16inst_c.h b/app/jni/16inst_c.h
similarity index 100%
rename from app/src/main/jni/16inst_c.h
rename to app/jni/16inst_c.h
diff --git a/app/src/main/jni/8inst_c.h b/app/jni/8inst_c.h
similarity index 100%
rename from app/src/main/jni/8inst_c.h
rename to app/jni/8inst_c.h
diff --git a/app/src/main/jni/Android.mk b/app/jni/Android.mk
similarity index 100%
rename from app/src/main/jni/Android.mk
rename to app/jni/Android.mk
diff --git a/app/src/main/jni/Application.mk b/app/jni/Application.mk
similarity index 100%
rename from app/src/main/jni/Application.mk
rename to app/jni/Application.mk
diff --git a/app/src/main/jni/COPYING.txt b/app/jni/COPYING.txt
similarity index 100%
rename from app/src/main/jni/COPYING.txt
rename to app/jni/COPYING.txt
diff --git a/app/src/main/jni/adb.c b/app/jni/adb.c
similarity index 100%
rename from app/src/main/jni/adb.c
rename to app/jni/adb.c
diff --git a/app/src/main/jni/adb.h b/app/jni/adb.h
similarity index 100%
rename from app/src/main/jni/adb.h
rename to app/jni/adb.h
diff --git a/app/src/main/jni/android_driver.c b/app/jni/android_driver.c
similarity index 100%
rename from app/src/main/jni/android_driver.c
rename to app/jni/android_driver.c
diff --git a/app/src/main/jni/android_sound_driver.c b/app/jni/android_sound_driver.c
similarity index 100%
rename from app/src/main/jni/android_sound_driver.c
rename to app/jni/android_sound_driver.c
diff --git a/app/src/main/jni/clock.c b/app/jni/clock.c
similarity index 100%
rename from app/src/main/jni/clock.c
rename to app/jni/clock.c
diff --git a/app/src/main/jni/compile_time.c b/app/jni/compile_time.c
similarity index 100%
rename from app/src/main/jni/compile_time.c
rename to app/jni/compile_time.c
diff --git a/app/src/main/jni/config.h b/app/jni/config.h
similarity index 100%
rename from app/src/main/jni/config.h
rename to app/jni/config.h
diff --git a/app/src/main/jni/config_generic.c b/app/jni/config_generic.c
similarity index 100%
rename from app/src/main/jni/config_generic.c
rename to app/jni/config_generic.c
diff --git a/app/src/main/jni/config_kegs.c b/app/jni/config_kegs.c
similarity index 100%
rename from app/src/main/jni/config_kegs.c
rename to app/jni/config_kegs.c
diff --git a/app/src/main/jni/defc.h b/app/jni/defc.h
similarity index 100%
rename from app/src/main/jni/defc.h
rename to app/jni/defc.h
diff --git a/app/src/main/jni/defcomm.h b/app/jni/defcomm.h
similarity index 100%
rename from app/src/main/jni/defcomm.h
rename to app/jni/defcomm.h
diff --git a/app/src/main/jni/defs.h b/app/jni/defs.h
similarity index 100%
rename from app/src/main/jni/defs.h
rename to app/jni/defs.h
diff --git a/app/src/main/jni/defs_instr.h b/app/jni/defs_instr.h
similarity index 100%
rename from app/src/main/jni/defs_instr.h
rename to app/jni/defs_instr.h
diff --git a/app/src/main/jni/dirent-win32.h b/app/jni/dirent-win32.h
similarity index 100%
rename from app/src/main/jni/dirent-win32.h
rename to app/jni/dirent-win32.h
diff --git a/app/src/main/jni/dis.c b/app/jni/dis.c
similarity index 100%
rename from app/src/main/jni/dis.c
rename to app/jni/dis.c
diff --git a/app/src/main/jni/disas.h b/app/jni/disas.h
similarity index 100%
rename from app/src/main/jni/disas.h
rename to app/jni/disas.h
diff --git a/app/src/main/jni/engine_c.c b/app/jni/engine_c.c
similarity index 100%
rename from app/src/main/jni/engine_c.c
rename to app/jni/engine_c.c
diff --git a/app/src/main/jni/instable.h b/app/jni/instable.h
similarity index 100%
rename from app/src/main/jni/instable.h
rename to app/jni/instable.h
diff --git a/app/src/main/jni/iwm.c b/app/jni/iwm.c
similarity index 100%
rename from app/src/main/jni/iwm.c
rename to app/jni/iwm.c
diff --git a/app/src/main/jni/iwm.h b/app/jni/iwm.h
similarity index 100%
rename from app/src/main/jni/iwm.h
rename to app/jni/iwm.h
diff --git a/app/src/main/jni/iwm_35_525.h b/app/jni/iwm_35_525.h
similarity index 100%
rename from app/src/main/jni/iwm_35_525.h
rename to app/jni/iwm_35_525.h
diff --git a/app/src/main/jni/joystick_dummy.c b/app/jni/joystick_dummy.c
similarity index 100%
rename from app/src/main/jni/joystick_dummy.c
rename to app/jni/joystick_dummy.c
diff --git a/app/src/main/jni/joystick_linux.c b/app/jni/joystick_linux.c
similarity index 100%
rename from app/src/main/jni/joystick_linux.c
rename to app/jni/joystick_linux.c
diff --git a/app/src/main/jni/joystick_win.c b/app/jni/joystick_win.c
similarity index 100%
rename from app/src/main/jni/joystick_win.c
rename to app/jni/joystick_win.c
diff --git a/app/src/main/jni/kegsfont.h b/app/jni/kegsfont.h
similarity index 100%
rename from app/src/main/jni/kegsfont.h
rename to app/jni/kegsfont.h
diff --git a/app/src/main/jni/macdriver_generic.c b/app/jni/macdriver_generic.c
similarity index 100%
rename from app/src/main/jni/macdriver_generic.c
rename to app/jni/macdriver_generic.c
diff --git a/app/src/main/jni/macdriver_kegs.c b/app/jni/macdriver_kegs.c
similarity index 100%
rename from app/src/main/jni/macdriver_kegs.c
rename to app/jni/macdriver_kegs.c
diff --git a/app/src/main/jni/macsnd_driver.c b/app/jni/macsnd_driver.c
similarity index 100%
rename from app/src/main/jni/macsnd_driver.c
rename to app/jni/macsnd_driver.c
diff --git a/app/src/main/jni/moremem.c b/app/jni/moremem.c
similarity index 100%
rename from app/src/main/jni/moremem.c
rename to app/jni/moremem.c
diff --git a/app/src/main/jni/op_routs.h b/app/jni/op_routs.h
similarity index 100%
rename from app/src/main/jni/op_routs.h
rename to app/jni/op_routs.h
diff --git a/app/src/main/jni/paddles.c b/app/jni/paddles.c
similarity index 100%
rename from app/src/main/jni/paddles.c
rename to app/jni/paddles.c
diff --git a/app/src/main/jni/partls.c b/app/jni/partls.c
similarity index 100%
rename from app/src/main/jni/partls.c
rename to app/jni/partls.c
diff --git a/app/src/main/jni/prodos.h b/app/jni/prodos.h
similarity index 100%
rename from app/src/main/jni/prodos.h
rename to app/jni/prodos.h
diff --git a/app/src/main/jni/prodos_protos.h b/app/jni/prodos_protos.h
similarity index 100%
rename from app/src/main/jni/prodos_protos.h
rename to app/jni/prodos_protos.h
diff --git a/app/src/main/jni/protos.h b/app/jni/protos.h
similarity index 100%
rename from app/src/main/jni/protos.h
rename to app/jni/protos.h
diff --git a/app/src/main/jni/protos_engine_c.h b/app/jni/protos_engine_c.h
similarity index 100%
rename from app/src/main/jni/protos_engine_c.h
rename to app/jni/protos_engine_c.h
diff --git a/app/src/main/jni/protos_macdriver.h b/app/jni/protos_macdriver.h
similarity index 100%
rename from app/src/main/jni/protos_macdriver.h
rename to app/jni/protos_macdriver.h
diff --git a/app/src/main/jni/protos_macsnd_driver.h b/app/jni/protos_macsnd_driver.h
similarity index 100%
rename from app/src/main/jni/protos_macsnd_driver.h
rename to app/jni/protos_macsnd_driver.h
diff --git a/app/src/main/jni/protos_windriver.h b/app/jni/protos_windriver.h
similarity index 100%
rename from app/src/main/jni/protos_windriver.h
rename to app/jni/protos_windriver.h
diff --git a/app/src/main/jni/protos_xdriver.h b/app/jni/protos_xdriver.h
similarity index 100%
rename from app/src/main/jni/protos_xdriver.h
rename to app/jni/protos_xdriver.h
diff --git a/app/src/main/jni/scc.c b/app/jni/scc.c
similarity index 100%
rename from app/src/main/jni/scc.c
rename to app/jni/scc.c
diff --git a/app/src/main/jni/scc.h b/app/jni/scc.h
similarity index 100%
rename from app/src/main/jni/scc.h
rename to app/jni/scc.h
diff --git a/app/src/main/jni/scc_macdriver.c b/app/jni/scc_macdriver.c
similarity index 100%
rename from app/src/main/jni/scc_macdriver.c
rename to app/jni/scc_macdriver.c
diff --git a/app/src/main/jni/scc_socket_driver.c b/app/jni/scc_socket_driver.c
similarity index 100%
rename from app/src/main/jni/scc_socket_driver.c
rename to app/jni/scc_socket_driver.c
diff --git a/app/src/main/jni/scc_windriver.c b/app/jni/scc_windriver.c
similarity index 100%
rename from app/src/main/jni/scc_windriver.c
rename to app/jni/scc_windriver.c
diff --git a/app/src/main/jni/sim65816.c b/app/jni/sim65816.c
similarity index 100%
rename from app/src/main/jni/sim65816.c
rename to app/jni/sim65816.c
diff --git a/app/src/main/jni/size_c.h b/app/jni/size_c.h
similarity index 100%
rename from app/src/main/jni/size_c.h
rename to app/jni/size_c.h
diff --git a/app/src/main/jni/size_tab.h b/app/jni/size_tab.h
similarity index 100%
rename from app/src/main/jni/size_tab.h
rename to app/jni/size_tab.h
diff --git a/app/src/main/jni/smartport.c b/app/jni/smartport.c
similarity index 100%
rename from app/src/main/jni/smartport.c
rename to app/jni/smartport.c
diff --git a/app/src/main/jni/sound.c b/app/jni/sound.c
similarity index 100%
rename from app/src/main/jni/sound.c
rename to app/jni/sound.c
diff --git a/app/src/main/jni/sound.h b/app/jni/sound.h
similarity index 100%
rename from app/src/main/jni/sound.h
rename to app/jni/sound.h
diff --git a/app/src/main/jni/sound_driver.c b/app/jni/sound_driver.c
similarity index 100%
rename from app/src/main/jni/sound_driver.c
rename to app/jni/sound_driver.c
diff --git a/app/src/main/jni/superhires.h b/app/jni/superhires.h
similarity index 100%
rename from app/src/main/jni/superhires.h
rename to app/jni/superhires.h
diff --git a/app/src/main/jni/to_pro.c b/app/jni/to_pro.c
similarity index 100%
rename from app/src/main/jni/to_pro.c
rename to app/jni/to_pro.c
diff --git a/app/src/main/jni/video.c b/app/jni/video.c
similarity index 100%
rename from app/src/main/jni/video.c
rename to app/jni/video.c
diff --git a/app/src/main/jni/win32snd_driver.c b/app/jni/win32snd_driver.c
similarity index 100%
rename from app/src/main/jni/win32snd_driver.c
rename to app/jni/win32snd_driver.c
diff --git a/app/src/main/jni/win_console.c b/app/jni/win_console.c
similarity index 100%
rename from app/src/main/jni/win_console.c
rename to app/jni/win_console.c
diff --git a/app/src/main/jni/win_generic.c b/app/jni/win_generic.c
similarity index 100%
rename from app/src/main/jni/win_generic.c
rename to app/jni/win_generic.c
diff --git a/app/src/main/jni/winresource.h b/app/jni/winresource.h
similarity index 100%
rename from app/src/main/jni/winresource.h
rename to app/jni/winresource.h
diff --git a/app/src/main/jni/xdriver.c b/app/jni/xdriver.c
similarity index 100%
rename from app/src/main/jni/xdriver.c
rename to app/jni/xdriver.c