diff --git a/.gitignore b/.gitignore
index 98c1188..5a6c84d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /obj
 /libs
 /bin
+/build
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/ArchivoNarrow-Bold.ttf b/app/src/main/assets/ArchivoNarrow-Bold.ttf
similarity index 100%
rename from assets/ArchivoNarrow-Bold.ttf
rename to app/src/main/assets/ArchivoNarrow-Bold.ttf
diff --git a/assets/Asana-Math.ttf b/app/src/main/assets/Asana-Math.ttf
similarity index 100%
rename from assets/Asana-Math.ttf
rename to app/src/main/assets/Asana-Math.ttf
diff --git a/assets/hp48 b/app/src/main/assets/hp48
similarity index 100%
rename from assets/hp48
rename to app/src/main/assets/hp48
diff --git a/assets/hp48s b/app/src/main/assets/hp48s
similarity index 100%
rename from assets/hp48s
rename to app/src/main/assets/hp48s
diff --git a/assets/ram b/app/src/main/assets/ram
similarity index 100%
rename from assets/ram
rename to app/src/main/assets/ram
diff --git a/assets/rams b/app/src/main/assets/rams
similarity index 100%
rename from assets/rams
rename to app/src/main/assets/rams
diff --git a/assets/rom b/app/src/main/assets/rom
similarity index 100%
rename from assets/rom
rename to app/src/main/assets/rom
diff --git a/assets/roms b/app/src/main/assets/roms
similarity index 100%
rename from assets/roms
rename to app/src/main/assets/roms
diff --git a/src/org/ab/x48/AssetUtil.java b/app/src/main/java/org/ab/x48/AssetUtil.java
similarity index 100%
rename from src/org/ab/x48/AssetUtil.java
rename to app/src/main/java/org/ab/x48/AssetUtil.java
diff --git a/src/org/ab/x48/EmulatorThread.java b/app/src/main/java/org/ab/x48/EmulatorThread.java
similarity index 100%
rename from src/org/ab/x48/EmulatorThread.java
rename to app/src/main/java/org/ab/x48/EmulatorThread.java
diff --git a/src/org/ab/x48/HPView.java b/app/src/main/java/org/ab/x48/HPView.java
similarity index 100%
rename from src/org/ab/x48/HPView.java
rename to app/src/main/java/org/ab/x48/HPView.java
diff --git a/src/org/ab/x48/ProgListView.java b/app/src/main/java/org/ab/x48/ProgListView.java
similarity index 100%
rename from src/org/ab/x48/ProgListView.java
rename to app/src/main/java/org/ab/x48/ProgListView.java
diff --git a/src/org/ab/x48/Settings.java b/app/src/main/java/org/ab/x48/Settings.java
similarity index 100%
rename from src/org/ab/x48/Settings.java
rename to app/src/main/java/org/ab/x48/Settings.java
diff --git a/src/org/ab/x48/X48.java b/app/src/main/java/org/ab/x48/X48.java
similarity index 100%
rename from src/org/ab/x48/X48.java
rename to app/src/main/java/org/ab/x48/X48.java
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/Makefile.am b/app/src/main/jni/Makefile.am
similarity index 100%
rename from jni/Makefile.am
rename to app/src/main/jni/Makefile.am
diff --git a/jni/Makefile.in b/app/src/main/jni/Makefile.in
similarity index 100%
rename from jni/Makefile.in
rename to app/src/main/jni/Makefile.in
diff --git a/jni/X48.ad.h b/app/src/main/jni/X48.ad.h
similarity index 100%
rename from jni/X48.ad.h
rename to app/src/main/jni/X48.ad.h
diff --git a/jni/actions.c b/app/src/main/jni/actions.c
similarity index 100%
rename from jni/actions.c
rename to app/src/main/jni/actions.c
diff --git a/jni/annunc.h b/app/src/main/jni/annunc.h
similarity index 100%
rename from jni/annunc.h
rename to app/src/main/jni/annunc.h
diff --git a/jni/append.h b/app/src/main/jni/append.h
similarity index 100%
rename from jni/append.h
rename to app/src/main/jni/append.h
diff --git a/jni/binio.c b/app/src/main/jni/binio.c
similarity index 100%
rename from jni/binio.c
rename to app/src/main/jni/binio.c
diff --git a/jni/binio.h b/app/src/main/jni/binio.h
similarity index 100%
rename from jni/binio.h
rename to app/src/main/jni/binio.h
diff --git a/jni/bitmaps/A.h b/app/src/main/jni/bitmaps/A.h
similarity index 100%
rename from jni/bitmaps/A.h
rename to app/src/main/jni/bitmaps/A.h
diff --git a/jni/bitmaps/B.h b/app/src/main/jni/bitmaps/B.h
similarity index 100%
rename from jni/bitmaps/B.h
rename to app/src/main/jni/bitmaps/B.h
diff --git a/jni/bitmaps/C.h b/app/src/main/jni/bitmaps/C.h
similarity index 100%
rename from jni/bitmaps/C.h
rename to app/src/main/jni/bitmaps/C.h
diff --git a/jni/bitmaps/D.h b/app/src/main/jni/bitmaps/D.h
similarity index 100%
rename from jni/bitmaps/D.h
rename to app/src/main/jni/bitmaps/D.h
diff --git a/jni/bitmaps/E.h b/app/src/main/jni/bitmaps/E.h
similarity index 100%
rename from jni/bitmaps/E.h
rename to app/src/main/jni/bitmaps/E.h
diff --git a/jni/bitmaps/F.h b/app/src/main/jni/bitmaps/F.h
similarity index 100%
rename from jni/bitmaps/F.h
rename to app/src/main/jni/bitmaps/F.h
diff --git a/jni/bitmaps/G.h b/app/src/main/jni/bitmaps/G.h
similarity index 100%
rename from jni/bitmaps/G.h
rename to app/src/main/jni/bitmaps/G.h
diff --git a/jni/bitmaps/H.h b/app/src/main/jni/bitmaps/H.h
similarity index 100%
rename from jni/bitmaps/H.h
rename to app/src/main/jni/bitmaps/H.h
diff --git a/jni/bitmaps/I.h b/app/src/main/jni/bitmaps/I.h
similarity index 100%
rename from jni/bitmaps/I.h
rename to app/src/main/jni/bitmaps/I.h
diff --git a/jni/bitmaps/J.h b/app/src/main/jni/bitmaps/J.h
similarity index 100%
rename from jni/bitmaps/J.h
rename to app/src/main/jni/bitmaps/J.h
diff --git a/jni/bitmaps/K.h b/app/src/main/jni/bitmaps/K.h
similarity index 100%
rename from jni/bitmaps/K.h
rename to app/src/main/jni/bitmaps/K.h
diff --git a/jni/bitmaps/L.h b/app/src/main/jni/bitmaps/L.h
similarity index 100%
rename from jni/bitmaps/L.h
rename to app/src/main/jni/bitmaps/L.h
diff --git a/jni/bitmaps/M.h b/app/src/main/jni/bitmaps/M.h
similarity index 100%
rename from jni/bitmaps/M.h
rename to app/src/main/jni/bitmaps/M.h
diff --git a/jni/bitmaps/N.h b/app/src/main/jni/bitmaps/N.h
similarity index 100%
rename from jni/bitmaps/N.h
rename to app/src/main/jni/bitmaps/N.h
diff --git a/jni/bitmaps/O.h b/app/src/main/jni/bitmaps/O.h
similarity index 100%
rename from jni/bitmaps/O.h
rename to app/src/main/jni/bitmaps/O.h
diff --git a/jni/bitmaps/P.h b/app/src/main/jni/bitmaps/P.h
similarity index 100%
rename from jni/bitmaps/P.h
rename to app/src/main/jni/bitmaps/P.h
diff --git a/jni/bitmaps/Q.h b/app/src/main/jni/bitmaps/Q.h
similarity index 100%
rename from jni/bitmaps/Q.h
rename to app/src/main/jni/bitmaps/Q.h
diff --git a/jni/bitmaps/R.h b/app/src/main/jni/bitmaps/R.h
similarity index 100%
rename from jni/bitmaps/R.h
rename to app/src/main/jni/bitmaps/R.h
diff --git a/jni/bitmaps/S.h b/app/src/main/jni/bitmaps/S.h
similarity index 100%
rename from jni/bitmaps/S.h
rename to app/src/main/jni/bitmaps/S.h
diff --git a/jni/bitmaps/T.h b/app/src/main/jni/bitmaps/T.h
similarity index 100%
rename from jni/bitmaps/T.h
rename to app/src/main/jni/bitmaps/T.h
diff --git a/jni/bitmaps/U.h b/app/src/main/jni/bitmaps/U.h
similarity index 100%
rename from jni/bitmaps/U.h
rename to app/src/main/jni/bitmaps/U.h
diff --git a/jni/bitmaps/V.h b/app/src/main/jni/bitmaps/V.h
similarity index 100%
rename from jni/bitmaps/V.h
rename to app/src/main/jni/bitmaps/V.h
diff --git a/jni/bitmaps/W.h b/app/src/main/jni/bitmaps/W.h
similarity index 100%
rename from jni/bitmaps/W.h
rename to app/src/main/jni/bitmaps/W.h
diff --git a/jni/bitmaps/X.h b/app/src/main/jni/bitmaps/X.h
similarity index 100%
rename from jni/bitmaps/X.h
rename to app/src/main/jni/bitmaps/X.h
diff --git a/jni/bitmaps/Y.h b/app/src/main/jni/bitmaps/Y.h
similarity index 100%
rename from jni/bitmaps/Y.h
rename to app/src/main/jni/bitmaps/Y.h
diff --git a/jni/bitmaps/Z.h b/app/src/main/jni/bitmaps/Z.h
similarity index 100%
rename from jni/bitmaps/Z.h
rename to app/src/main/jni/bitmaps/Z.h
diff --git a/jni/bitmaps/alpha.h b/app/src/main/jni/bitmaps/alpha.h
similarity index 100%
rename from jni/bitmaps/alpha.h
rename to app/src/main/jni/bitmaps/alpha.h
diff --git a/jni/bitmaps/angle.h b/app/src/main/jni/bitmaps/angle.h
similarity index 100%
rename from jni/bitmaps/angle.h
rename to app/src/main/jni/bitmaps/angle.h
diff --git a/jni/bitmaps/angle_gx.h b/app/src/main/jni/bitmaps/angle_gx.h
similarity index 100%
rename from jni/bitmaps/angle_gx.h
rename to app/src/main/jni/bitmaps/angle_gx.h
diff --git a/jni/bitmaps/ann_alpha.h b/app/src/main/jni/bitmaps/ann_alpha.h
similarity index 100%
rename from jni/bitmaps/ann_alpha.h
rename to app/src/main/jni/bitmaps/ann_alpha.h
diff --git a/jni/bitmaps/ann_battery.h b/app/src/main/jni/bitmaps/ann_battery.h
similarity index 100%
rename from jni/bitmaps/ann_battery.h
rename to app/src/main/jni/bitmaps/ann_battery.h
diff --git a/jni/bitmaps/ann_busy.h b/app/src/main/jni/bitmaps/ann_busy.h
similarity index 100%
rename from jni/bitmaps/ann_busy.h
rename to app/src/main/jni/bitmaps/ann_busy.h
diff --git a/jni/bitmaps/ann_io.h b/app/src/main/jni/bitmaps/ann_io.h
similarity index 100%
rename from jni/bitmaps/ann_io.h
rename to app/src/main/jni/bitmaps/ann_io.h
diff --git a/jni/bitmaps/ann_left.h b/app/src/main/jni/bitmaps/ann_left.h
similarity index 100%
rename from jni/bitmaps/ann_left.h
rename to app/src/main/jni/bitmaps/ann_left.h
diff --git a/jni/bitmaps/ann_right.h b/app/src/main/jni/bitmaps/ann_right.h
similarity index 100%
rename from jni/bitmaps/ann_right.h
rename to app/src/main/jni/bitmaps/ann_right.h
diff --git a/jni/bitmaps/arrow.h b/app/src/main/jni/bitmaps/arrow.h
similarity index 100%
rename from jni/bitmaps/arrow.h
rename to app/src/main/jni/bitmaps/arrow.h
diff --git a/jni/bitmaps/arrow_gx.h b/app/src/main/jni/bitmaps/arrow_gx.h
similarity index 100%
rename from jni/bitmaps/arrow_gx.h
rename to app/src/main/jni/bitmaps/arrow_gx.h
diff --git a/jni/bitmaps/blank.h b/app/src/main/jni/bitmaps/blank.h
similarity index 100%
rename from jni/bitmaps/blank.h
rename to app/src/main/jni/bitmaps/blank.h
diff --git a/jni/bitmaps/bracket_gx.h b/app/src/main/jni/bitmaps/bracket_gx.h
similarity index 100%
rename from jni/bitmaps/bracket_gx.h
rename to app/src/main/jni/bitmaps/bracket_gx.h
diff --git a/jni/bitmaps/bs.h b/app/src/main/jni/bitmaps/bs.h
similarity index 100%
rename from jni/bitmaps/bs.h
rename to app/src/main/jni/bitmaps/bs.h
diff --git a/jni/bitmaps/colon.h b/app/src/main/jni/bitmaps/colon.h
similarity index 100%
rename from jni/bitmaps/colon.h
rename to app/src/main/jni/bitmaps/colon.h
diff --git a/jni/bitmaps/colon_gx.h b/app/src/main/jni/bitmaps/colon_gx.h
similarity index 100%
rename from jni/bitmaps/colon_gx.h
rename to app/src/main/jni/bitmaps/colon_gx.h
diff --git a/jni/bitmaps/comma.h b/app/src/main/jni/bitmaps/comma.h
similarity index 100%
rename from jni/bitmaps/comma.h
rename to app/src/main/jni/bitmaps/comma.h
diff --git a/jni/bitmaps/comma_gx.h b/app/src/main/jni/bitmaps/comma_gx.h
similarity index 100%
rename from jni/bitmaps/comma_gx.h
rename to app/src/main/jni/bitmaps/comma_gx.h
diff --git a/jni/bitmaps/curly_gx.h b/app/src/main/jni/bitmaps/curly_gx.h
similarity index 100%
rename from jni/bitmaps/curly_gx.h
rename to app/src/main/jni/bitmaps/curly_gx.h
diff --git a/jni/bitmaps/diff.h b/app/src/main/jni/bitmaps/diff.h
similarity index 100%
rename from jni/bitmaps/diff.h
rename to app/src/main/jni/bitmaps/diff.h
diff --git a/jni/bitmaps/div.h b/app/src/main/jni/bitmaps/div.h
similarity index 100%
rename from jni/bitmaps/div.h
rename to app/src/main/jni/bitmaps/div.h
diff --git a/jni/bitmaps/down.h b/app/src/main/jni/bitmaps/down.h
similarity index 100%
rename from jni/bitmaps/down.h
rename to app/src/main/jni/bitmaps/down.h
diff --git a/jni/bitmaps/equal.h b/app/src/main/jni/bitmaps/equal.h
similarity index 100%
rename from jni/bitmaps/equal.h
rename to app/src/main/jni/bitmaps/equal.h
diff --git a/jni/bitmaps/equal_gx.h b/app/src/main/jni/bitmaps/equal_gx.h
similarity index 100%
rename from jni/bitmaps/equal_gx.h
rename to app/src/main/jni/bitmaps/equal_gx.h
diff --git a/jni/bitmaps/exp.h b/app/src/main/jni/bitmaps/exp.h
similarity index 100%
rename from jni/bitmaps/exp.h
rename to app/src/main/jni/bitmaps/exp.h
diff --git a/jni/bitmaps/exp_gx.h b/app/src/main/jni/bitmaps/exp_gx.h
similarity index 100%
rename from jni/bitmaps/exp_gx.h
rename to app/src/main/jni/bitmaps/exp_gx.h
diff --git a/jni/bitmaps/gx_128K_ram.h b/app/src/main/jni/bitmaps/gx_128K_ram.h
similarity index 100%
rename from jni/bitmaps/gx_128K_ram.h
rename to app/src/main/jni/bitmaps/gx_128K_ram.h
diff --git a/jni/bitmaps/gx_green.h b/app/src/main/jni/bitmaps/gx_green.h
similarity index 100%
rename from jni/bitmaps/gx_green.h
rename to app/src/main/jni/bitmaps/gx_green.h
diff --git a/jni/bitmaps/gx_silver.h b/app/src/main/jni/bitmaps/gx_silver.h
similarity index 100%
rename from jni/bitmaps/gx_silver.h
rename to app/src/main/jni/bitmaps/gx_silver.h
diff --git a/jni/bitmaps/hash.h b/app/src/main/jni/bitmaps/hash.h
similarity index 100%
rename from jni/bitmaps/hash.h
rename to app/src/main/jni/bitmaps/hash.h
diff --git a/jni/bitmaps/hash_gx.h b/app/src/main/jni/bitmaps/hash_gx.h
similarity index 100%
rename from jni/bitmaps/hash_gx.h
rename to app/src/main/jni/bitmaps/hash_gx.h
diff --git a/jni/bitmaps/hp.h b/app/src/main/jni/bitmaps/hp.h
similarity index 100%
rename from jni/bitmaps/hp.h
rename to app/src/main/jni/bitmaps/hp.h
diff --git a/jni/bitmaps/hp48_blue.h b/app/src/main/jni/bitmaps/hp48_blue.h
similarity index 100%
rename from jni/bitmaps/hp48_blue.h
rename to app/src/main/jni/bitmaps/hp48_blue.h
diff --git a/jni/bitmaps/hp48_bottom.h b/app/src/main/jni/bitmaps/hp48_bottom.h
similarity index 100%
rename from jni/bitmaps/hp48_bottom.h
rename to app/src/main/jni/bitmaps/hp48_bottom.h
diff --git a/jni/bitmaps/hp48_disp.h b/app/src/main/jni/bitmaps/hp48_disp.h
similarity index 100%
rename from jni/bitmaps/hp48_disp.h
rename to app/src/main/jni/bitmaps/hp48_disp.h
diff --git a/jni/bitmaps/hp48_green_gx.h b/app/src/main/jni/bitmaps/hp48_green_gx.h
similarity index 100%
rename from jni/bitmaps/hp48_green_gx.h
rename to app/src/main/jni/bitmaps/hp48_green_gx.h
diff --git a/jni/bitmaps/hp48_icon.h b/app/src/main/jni/bitmaps/hp48_icon.h
similarity index 100%
rename from jni/bitmaps/hp48_icon.h
rename to app/src/main/jni/bitmaps/hp48_icon.h
diff --git a/jni/bitmaps/hp48_keys.h b/app/src/main/jni/bitmaps/hp48_keys.h
similarity index 100%
rename from jni/bitmaps/hp48_keys.h
rename to app/src/main/jni/bitmaps/hp48_keys.h
diff --git a/jni/bitmaps/hp48_logo.h b/app/src/main/jni/bitmaps/hp48_logo.h
similarity index 100%
rename from jni/bitmaps/hp48_logo.h
rename to app/src/main/jni/bitmaps/hp48_logo.h
diff --git a/jni/bitmaps/hp48_logo_gx.h b/app/src/main/jni/bitmaps/hp48_logo_gx.h
similarity index 100%
rename from jni/bitmaps/hp48_logo_gx.h
rename to app/src/main/jni/bitmaps/hp48_logo_gx.h
diff --git a/jni/bitmaps/hp48_on.h b/app/src/main/jni/bitmaps/hp48_on.h
similarity index 100%
rename from jni/bitmaps/hp48_on.h
rename to app/src/main/jni/bitmaps/hp48_on.h
diff --git a/jni/bitmaps/hp48_orange.h b/app/src/main/jni/bitmaps/hp48_orange.h
similarity index 100%
rename from jni/bitmaps/hp48_orange.h
rename to app/src/main/jni/bitmaps/hp48_orange.h
diff --git a/jni/bitmaps/hp48_text.h b/app/src/main/jni/bitmaps/hp48_text.h
similarity index 100%
rename from jni/bitmaps/hp48_text.h
rename to app/src/main/jni/bitmaps/hp48_text.h
diff --git a/jni/bitmaps/hp48_text_gx.h b/app/src/main/jni/bitmaps/hp48_text_gx.h
similarity index 100%
rename from jni/bitmaps/hp48_text_gx.h
rename to app/src/main/jni/bitmaps/hp48_text_gx.h
diff --git a/jni/bitmaps/hp48_top.h b/app/src/main/jni/bitmaps/hp48_top.h
similarity index 100%
rename from jni/bitmaps/hp48_top.h
rename to app/src/main/jni/bitmaps/hp48_top.h
diff --git a/jni/bitmaps/hp48_top_gx.h b/app/src/main/jni/bitmaps/hp48_top_gx.h
similarity index 100%
rename from jni/bitmaps/hp48_top_gx.h
rename to app/src/main/jni/bitmaps/hp48_top_gx.h
diff --git a/jni/bitmaps/hp48gx.h b/app/src/main/jni/bitmaps/hp48gx.h
similarity index 100%
rename from jni/bitmaps/hp48gx.h
rename to app/src/main/jni/bitmaps/hp48gx.h
diff --git a/jni/bitmaps/hp48sx.h b/app/src/main/jni/bitmaps/hp48sx.h
similarity index 100%
rename from jni/bitmaps/hp48sx.h
rename to app/src/main/jni/bitmaps/hp48sx.h
diff --git a/jni/bitmaps/integral.h b/app/src/main/jni/bitmaps/integral.h
similarity index 100%
rename from jni/bitmaps/integral.h
rename to app/src/main/jni/bitmaps/integral.h
diff --git a/jni/bitmaps/inv.h b/app/src/main/jni/bitmaps/inv.h
similarity index 100%
rename from jni/bitmaps/inv.h
rename to app/src/main/jni/bitmaps/inv.h
diff --git a/jni/bitmaps/last.h b/app/src/main/jni/bitmaps/last.h
similarity index 100%
rename from jni/bitmaps/last.h
rename to app/src/main/jni/bitmaps/last.h
diff --git a/jni/bitmaps/lbrace.h b/app/src/main/jni/bitmaps/lbrace.h
similarity index 100%
rename from jni/bitmaps/lbrace.h
rename to app/src/main/jni/bitmaps/lbrace.h
diff --git a/jni/bitmaps/lbracket.h b/app/src/main/jni/bitmaps/lbracket.h
similarity index 100%
rename from jni/bitmaps/lbracket.h
rename to app/src/main/jni/bitmaps/lbracket.h
diff --git a/jni/bitmaps/lcurly.h b/app/src/main/jni/bitmaps/lcurly.h
similarity index 100%
rename from jni/bitmaps/lcurly.h
rename to app/src/main/jni/bitmaps/lcurly.h
diff --git a/jni/bitmaps/left.h b/app/src/main/jni/bitmaps/left.h
similarity index 100%
rename from jni/bitmaps/left.h
rename to app/src/main/jni/bitmaps/left.h
diff --git a/jni/bitmaps/menu_label.h b/app/src/main/jni/bitmaps/menu_label.h
similarity index 100%
rename from jni/bitmaps/menu_label.h
rename to app/src/main/jni/bitmaps/menu_label.h
diff --git a/jni/bitmaps/minus.h b/app/src/main/jni/bitmaps/minus.h
similarity index 100%
rename from jni/bitmaps/minus.h
rename to app/src/main/jni/bitmaps/minus.h
diff --git a/jni/bitmaps/mul.h b/app/src/main/jni/bitmaps/mul.h
similarity index 100%
rename from jni/bitmaps/mul.h
rename to app/src/main/jni/bitmaps/mul.h
diff --git a/jni/bitmaps/neg.h b/app/src/main/jni/bitmaps/neg.h
similarity index 100%
rename from jni/bitmaps/neg.h
rename to app/src/main/jni/bitmaps/neg.h
diff --git a/jni/bitmaps/nl.h b/app/src/main/jni/bitmaps/nl.h
similarity index 100%
rename from jni/bitmaps/nl.h
rename to app/src/main/jni/bitmaps/nl.h
diff --git a/jni/bitmaps/nl_gx.h b/app/src/main/jni/bitmaps/nl_gx.h
similarity index 100%
rename from jni/bitmaps/nl_gx.h
rename to app/src/main/jni/bitmaps/nl_gx.h
diff --git a/jni/bitmaps/parens_gx.h b/app/src/main/jni/bitmaps/parens_gx.h
similarity index 100%
rename from jni/bitmaps/parens_gx.h
rename to app/src/main/jni/bitmaps/parens_gx.h
diff --git a/jni/bitmaps/pi.h b/app/src/main/jni/bitmaps/pi.h
similarity index 100%
rename from jni/bitmaps/pi.h
rename to app/src/main/jni/bitmaps/pi.h
diff --git a/jni/bitmaps/pi_gx.h b/app/src/main/jni/bitmaps/pi_gx.h
similarity index 100%
rename from jni/bitmaps/pi_gx.h
rename to app/src/main/jni/bitmaps/pi_gx.h
diff --git a/jni/bitmaps/plus.h b/app/src/main/jni/bitmaps/plus.h
similarity index 100%
rename from jni/bitmaps/plus.h
rename to app/src/main/jni/bitmaps/plus.h
diff --git a/jni/bitmaps/pow10.h b/app/src/main/jni/bitmaps/pow10.h
similarity index 100%
rename from jni/bitmaps/pow10.h
rename to app/src/main/jni/bitmaps/pow10.h
diff --git a/jni/bitmaps/pow10_gx.h b/app/src/main/jni/bitmaps/pow10_gx.h
similarity index 100%
rename from jni/bitmaps/pow10_gx.h
rename to app/src/main/jni/bitmaps/pow10_gx.h
diff --git a/jni/bitmaps/power.h b/app/src/main/jni/bitmaps/power.h
similarity index 100%
rename from jni/bitmaps/power.h
rename to app/src/main/jni/bitmaps/power.h
diff --git a/jni/bitmaps/prog.h b/app/src/main/jni/bitmaps/prog.h
similarity index 100%
rename from jni/bitmaps/prog.h
rename to app/src/main/jni/bitmaps/prog.h
diff --git a/jni/bitmaps/prog_gx.h b/app/src/main/jni/bitmaps/prog_gx.h
similarity index 100%
rename from jni/bitmaps/prog_gx.h
rename to app/src/main/jni/bitmaps/prog_gx.h
diff --git a/jni/bitmaps/quote_gx.h b/app/src/main/jni/bitmaps/quote_gx.h
similarity index 100%
rename from jni/bitmaps/quote_gx.h
rename to app/src/main/jni/bitmaps/quote_gx.h
diff --git a/jni/bitmaps/rbrace.h b/app/src/main/jni/bitmaps/rbrace.h
similarity index 100%
rename from jni/bitmaps/rbrace.h
rename to app/src/main/jni/bitmaps/rbrace.h
diff --git a/jni/bitmaps/rbracket.h b/app/src/main/jni/bitmaps/rbracket.h
similarity index 100%
rename from jni/bitmaps/rbracket.h
rename to app/src/main/jni/bitmaps/rbracket.h
diff --git a/jni/bitmaps/rcurly.h b/app/src/main/jni/bitmaps/rcurly.h
similarity index 100%
rename from jni/bitmaps/rcurly.h
rename to app/src/main/jni/bitmaps/rcurly.h
diff --git a/jni/bitmaps/right.h b/app/src/main/jni/bitmaps/right.h
similarity index 100%
rename from jni/bitmaps/right.h
rename to app/src/main/jni/bitmaps/right.h
diff --git a/jni/bitmaps/root.h b/app/src/main/jni/bitmaps/root.h
similarity index 100%
rename from jni/bitmaps/root.h
rename to app/src/main/jni/bitmaps/root.h
diff --git a/jni/bitmaps/root_gx.h b/app/src/main/jni/bitmaps/root_gx.h
similarity index 100%
rename from jni/bitmaps/root_gx.h
rename to app/src/main/jni/bitmaps/root_gx.h
diff --git a/jni/bitmaps/science.h b/app/src/main/jni/bitmaps/science.h
similarity index 100%
rename from jni/bitmaps/science.h
rename to app/src/main/jni/bitmaps/science.h
diff --git a/jni/bitmaps/shl.h b/app/src/main/jni/bitmaps/shl.h
similarity index 100%
rename from jni/bitmaps/shl.h
rename to app/src/main/jni/bitmaps/shl.h
diff --git a/jni/bitmaps/shr.h b/app/src/main/jni/bitmaps/shr.h
similarity index 100%
rename from jni/bitmaps/shr.h
rename to app/src/main/jni/bitmaps/shr.h
diff --git a/jni/bitmaps/sigma.h b/app/src/main/jni/bitmaps/sigma.h
similarity index 100%
rename from jni/bitmaps/sigma.h
rename to app/src/main/jni/bitmaps/sigma.h
diff --git a/jni/bitmaps/slash.h b/app/src/main/jni/bitmaps/slash.h
similarity index 100%
rename from jni/bitmaps/slash.h
rename to app/src/main/jni/bitmaps/slash.h
diff --git a/jni/bitmaps/small_colon.h b/app/src/main/jni/bitmaps/small_colon.h
similarity index 100%
rename from jni/bitmaps/small_colon.h
rename to app/src/main/jni/bitmaps/small_colon.h
diff --git a/jni/bitmaps/sqr.h b/app/src/main/jni/bitmaps/sqr.h
similarity index 100%
rename from jni/bitmaps/sqr.h
rename to app/src/main/jni/bitmaps/sqr.h
diff --git a/jni/bitmaps/sqr_gx.h b/app/src/main/jni/bitmaps/sqr_gx.h
similarity index 100%
rename from jni/bitmaps/sqr_gx.h
rename to app/src/main/jni/bitmaps/sqr_gx.h
diff --git a/jni/bitmaps/sqrt.h b/app/src/main/jni/bitmaps/sqrt.h
similarity index 100%
rename from jni/bitmaps/sqrt.h
rename to app/src/main/jni/bitmaps/sqrt.h
diff --git a/jni/bitmaps/string.h b/app/src/main/jni/bitmaps/string.h
similarity index 100%
rename from jni/bitmaps/string.h
rename to app/src/main/jni/bitmaps/string.h
diff --git a/jni/bitmaps/three.h b/app/src/main/jni/bitmaps/three.h
similarity index 100%
rename from jni/bitmaps/three.h
rename to app/src/main/jni/bitmaps/three.h
diff --git a/jni/bitmaps/two.h b/app/src/main/jni/bitmaps/two.h
similarity index 100%
rename from jni/bitmaps/two.h
rename to app/src/main/jni/bitmaps/two.h
diff --git a/jni/bitmaps/under.h b/app/src/main/jni/bitmaps/under.h
similarity index 100%
rename from jni/bitmaps/under.h
rename to app/src/main/jni/bitmaps/under.h
diff --git a/jni/bitmaps/under_gx.h b/app/src/main/jni/bitmaps/under_gx.h
similarity index 100%
rename from jni/bitmaps/under_gx.h
rename to app/src/main/jni/bitmaps/under_gx.h
diff --git a/jni/bitmaps/up.h b/app/src/main/jni/bitmaps/up.h
similarity index 100%
rename from jni/bitmaps/up.h
rename to app/src/main/jni/bitmaps/up.h
diff --git a/jni/buttons.h b/app/src/main/jni/buttons.h
similarity index 100%
rename from jni/buttons.h
rename to app/src/main/jni/buttons.h
diff --git a/jni/checkrom.c b/app/src/main/jni/checkrom.c
similarity index 100%
rename from jni/checkrom.c
rename to app/src/main/jni/checkrom.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/constants.h b/app/src/main/jni/constants.h
similarity index 100%
rename from jni/constants.h
rename to app/src/main/jni/constants.h
diff --git a/jni/debugger.c b/app/src/main/jni/debugger.c
similarity index 100%
rename from jni/debugger.c
rename to app/src/main/jni/debugger.c
diff --git a/jni/debugger.h b/app/src/main/jni/debugger.h
similarity index 100%
rename from jni/debugger.h
rename to app/src/main/jni/debugger.h
diff --git a/jni/device.c b/app/src/main/jni/device.c
similarity index 100%
rename from jni/device.c
rename to app/src/main/jni/device.c
diff --git a/jni/device.h b/app/src/main/jni/device.h
similarity index 100%
rename from jni/device.h
rename to app/src/main/jni/device.h
diff --git a/jni/disasm.c b/app/src/main/jni/disasm.c
similarity index 100%
rename from jni/disasm.c
rename to app/src/main/jni/disasm.c
diff --git a/jni/disasm.h b/app/src/main/jni/disasm.h
similarity index 100%
rename from jni/disasm.h
rename to app/src/main/jni/disasm.h
diff --git a/jni/dump2rom.c b/app/src/main/jni/dump2rom.c
similarity index 100%
rename from jni/dump2rom.c
rename to app/src/main/jni/dump2rom.c
diff --git a/jni/emulate.c b/app/src/main/jni/emulate.c
similarity index 100%
rename from jni/emulate.c
rename to app/src/main/jni/emulate.c
diff --git a/jni/errors.c b/app/src/main/jni/errors.c
similarity index 100%
rename from jni/errors.c
rename to app/src/main/jni/errors.c
diff --git a/jni/errors.h b/app/src/main/jni/errors.h
similarity index 100%
rename from jni/errors.h
rename to app/src/main/jni/errors.h
diff --git a/jni/g.sh b/app/src/main/jni/g.sh
similarity index 100%
rename from jni/g.sh
rename to app/src/main/jni/g.sh
diff --git a/jni/global.h b/app/src/main/jni/global.h
similarity index 100%
rename from jni/global.h
rename to app/src/main/jni/global.h
diff --git a/jni/hp.h b/app/src/main/jni/hp.h
similarity index 100%
rename from jni/hp.h
rename to app/src/main/jni/hp.h
diff --git a/jni/hp48 b/app/src/main/jni/hp48
similarity index 100%
rename from jni/hp48
rename to app/src/main/jni/hp48
diff --git a/jni/hp48.h b/app/src/main/jni/hp48.h
similarity index 100%
rename from jni/hp48.h
rename to app/src/main/jni/hp48.h
diff --git a/jni/hp48_emu.h b/app/src/main/jni/hp48_emu.h
similarity index 100%
rename from jni/hp48_emu.h
rename to app/src/main/jni/hp48_emu.h
diff --git a/jni/hp48char.h b/app/src/main/jni/hp48char.h
similarity index 100%
rename from jni/hp48char.h
rename to app/src/main/jni/hp48char.h
diff --git a/jni/icon.h b/app/src/main/jni/icon.h
similarity index 100%
rename from jni/icon.h
rename to app/src/main/jni/icon.h
diff --git a/jni/init.c b/app/src/main/jni/init.c
similarity index 100%
rename from jni/init.c
rename to app/src/main/jni/init.c
diff --git a/jni/lcd.c b/app/src/main/jni/lcd.c
similarity index 100%
rename from jni/lcd.c
rename to app/src/main/jni/lcd.c
diff --git a/jni/main.c b/app/src/main/jni/main.c
similarity index 100%
rename from jni/main.c
rename to app/src/main/jni/main.c
diff --git a/jni/memory.c b/app/src/main/jni/memory.c
similarity index 100%
rename from jni/memory.c
rename to app/src/main/jni/memory.c
diff --git a/jni/mkcard.c b/app/src/main/jni/mkcard.c
similarity index 100%
rename from jni/mkcard.c
rename to app/src/main/jni/mkcard.c
diff --git a/jni/mmu.h b/app/src/main/jni/mmu.h
similarity index 100%
rename from jni/mmu.h
rename to app/src/main/jni/mmu.h
diff --git a/jni/options.c b/app/src/main/jni/options.c
similarity index 100%
rename from jni/options.c
rename to app/src/main/jni/options.c
diff --git a/jni/options.h b/app/src/main/jni/options.h
similarity index 100%
rename from jni/options.h
rename to app/src/main/jni/options.h
diff --git a/jni/ram b/app/src/main/jni/ram
similarity index 100%
rename from jni/ram
rename to app/src/main/jni/ram
diff --git a/jni/register.c b/app/src/main/jni/register.c
similarity index 100%
rename from jni/register.c
rename to app/src/main/jni/register.c
diff --git a/jni/resources.c b/app/src/main/jni/resources.c
similarity index 100%
rename from jni/resources.c
rename to app/src/main/jni/resources.c
diff --git a/jni/resources.h b/app/src/main/jni/resources.h
similarity index 100%
rename from jni/resources.h
rename to app/src/main/jni/resources.h
diff --git a/jni/rom b/app/src/main/jni/rom
similarity index 100%
rename from jni/rom
rename to app/src/main/jni/rom
diff --git a/jni/romio.c b/app/src/main/jni/romio.c
similarity index 100%
rename from jni/romio.c
rename to app/src/main/jni/romio.c
diff --git a/jni/romio.h b/app/src/main/jni/romio.h
similarity index 100%
rename from jni/romio.h
rename to app/src/main/jni/romio.h
diff --git a/jni/rpl.c b/app/src/main/jni/rpl.c
similarity index 100%
rename from jni/rpl.c
rename to app/src/main/jni/rpl.c
diff --git a/jni/rpl.h b/app/src/main/jni/rpl.h
similarity index 100%
rename from jni/rpl.h
rename to app/src/main/jni/rpl.h
diff --git a/jni/serial.c b/app/src/main/jni/serial.c
similarity index 100%
rename from jni/serial.c
rename to app/src/main/jni/serial.c
diff --git a/jni/small.h b/app/src/main/jni/small.h
similarity index 100%
rename from jni/small.h
rename to app/src/main/jni/small.h
diff --git a/jni/timer.c b/app/src/main/jni/timer.c
similarity index 100%
rename from jni/timer.c
rename to app/src/main/jni/timer.c
diff --git a/jni/timer.h b/app/src/main/jni/timer.h
similarity index 100%
rename from jni/timer.h
rename to app/src/main/jni/timer.h
diff --git a/jni/version.h b/app/src/main/jni/version.h
similarity index 100%
rename from jni/version.h
rename to app/src/main/jni/version.h
diff --git a/jni/x48.c b/app/src/main/jni/x48.c
similarity index 100%
rename from jni/x48.c
rename to app/src/main/jni/x48.c
diff --git a/jni/x48.h b/app/src/main/jni/x48.h
similarity index 100%
rename from jni/x48.h
rename to app/src/main/jni/x48.h
diff --git a/res/drawable-hdpi/ic_action_core_overflow.png b/app/src/main/res/drawable-hdpi/ic_action_core_overflow.png
similarity index 100%
rename from res/drawable-hdpi/ic_action_core_overflow.png
rename to app/src/main/res/drawable-hdpi/ic_action_core_overflow.png
diff --git a/res/drawable-hdpi/icon.png b/app/src/main/res/drawable-hdpi/icon.png
similarity index 100%
rename from res/drawable-hdpi/icon.png
rename to app/src/main/res/drawable-hdpi/icon.png
diff --git a/res/drawable-mdpi/ic_action_core_overflow.png b/app/src/main/res/drawable-mdpi/ic_action_core_overflow.png
similarity index 100%
rename from res/drawable-mdpi/ic_action_core_overflow.png
rename to app/src/main/res/drawable-mdpi/ic_action_core_overflow.png
diff --git a/res/drawable-xhdpi/ic_action_core_overflow.png b/app/src/main/res/drawable-xhdpi/ic_action_core_overflow.png
similarity index 100%
rename from res/drawable-xhdpi/ic_action_core_overflow.png
rename to app/src/main/res/drawable-xhdpi/ic_action_core_overflow.png
diff --git a/res/drawable-xxhdpi/ic_action_core_overflow.png b/app/src/main/res/drawable-xxhdpi/ic_action_core_overflow.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_action_core_overflow.png
rename to app/src/main/res/drawable-xxhdpi/ic_action_core_overflow.png
diff --git a/res/drawable/alert_dialog_icon.png b/app/src/main/res/drawable/alert_dialog_icon.png
similarity index 100%
rename from res/drawable/alert_dialog_icon.png
rename to app/src/main/res/drawable/alert_dialog_icon.png
diff --git a/res/drawable/ann01.png b/app/src/main/res/drawable/ann01.png
similarity index 100%
rename from res/drawable/ann01.png
rename to app/src/main/res/drawable/ann01.png
diff --git a/res/drawable/ann02.png b/app/src/main/res/drawable/ann02.png
similarity index 100%
rename from res/drawable/ann02.png
rename to app/src/main/res/drawable/ann02.png
diff --git a/res/drawable/ann03.png b/app/src/main/res/drawable/ann03.png
similarity index 100%
rename from res/drawable/ann03.png
rename to app/src/main/res/drawable/ann03.png
diff --git a/res/drawable/ann04.png b/app/src/main/res/drawable/ann04.png
similarity index 100%
rename from res/drawable/ann04.png
rename to app/src/main/res/drawable/ann04.png
diff --git a/res/drawable/ann05.png b/app/src/main/res/drawable/ann05.png
similarity index 100%
rename from res/drawable/ann05.png
rename to app/src/main/res/drawable/ann05.png
diff --git a/res/drawable/ann06.png b/app/src/main/res/drawable/ann06.png
similarity index 100%
rename from res/drawable/ann06.png
rename to app/src/main/res/drawable/ann06.png
diff --git a/res/drawable/file.png b/app/src/main/res/drawable/file.png
similarity index 100%
rename from res/drawable/file.png
rename to app/src/main/res/drawable/file.png
diff --git a/res/drawable/folder.png b/app/src/main/res/drawable/folder.png
similarity index 100%
rename from res/drawable/folder.png
rename to app/src/main/res/drawable/folder.png
diff --git a/res/drawable/icon.png b/app/src/main/res/drawable/icon.png
similarity index 100%
rename from res/drawable/icon.png
rename to app/src/main/res/drawable/icon.png
diff --git a/res/drawable/k01.png b/app/src/main/res/drawable/k01.png
similarity index 100%
rename from res/drawable/k01.png
rename to app/src/main/res/drawable/k01.png
diff --git a/res/drawable/k02.png b/app/src/main/res/drawable/k02.png
similarity index 100%
rename from res/drawable/k02.png
rename to app/src/main/res/drawable/k02.png
diff --git a/res/drawable/k03.png b/app/src/main/res/drawable/k03.png
similarity index 100%
rename from res/drawable/k03.png
rename to app/src/main/res/drawable/k03.png
diff --git a/res/drawable/k04.png b/app/src/main/res/drawable/k04.png
similarity index 100%
rename from res/drawable/k04.png
rename to app/src/main/res/drawable/k04.png
diff --git a/res/drawable/k05.png b/app/src/main/res/drawable/k05.png
similarity index 100%
rename from res/drawable/k05.png
rename to app/src/main/res/drawable/k05.png
diff --git a/res/drawable/k06.png b/app/src/main/res/drawable/k06.png
similarity index 100%
rename from res/drawable/k06.png
rename to app/src/main/res/drawable/k06.png
diff --git a/res/drawable/k07.png b/app/src/main/res/drawable/k07.png
similarity index 100%
rename from res/drawable/k07.png
rename to app/src/main/res/drawable/k07.png
diff --git a/res/drawable/k08.png b/app/src/main/res/drawable/k08.png
similarity index 100%
rename from res/drawable/k08.png
rename to app/src/main/res/drawable/k08.png
diff --git a/res/drawable/k09.png b/app/src/main/res/drawable/k09.png
similarity index 100%
rename from res/drawable/k09.png
rename to app/src/main/res/drawable/k09.png
diff --git a/res/drawable/k10.png b/app/src/main/res/drawable/k10.png
similarity index 100%
rename from res/drawable/k10.png
rename to app/src/main/res/drawable/k10.png
diff --git a/res/drawable/k11.png b/app/src/main/res/drawable/k11.png
similarity index 100%
rename from res/drawable/k11.png
rename to app/src/main/res/drawable/k11.png
diff --git a/res/drawable/k12.png b/app/src/main/res/drawable/k12.png
similarity index 100%
rename from res/drawable/k12.png
rename to app/src/main/res/drawable/k12.png
diff --git a/res/drawable/k13.png b/app/src/main/res/drawable/k13.png
similarity index 100%
rename from res/drawable/k13.png
rename to app/src/main/res/drawable/k13.png
diff --git a/res/drawable/k14.png b/app/src/main/res/drawable/k14.png
similarity index 100%
rename from res/drawable/k14.png
rename to app/src/main/res/drawable/k14.png
diff --git a/res/drawable/k15.png b/app/src/main/res/drawable/k15.png
similarity index 100%
rename from res/drawable/k15.png
rename to app/src/main/res/drawable/k15.png
diff --git a/res/drawable/k16.png b/app/src/main/res/drawable/k16.png
similarity index 100%
rename from res/drawable/k16.png
rename to app/src/main/res/drawable/k16.png
diff --git a/res/drawable/k17.png b/app/src/main/res/drawable/k17.png
similarity index 100%
rename from res/drawable/k17.png
rename to app/src/main/res/drawable/k17.png
diff --git a/res/drawable/k18.png b/app/src/main/res/drawable/k18.png
similarity index 100%
rename from res/drawable/k18.png
rename to app/src/main/res/drawable/k18.png
diff --git a/res/drawable/k19.png b/app/src/main/res/drawable/k19.png
similarity index 100%
rename from res/drawable/k19.png
rename to app/src/main/res/drawable/k19.png
diff --git a/res/drawable/k20.png b/app/src/main/res/drawable/k20.png
similarity index 100%
rename from res/drawable/k20.png
rename to app/src/main/res/drawable/k20.png
diff --git a/res/drawable/k21.png b/app/src/main/res/drawable/k21.png
similarity index 100%
rename from res/drawable/k21.png
rename to app/src/main/res/drawable/k21.png
diff --git a/res/drawable/k22.png b/app/src/main/res/drawable/k22.png
similarity index 100%
rename from res/drawable/k22.png
rename to app/src/main/res/drawable/k22.png
diff --git a/res/drawable/k23.png b/app/src/main/res/drawable/k23.png
similarity index 100%
rename from res/drawable/k23.png
rename to app/src/main/res/drawable/k23.png
diff --git a/res/drawable/k24.png b/app/src/main/res/drawable/k24.png
similarity index 100%
rename from res/drawable/k24.png
rename to app/src/main/res/drawable/k24.png
diff --git a/res/drawable/k25.png b/app/src/main/res/drawable/k25.png
similarity index 100%
rename from res/drawable/k25.png
rename to app/src/main/res/drawable/k25.png
diff --git a/res/drawable/k26.png b/app/src/main/res/drawable/k26.png
similarity index 100%
rename from res/drawable/k26.png
rename to app/src/main/res/drawable/k26.png
diff --git a/res/drawable/k27.png b/app/src/main/res/drawable/k27.png
similarity index 100%
rename from res/drawable/k27.png
rename to app/src/main/res/drawable/k27.png
diff --git a/res/drawable/k28.png b/app/src/main/res/drawable/k28.png
similarity index 100%
rename from res/drawable/k28.png
rename to app/src/main/res/drawable/k28.png
diff --git a/res/drawable/k29.png b/app/src/main/res/drawable/k29.png
similarity index 100%
rename from res/drawable/k29.png
rename to app/src/main/res/drawable/k29.png
diff --git a/res/drawable/k30.png b/app/src/main/res/drawable/k30.png
similarity index 100%
rename from res/drawable/k30.png
rename to app/src/main/res/drawable/k30.png
diff --git a/res/drawable/k31.png b/app/src/main/res/drawable/k31.png
similarity index 100%
rename from res/drawable/k31.png
rename to app/src/main/res/drawable/k31.png
diff --git a/res/drawable/k32.png b/app/src/main/res/drawable/k32.png
similarity index 100%
rename from res/drawable/k32.png
rename to app/src/main/res/drawable/k32.png
diff --git a/res/drawable/k33.png b/app/src/main/res/drawable/k33.png
similarity index 100%
rename from res/drawable/k33.png
rename to app/src/main/res/drawable/k33.png
diff --git a/res/drawable/k34.png b/app/src/main/res/drawable/k34.png
similarity index 100%
rename from res/drawable/k34.png
rename to app/src/main/res/drawable/k34.png
diff --git a/res/drawable/k35.png b/app/src/main/res/drawable/k35.png
similarity index 100%
rename from res/drawable/k35.png
rename to app/src/main/res/drawable/k35.png
diff --git a/res/drawable/k36.png b/app/src/main/res/drawable/k36.png
similarity index 100%
rename from res/drawable/k36.png
rename to app/src/main/res/drawable/k36.png
diff --git a/res/drawable/k37.png b/app/src/main/res/drawable/k37.png
similarity index 100%
rename from res/drawable/k37.png
rename to app/src/main/res/drawable/k37.png
diff --git a/res/drawable/k38.png b/app/src/main/res/drawable/k38.png
similarity index 100%
rename from res/drawable/k38.png
rename to app/src/main/res/drawable/k38.png
diff --git a/res/drawable/k39.png b/app/src/main/res/drawable/k39.png
similarity index 100%
rename from res/drawable/k39.png
rename to app/src/main/res/drawable/k39.png
diff --git a/res/drawable/k40.png b/app/src/main/res/drawable/k40.png
similarity index 100%
rename from res/drawable/k40.png
rename to app/src/main/res/drawable/k40.png
diff --git a/res/drawable/k41.png b/app/src/main/res/drawable/k41.png
similarity index 100%
rename from res/drawable/k41.png
rename to app/src/main/res/drawable/k41.png
diff --git a/res/drawable/k42.png b/app/src/main/res/drawable/k42.png
similarity index 100%
rename from res/drawable/k42.png
rename to app/src/main/res/drawable/k42.png
diff --git a/res/drawable/k43.png b/app/src/main/res/drawable/k43.png
similarity index 100%
rename from res/drawable/k43.png
rename to app/src/main/res/drawable/k43.png
diff --git a/res/drawable/k44.png b/app/src/main/res/drawable/k44.png
similarity index 100%
rename from res/drawable/k44.png
rename to app/src/main/res/drawable/k44.png
diff --git a/res/drawable/k45.png b/app/src/main/res/drawable/k45.png
similarity index 100%
rename from res/drawable/k45.png
rename to app/src/main/res/drawable/k45.png
diff --git a/res/drawable/k46.png b/app/src/main/res/drawable/k46.png
similarity index 100%
rename from res/drawable/k46.png
rename to app/src/main/res/drawable/k46.png
diff --git a/res/drawable/k47.png b/app/src/main/res/drawable/k47.png
similarity index 100%
rename from res/drawable/k47.png
rename to app/src/main/res/drawable/k47.png
diff --git a/res/drawable/k48.png b/app/src/main/res/drawable/k48.png
similarity index 100%
rename from res/drawable/k48.png
rename to app/src/main/res/drawable/k48.png
diff --git a/res/drawable/k49.png b/app/src/main/res/drawable/k49.png
similarity index 100%
rename from res/drawable/k49.png
rename to app/src/main/res/drawable/k49.png
diff --git a/res/drawable/l01.png b/app/src/main/res/drawable/l01.png
similarity index 100%
rename from res/drawable/l01.png
rename to app/src/main/res/drawable/l01.png
diff --git a/res/drawable/l02.png b/app/src/main/res/drawable/l02.png
similarity index 100%
rename from res/drawable/l02.png
rename to app/src/main/res/drawable/l02.png
diff --git a/res/drawable/l03.png b/app/src/main/res/drawable/l03.png
similarity index 100%
rename from res/drawable/l03.png
rename to app/src/main/res/drawable/l03.png
diff --git a/res/drawable/l04.png b/app/src/main/res/drawable/l04.png
similarity index 100%
rename from res/drawable/l04.png
rename to app/src/main/res/drawable/l04.png
diff --git a/res/drawable/l05.png b/app/src/main/res/drawable/l05.png
similarity index 100%
rename from res/drawable/l05.png
rename to app/src/main/res/drawable/l05.png
diff --git a/res/drawable/l06.png b/app/src/main/res/drawable/l06.png
similarity index 100%
rename from res/drawable/l06.png
rename to app/src/main/res/drawable/l06.png
diff --git a/res/drawable/l07.png b/app/src/main/res/drawable/l07.png
similarity index 100%
rename from res/drawable/l07.png
rename to app/src/main/res/drawable/l07.png
diff --git a/res/drawable/l08.png b/app/src/main/res/drawable/l08.png
similarity index 100%
rename from res/drawable/l08.png
rename to app/src/main/res/drawable/l08.png
diff --git a/res/drawable/l09.png b/app/src/main/res/drawable/l09.png
similarity index 100%
rename from res/drawable/l09.png
rename to app/src/main/res/drawable/l09.png
diff --git a/res/drawable/l10.png b/app/src/main/res/drawable/l10.png
similarity index 100%
rename from res/drawable/l10.png
rename to app/src/main/res/drawable/l10.png
diff --git a/res/drawable/l11.png b/app/src/main/res/drawable/l11.png
similarity index 100%
rename from res/drawable/l11.png
rename to app/src/main/res/drawable/l11.png
diff --git a/res/drawable/l12.png b/app/src/main/res/drawable/l12.png
similarity index 100%
rename from res/drawable/l12.png
rename to app/src/main/res/drawable/l12.png
diff --git a/res/drawable/l13.png b/app/src/main/res/drawable/l13.png
similarity index 100%
rename from res/drawable/l13.png
rename to app/src/main/res/drawable/l13.png
diff --git a/res/drawable/l14.png b/app/src/main/res/drawable/l14.png
similarity index 100%
rename from res/drawable/l14.png
rename to app/src/main/res/drawable/l14.png
diff --git a/res/drawable/l15.png b/app/src/main/res/drawable/l15.png
similarity index 100%
rename from res/drawable/l15.png
rename to app/src/main/res/drawable/l15.png
diff --git a/res/drawable/l16.png b/app/src/main/res/drawable/l16.png
similarity index 100%
rename from res/drawable/l16.png
rename to app/src/main/res/drawable/l16.png
diff --git a/res/drawable/l17.png b/app/src/main/res/drawable/l17.png
similarity index 100%
rename from res/drawable/l17.png
rename to app/src/main/res/drawable/l17.png
diff --git a/res/drawable/l18.png b/app/src/main/res/drawable/l18.png
similarity index 100%
rename from res/drawable/l18.png
rename to app/src/main/res/drawable/l18.png
diff --git a/res/drawable/l19.png b/app/src/main/res/drawable/l19.png
similarity index 100%
rename from res/drawable/l19.png
rename to app/src/main/res/drawable/l19.png
diff --git a/res/drawable/l20.png b/app/src/main/res/drawable/l20.png
similarity index 100%
rename from res/drawable/l20.png
rename to app/src/main/res/drawable/l20.png
diff --git a/res/drawable/l21.png b/app/src/main/res/drawable/l21.png
similarity index 100%
rename from res/drawable/l21.png
rename to app/src/main/res/drawable/l21.png
diff --git a/res/drawable/l22.png b/app/src/main/res/drawable/l22.png
similarity index 100%
rename from res/drawable/l22.png
rename to app/src/main/res/drawable/l22.png
diff --git a/res/drawable/l23.png b/app/src/main/res/drawable/l23.png
similarity index 100%
rename from res/drawable/l23.png
rename to app/src/main/res/drawable/l23.png
diff --git a/res/drawable/l24.png b/app/src/main/res/drawable/l24.png
similarity index 100%
rename from res/drawable/l24.png
rename to app/src/main/res/drawable/l24.png
diff --git a/res/drawable/l25.png b/app/src/main/res/drawable/l25.png
similarity index 100%
rename from res/drawable/l25.png
rename to app/src/main/res/drawable/l25.png
diff --git a/res/drawable/l26.png b/app/src/main/res/drawable/l26.png
similarity index 100%
rename from res/drawable/l26.png
rename to app/src/main/res/drawable/l26.png
diff --git a/res/drawable/l27.png b/app/src/main/res/drawable/l27.png
similarity index 100%
rename from res/drawable/l27.png
rename to app/src/main/res/drawable/l27.png
diff --git a/res/drawable/l28.png b/app/src/main/res/drawable/l28.png
similarity index 100%
rename from res/drawable/l28.png
rename to app/src/main/res/drawable/l28.png
diff --git a/res/drawable/l29.png b/app/src/main/res/drawable/l29.png
similarity index 100%
rename from res/drawable/l29.png
rename to app/src/main/res/drawable/l29.png
diff --git a/res/drawable/l30.png b/app/src/main/res/drawable/l30.png
similarity index 100%
rename from res/drawable/l30.png
rename to app/src/main/res/drawable/l30.png
diff --git a/res/drawable/l31.png b/app/src/main/res/drawable/l31.png
similarity index 100%
rename from res/drawable/l31.png
rename to app/src/main/res/drawable/l31.png
diff --git a/res/drawable/l32.png b/app/src/main/res/drawable/l32.png
similarity index 100%
rename from res/drawable/l32.png
rename to app/src/main/res/drawable/l32.png
diff --git a/res/drawable/l33.png b/app/src/main/res/drawable/l33.png
similarity index 100%
rename from res/drawable/l33.png
rename to app/src/main/res/drawable/l33.png
diff --git a/res/drawable/l34.png b/app/src/main/res/drawable/l34.png
similarity index 100%
rename from res/drawable/l34.png
rename to app/src/main/res/drawable/l34.png
diff --git a/res/drawable/l35.png b/app/src/main/res/drawable/l35.png
similarity index 100%
rename from res/drawable/l35.png
rename to app/src/main/res/drawable/l35.png
diff --git a/res/drawable/l36.png b/app/src/main/res/drawable/l36.png
similarity index 100%
rename from res/drawable/l36.png
rename to app/src/main/res/drawable/l36.png
diff --git a/res/drawable/l37.png b/app/src/main/res/drawable/l37.png
similarity index 100%
rename from res/drawable/l37.png
rename to app/src/main/res/drawable/l37.png
diff --git a/res/drawable/l38.png b/app/src/main/res/drawable/l38.png
similarity index 100%
rename from res/drawable/l38.png
rename to app/src/main/res/drawable/l38.png
diff --git a/res/drawable/l39.png b/app/src/main/res/drawable/l39.png
similarity index 100%
rename from res/drawable/l39.png
rename to app/src/main/res/drawable/l39.png
diff --git a/res/drawable/l40.png b/app/src/main/res/drawable/l40.png
similarity index 100%
rename from res/drawable/l40.png
rename to app/src/main/res/drawable/l40.png
diff --git a/res/drawable/l41.png b/app/src/main/res/drawable/l41.png
similarity index 100%
rename from res/drawable/l41.png
rename to app/src/main/res/drawable/l41.png
diff --git a/res/drawable/l42.png b/app/src/main/res/drawable/l42.png
similarity index 100%
rename from res/drawable/l42.png
rename to app/src/main/res/drawable/l42.png
diff --git a/res/drawable/l43.png b/app/src/main/res/drawable/l43.png
similarity index 100%
rename from res/drawable/l43.png
rename to app/src/main/res/drawable/l43.png
diff --git a/res/drawable/l44.png b/app/src/main/res/drawable/l44.png
similarity index 100%
rename from res/drawable/l44.png
rename to app/src/main/res/drawable/l44.png
diff --git a/res/drawable/l45.png b/app/src/main/res/drawable/l45.png
similarity index 100%
rename from res/drawable/l45.png
rename to app/src/main/res/drawable/l45.png
diff --git a/res/drawable/l46.png b/app/src/main/res/drawable/l46.png
similarity index 100%
rename from res/drawable/l46.png
rename to app/src/main/res/drawable/l46.png
diff --git a/res/drawable/l47.png b/app/src/main/res/drawable/l47.png
similarity index 100%
rename from res/drawable/l47.png
rename to app/src/main/res/drawable/l47.png
diff --git a/res/drawable/l48.png b/app/src/main/res/drawable/l48.png
similarity index 100%
rename from res/drawable/l48.png
rename to app/src/main/res/drawable/l48.png
diff --git a/res/drawable/l49.png b/app/src/main/res/drawable/l49.png
similarity index 100%
rename from res/drawable/l49.png
rename to app/src/main/res/drawable/l49.png
diff --git a/res/drawable/m01.png b/app/src/main/res/drawable/m01.png
similarity index 100%
rename from res/drawable/m01.png
rename to app/src/main/res/drawable/m01.png
diff --git a/res/drawable/m02.png b/app/src/main/res/drawable/m02.png
similarity index 100%
rename from res/drawable/m02.png
rename to app/src/main/res/drawable/m02.png
diff --git a/res/drawable/m03.png b/app/src/main/res/drawable/m03.png
similarity index 100%
rename from res/drawable/m03.png
rename to app/src/main/res/drawable/m03.png
diff --git a/res/drawable/m04.png b/app/src/main/res/drawable/m04.png
similarity index 100%
rename from res/drawable/m04.png
rename to app/src/main/res/drawable/m04.png
diff --git a/res/drawable/m05.png b/app/src/main/res/drawable/m05.png
similarity index 100%
rename from res/drawable/m05.png
rename to app/src/main/res/drawable/m05.png
diff --git a/res/drawable/m06.png b/app/src/main/res/drawable/m06.png
similarity index 100%
rename from res/drawable/m06.png
rename to app/src/main/res/drawable/m06.png
diff --git a/res/drawable/m07.png b/app/src/main/res/drawable/m07.png
similarity index 100%
rename from res/drawable/m07.png
rename to app/src/main/res/drawable/m07.png
diff --git a/res/drawable/m08.png b/app/src/main/res/drawable/m08.png
similarity index 100%
rename from res/drawable/m08.png
rename to app/src/main/res/drawable/m08.png
diff --git a/res/drawable/m09.png b/app/src/main/res/drawable/m09.png
similarity index 100%
rename from res/drawable/m09.png
rename to app/src/main/res/drawable/m09.png
diff --git a/res/drawable/m10.png b/app/src/main/res/drawable/m10.png
similarity index 100%
rename from res/drawable/m10.png
rename to app/src/main/res/drawable/m10.png
diff --git a/res/drawable/m11.png b/app/src/main/res/drawable/m11.png
similarity index 100%
rename from res/drawable/m11.png
rename to app/src/main/res/drawable/m11.png
diff --git a/res/drawable/m12.png b/app/src/main/res/drawable/m12.png
similarity index 100%
rename from res/drawable/m12.png
rename to app/src/main/res/drawable/m12.png
diff --git a/res/drawable/m13.png b/app/src/main/res/drawable/m13.png
similarity index 100%
rename from res/drawable/m13.png
rename to app/src/main/res/drawable/m13.png
diff --git a/res/drawable/m14.png b/app/src/main/res/drawable/m14.png
similarity index 100%
rename from res/drawable/m14.png
rename to app/src/main/res/drawable/m14.png
diff --git a/res/drawable/m15.png b/app/src/main/res/drawable/m15.png
similarity index 100%
rename from res/drawable/m15.png
rename to app/src/main/res/drawable/m15.png
diff --git a/res/drawable/m16.png b/app/src/main/res/drawable/m16.png
similarity index 100%
rename from res/drawable/m16.png
rename to app/src/main/res/drawable/m16.png
diff --git a/res/drawable/m17.png b/app/src/main/res/drawable/m17.png
similarity index 100%
rename from res/drawable/m17.png
rename to app/src/main/res/drawable/m17.png
diff --git a/res/drawable/m18.png b/app/src/main/res/drawable/m18.png
similarity index 100%
rename from res/drawable/m18.png
rename to app/src/main/res/drawable/m18.png
diff --git a/res/drawable/m19.png b/app/src/main/res/drawable/m19.png
similarity index 100%
rename from res/drawable/m19.png
rename to app/src/main/res/drawable/m19.png
diff --git a/res/drawable/m20.png b/app/src/main/res/drawable/m20.png
similarity index 100%
rename from res/drawable/m20.png
rename to app/src/main/res/drawable/m20.png
diff --git a/res/drawable/m21.png b/app/src/main/res/drawable/m21.png
similarity index 100%
rename from res/drawable/m21.png
rename to app/src/main/res/drawable/m21.png
diff --git a/res/drawable/m22.png b/app/src/main/res/drawable/m22.png
similarity index 100%
rename from res/drawable/m22.png
rename to app/src/main/res/drawable/m22.png
diff --git a/res/drawable/m23.png b/app/src/main/res/drawable/m23.png
similarity index 100%
rename from res/drawable/m23.png
rename to app/src/main/res/drawable/m23.png
diff --git a/res/drawable/m24.png b/app/src/main/res/drawable/m24.png
similarity index 100%
rename from res/drawable/m24.png
rename to app/src/main/res/drawable/m24.png
diff --git a/res/drawable/m25.png b/app/src/main/res/drawable/m25.png
similarity index 100%
rename from res/drawable/m25.png
rename to app/src/main/res/drawable/m25.png
diff --git a/res/drawable/m26.png b/app/src/main/res/drawable/m26.png
similarity index 100%
rename from res/drawable/m26.png
rename to app/src/main/res/drawable/m26.png
diff --git a/res/drawable/m27.png b/app/src/main/res/drawable/m27.png
similarity index 100%
rename from res/drawable/m27.png
rename to app/src/main/res/drawable/m27.png
diff --git a/res/drawable/m28.png b/app/src/main/res/drawable/m28.png
similarity index 100%
rename from res/drawable/m28.png
rename to app/src/main/res/drawable/m28.png
diff --git a/res/drawable/m29.png b/app/src/main/res/drawable/m29.png
similarity index 100%
rename from res/drawable/m29.png
rename to app/src/main/res/drawable/m29.png
diff --git a/res/drawable/m30.png b/app/src/main/res/drawable/m30.png
similarity index 100%
rename from res/drawable/m30.png
rename to app/src/main/res/drawable/m30.png
diff --git a/res/drawable/m31.png b/app/src/main/res/drawable/m31.png
similarity index 100%
rename from res/drawable/m31.png
rename to app/src/main/res/drawable/m31.png
diff --git a/res/drawable/m32.png b/app/src/main/res/drawable/m32.png
similarity index 100%
rename from res/drawable/m32.png
rename to app/src/main/res/drawable/m32.png
diff --git a/res/drawable/m33.png b/app/src/main/res/drawable/m33.png
similarity index 100%
rename from res/drawable/m33.png
rename to app/src/main/res/drawable/m33.png
diff --git a/res/drawable/m34.png b/app/src/main/res/drawable/m34.png
similarity index 100%
rename from res/drawable/m34.png
rename to app/src/main/res/drawable/m34.png
diff --git a/res/drawable/m35.png b/app/src/main/res/drawable/m35.png
similarity index 100%
rename from res/drawable/m35.png
rename to app/src/main/res/drawable/m35.png
diff --git a/res/drawable/m36.png b/app/src/main/res/drawable/m36.png
similarity index 100%
rename from res/drawable/m36.png
rename to app/src/main/res/drawable/m36.png
diff --git a/res/drawable/m37.png b/app/src/main/res/drawable/m37.png
similarity index 100%
rename from res/drawable/m37.png
rename to app/src/main/res/drawable/m37.png
diff --git a/res/drawable/m38.png b/app/src/main/res/drawable/m38.png
similarity index 100%
rename from res/drawable/m38.png
rename to app/src/main/res/drawable/m38.png
diff --git a/res/drawable/m39.png b/app/src/main/res/drawable/m39.png
similarity index 100%
rename from res/drawable/m39.png
rename to app/src/main/res/drawable/m39.png
diff --git a/res/drawable/m40.png b/app/src/main/res/drawable/m40.png
similarity index 100%
rename from res/drawable/m40.png
rename to app/src/main/res/drawable/m40.png
diff --git a/res/drawable/m41.png b/app/src/main/res/drawable/m41.png
similarity index 100%
rename from res/drawable/m41.png
rename to app/src/main/res/drawable/m41.png
diff --git a/res/drawable/m42.png b/app/src/main/res/drawable/m42.png
similarity index 100%
rename from res/drawable/m42.png
rename to app/src/main/res/drawable/m42.png
diff --git a/res/drawable/m43.png b/app/src/main/res/drawable/m43.png
similarity index 100%
rename from res/drawable/m43.png
rename to app/src/main/res/drawable/m43.png
diff --git a/res/drawable/m44.png b/app/src/main/res/drawable/m44.png
similarity index 100%
rename from res/drawable/m44.png
rename to app/src/main/res/drawable/m44.png
diff --git a/res/drawable/m45.png b/app/src/main/res/drawable/m45.png
similarity index 100%
rename from res/drawable/m45.png
rename to app/src/main/res/drawable/m45.png
diff --git a/res/drawable/m46.png b/app/src/main/res/drawable/m46.png
similarity index 100%
rename from res/drawable/m46.png
rename to app/src/main/res/drawable/m46.png
diff --git a/res/drawable/m47.png b/app/src/main/res/drawable/m47.png
similarity index 100%
rename from res/drawable/m47.png
rename to app/src/main/res/drawable/m47.png
diff --git a/res/drawable/m48.png b/app/src/main/res/drawable/m48.png
similarity index 100%
rename from res/drawable/m48.png
rename to app/src/main/res/drawable/m48.png
diff --git a/res/drawable/m49.png b/app/src/main/res/drawable/m49.png
similarity index 100%
rename from res/drawable/m49.png
rename to app/src/main/res/drawable/m49.png
diff --git a/res/drawable/n01.png b/app/src/main/res/drawable/n01.png
similarity index 100%
rename from res/drawable/n01.png
rename to app/src/main/res/drawable/n01.png
diff --git a/res/drawable/n02.png b/app/src/main/res/drawable/n02.png
similarity index 100%
rename from res/drawable/n02.png
rename to app/src/main/res/drawable/n02.png
diff --git a/res/drawable/n03.png b/app/src/main/res/drawable/n03.png
similarity index 100%
rename from res/drawable/n03.png
rename to app/src/main/res/drawable/n03.png
diff --git a/res/drawable/n04.png b/app/src/main/res/drawable/n04.png
similarity index 100%
rename from res/drawable/n04.png
rename to app/src/main/res/drawable/n04.png
diff --git a/res/drawable/n05.png b/app/src/main/res/drawable/n05.png
similarity index 100%
rename from res/drawable/n05.png
rename to app/src/main/res/drawable/n05.png
diff --git a/res/drawable/n06.png b/app/src/main/res/drawable/n06.png
similarity index 100%
rename from res/drawable/n06.png
rename to app/src/main/res/drawable/n06.png
diff --git a/res/drawable/n07.png b/app/src/main/res/drawable/n07.png
similarity index 100%
rename from res/drawable/n07.png
rename to app/src/main/res/drawable/n07.png
diff --git a/res/drawable/n08.png b/app/src/main/res/drawable/n08.png
similarity index 100%
rename from res/drawable/n08.png
rename to app/src/main/res/drawable/n08.png
diff --git a/res/drawable/n09.png b/app/src/main/res/drawable/n09.png
similarity index 100%
rename from res/drawable/n09.png
rename to app/src/main/res/drawable/n09.png
diff --git a/res/drawable/n10.png b/app/src/main/res/drawable/n10.png
similarity index 100%
rename from res/drawable/n10.png
rename to app/src/main/res/drawable/n10.png
diff --git a/res/drawable/n11.png b/app/src/main/res/drawable/n11.png
similarity index 100%
rename from res/drawable/n11.png
rename to app/src/main/res/drawable/n11.png
diff --git a/res/drawable/n12.png b/app/src/main/res/drawable/n12.png
similarity index 100%
rename from res/drawable/n12.png
rename to app/src/main/res/drawable/n12.png
diff --git a/res/drawable/n13.png b/app/src/main/res/drawable/n13.png
similarity index 100%
rename from res/drawable/n13.png
rename to app/src/main/res/drawable/n13.png
diff --git a/res/drawable/n14.png b/app/src/main/res/drawable/n14.png
similarity index 100%
rename from res/drawable/n14.png
rename to app/src/main/res/drawable/n14.png
diff --git a/res/drawable/n15.png b/app/src/main/res/drawable/n15.png
similarity index 100%
rename from res/drawable/n15.png
rename to app/src/main/res/drawable/n15.png
diff --git a/res/drawable/n16.png b/app/src/main/res/drawable/n16.png
similarity index 100%
rename from res/drawable/n16.png
rename to app/src/main/res/drawable/n16.png
diff --git a/res/drawable/n17.png b/app/src/main/res/drawable/n17.png
similarity index 100%
rename from res/drawable/n17.png
rename to app/src/main/res/drawable/n17.png
diff --git a/res/drawable/n18.png b/app/src/main/res/drawable/n18.png
similarity index 100%
rename from res/drawable/n18.png
rename to app/src/main/res/drawable/n18.png
diff --git a/res/drawable/n19.png b/app/src/main/res/drawable/n19.png
similarity index 100%
rename from res/drawable/n19.png
rename to app/src/main/res/drawable/n19.png
diff --git a/res/drawable/n20.png b/app/src/main/res/drawable/n20.png
similarity index 100%
rename from res/drawable/n20.png
rename to app/src/main/res/drawable/n20.png
diff --git a/res/drawable/n21.png b/app/src/main/res/drawable/n21.png
similarity index 100%
rename from res/drawable/n21.png
rename to app/src/main/res/drawable/n21.png
diff --git a/res/drawable/n22.png b/app/src/main/res/drawable/n22.png
similarity index 100%
rename from res/drawable/n22.png
rename to app/src/main/res/drawable/n22.png
diff --git a/res/drawable/n23.png b/app/src/main/res/drawable/n23.png
similarity index 100%
rename from res/drawable/n23.png
rename to app/src/main/res/drawable/n23.png
diff --git a/res/drawable/n24.png b/app/src/main/res/drawable/n24.png
similarity index 100%
rename from res/drawable/n24.png
rename to app/src/main/res/drawable/n24.png
diff --git a/res/drawable/n25.png b/app/src/main/res/drawable/n25.png
similarity index 100%
rename from res/drawable/n25.png
rename to app/src/main/res/drawable/n25.png
diff --git a/res/drawable/n26.png b/app/src/main/res/drawable/n26.png
similarity index 100%
rename from res/drawable/n26.png
rename to app/src/main/res/drawable/n26.png
diff --git a/res/drawable/n27.png b/app/src/main/res/drawable/n27.png
similarity index 100%
rename from res/drawable/n27.png
rename to app/src/main/res/drawable/n27.png
diff --git a/res/drawable/n28.png b/app/src/main/res/drawable/n28.png
similarity index 100%
rename from res/drawable/n28.png
rename to app/src/main/res/drawable/n28.png
diff --git a/res/drawable/n29.png b/app/src/main/res/drawable/n29.png
similarity index 100%
rename from res/drawable/n29.png
rename to app/src/main/res/drawable/n29.png
diff --git a/res/drawable/n30.png b/app/src/main/res/drawable/n30.png
similarity index 100%
rename from res/drawable/n30.png
rename to app/src/main/res/drawable/n30.png
diff --git a/res/drawable/n31.png b/app/src/main/res/drawable/n31.png
similarity index 100%
rename from res/drawable/n31.png
rename to app/src/main/res/drawable/n31.png
diff --git a/res/drawable/n32.png b/app/src/main/res/drawable/n32.png
similarity index 100%
rename from res/drawable/n32.png
rename to app/src/main/res/drawable/n32.png
diff --git a/res/drawable/n33.png b/app/src/main/res/drawable/n33.png
similarity index 100%
rename from res/drawable/n33.png
rename to app/src/main/res/drawable/n33.png
diff --git a/res/drawable/n34.png b/app/src/main/res/drawable/n34.png
similarity index 100%
rename from res/drawable/n34.png
rename to app/src/main/res/drawable/n34.png
diff --git a/res/drawable/n35.png b/app/src/main/res/drawable/n35.png
similarity index 100%
rename from res/drawable/n35.png
rename to app/src/main/res/drawable/n35.png
diff --git a/res/drawable/n36.png b/app/src/main/res/drawable/n36.png
similarity index 100%
rename from res/drawable/n36.png
rename to app/src/main/res/drawable/n36.png
diff --git a/res/drawable/n37.png b/app/src/main/res/drawable/n37.png
similarity index 100%
rename from res/drawable/n37.png
rename to app/src/main/res/drawable/n37.png
diff --git a/res/drawable/n38.png b/app/src/main/res/drawable/n38.png
similarity index 100%
rename from res/drawable/n38.png
rename to app/src/main/res/drawable/n38.png
diff --git a/res/drawable/n39.png b/app/src/main/res/drawable/n39.png
similarity index 100%
rename from res/drawable/n39.png
rename to app/src/main/res/drawable/n39.png
diff --git a/res/drawable/n40.png b/app/src/main/res/drawable/n40.png
similarity index 100%
rename from res/drawable/n40.png
rename to app/src/main/res/drawable/n40.png
diff --git a/res/drawable/n41.png b/app/src/main/res/drawable/n41.png
similarity index 100%
rename from res/drawable/n41.png
rename to app/src/main/res/drawable/n41.png
diff --git a/res/drawable/n42.png b/app/src/main/res/drawable/n42.png
similarity index 100%
rename from res/drawable/n42.png
rename to app/src/main/res/drawable/n42.png
diff --git a/res/drawable/n43.png b/app/src/main/res/drawable/n43.png
similarity index 100%
rename from res/drawable/n43.png
rename to app/src/main/res/drawable/n43.png
diff --git a/res/drawable/n44.png b/app/src/main/res/drawable/n44.png
similarity index 100%
rename from res/drawable/n44.png
rename to app/src/main/res/drawable/n44.png
diff --git a/res/drawable/n45.png b/app/src/main/res/drawable/n45.png
similarity index 100%
rename from res/drawable/n45.png
rename to app/src/main/res/drawable/n45.png
diff --git a/res/drawable/n46.png b/app/src/main/res/drawable/n46.png
similarity index 100%
rename from res/drawable/n46.png
rename to app/src/main/res/drawable/n46.png
diff --git a/res/drawable/n47.png b/app/src/main/res/drawable/n47.png
similarity index 100%
rename from res/drawable/n47.png
rename to app/src/main/res/drawable/n47.png
diff --git a/res/drawable/n48.png b/app/src/main/res/drawable/n48.png
similarity index 100%
rename from res/drawable/n48.png
rename to app/src/main/res/drawable/n48.png
diff --git a/res/drawable/n49.png b/app/src/main/res/drawable/n49.png
similarity index 100%
rename from res/drawable/n49.png
rename to app/src/main/res/drawable/n49.png
diff --git a/res/drawable/parent.png b/app/src/main/res/drawable/parent.png
similarity index 100%
rename from res/drawable/parent.png
rename to app/src/main/res/drawable/parent.png
diff --git a/res/drawable/sym_keyboard_delete.png b/app/src/main/res/drawable/sym_keyboard_delete.png
similarity index 100%
rename from res/drawable/sym_keyboard_delete.png
rename to app/src/main/res/drawable/sym_keyboard_delete.png
diff --git a/res/drawable/sym_keyboard_done.png b/app/src/main/res/drawable/sym_keyboard_done.png
similarity index 100%
rename from res/drawable/sym_keyboard_done.png
rename to app/src/main/res/drawable/sym_keyboard_done.png
diff --git a/res/drawable/sym_keyboard_return.png b/app/src/main/res/drawable/sym_keyboard_return.png
similarity index 100%
rename from res/drawable/sym_keyboard_return.png
rename to app/src/main/res/drawable/sym_keyboard_return.png
diff --git a/res/drawable/sym_keyboard_search.png b/app/src/main/res/drawable/sym_keyboard_search.png
similarity index 100%
rename from res/drawable/sym_keyboard_search.png
rename to app/src/main/res/drawable/sym_keyboard_search.png
diff --git a/res/drawable/sym_keyboard_shift.png b/app/src/main/res/drawable/sym_keyboard_shift.png
similarity index 100%
rename from res/drawable/sym_keyboard_shift.png
rename to app/src/main/res/drawable/sym_keyboard_shift.png
diff --git a/res/drawable/sym_keyboard_space.png b/app/src/main/res/drawable/sym_keyboard_space.png
similarity index 100%
rename from res/drawable/sym_keyboard_space.png
rename to app/src/main/res/drawable/sym_keyboard_space.png
diff --git a/res/drawable/touch.png b/app/src/main/res/drawable/touch.png
similarity index 100%
rename from res/drawable/touch.png
rename to app/src/main/res/drawable/touch.png
diff --git a/res/layout/file_row.xml b/app/src/main/res/layout/file_row.xml
similarity index 100%
rename from res/layout/file_row.xml
rename to app/src/main/res/layout/file_row.xml
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/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