optimize file structure

REBOOTERS · Sep 26, 2023 · 59bd785 · 59bd785
1 parent 50d12e4
commit 59bd785
Show file tree

Hide file tree

Showing 552 changed files with 6 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -200,8 +200,8 @@ dependencies {
     if (!imitate_isApp.toBoolean()) {
         implementation project(':imitate')
     }
-    implementation project(path: ':dataview')
-    implementation project(path: ':skeleton')
+    implementation project(path: ':subs:dataview')
+    implementation project(path: ':subs:skeleton')
 
     implementation 'com.alibaba:fastjson:2.0.19.graal'
 

diff --git a/imitate/build.gradle b/imitate/build.gradle
@@ -140,7 +140,7 @@ dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.lifecycle:lifecycle-process:2.6.1'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
-    implementation project(path: ':cpp_native')
+    implementation project(path: ':subs:cpp_native')
 
 
     testImplementation 'junit:junit:4.13.2'
@@ -181,8 +181,8 @@ dependencies {
     // robolectric
 
     implementation group: 'commons-io', name: 'commons-io', version: '20030203.000550'
-    implementation project(path: ':game')
-    implementation project(path: ':gif-revert')
+    implementation project(path: ':subs:game')
+    implementation project(path: ':subs:gif-revert')
 
     implementation 'com.jaredrummler:simple-mvp:1.0.2'
 

diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':app', ':imitate', ':skeleton', ':dataview', ':gif-revert', ':game', ':cpp_native'
+include ':app', ':imitate', ':subs:skeleton', ':subs:dataview', ':subs:gif-revert', ':subs:game', ':subs:cpp_native'
diff --git a/cpp_native/.gitignore → subs/cpp_native/.gitignore b/cpp_native/.gitignore → subs/cpp_native/.gitignore
diff --git a/cpp_native/build.gradle → subs/cpp_native/build.gradle b/cpp_native/build.gradle → subs/cpp_native/build.gradle
diff --git a/cpp_native/consumer-rules.pro → subs/cpp_native/consumer-rules.pro b/cpp_native/consumer-rules.pro → subs/cpp_native/consumer-rules.pro
diff --git a/cpp_native/proguard-rules.pro → subs/cpp_native/proguard-rules.pro b/cpp_native/proguard-rules.pro → subs/cpp_native/proguard-rules.pro
diff --git a/cpp_native/src/main/AndroidManifest.xml → subs/cpp_native/src/main/AndroidManifest.xml b/cpp_native/src/main/AndroidManifest.xml → subs/cpp_native/src/main/AndroidManifest.xml
diff --git a/cpp_native/src/main/cpp/CMakeLists.txt → subs/cpp_native/src/main/cpp/CMakeLists.txt b/cpp_native/src/main/cpp/CMakeLists.txt → subs/cpp_native/src/main/cpp/CMakeLists.txt
diff --git a/cpp_native/src/main/cpp/bspatch.c → subs/cpp_native/src/main/cpp/bspatch.c b/cpp_native/src/main/cpp/bspatch.c → subs/cpp_native/src/main/cpp/bspatch.c
diff --git a/cpp_native/src/main/cpp/bzip/blocksort.c → .../cpp_native/src/main/cpp/bzip/blocksort.c b/cpp_native/src/main/cpp/bzip/blocksort.c → .../cpp_native/src/main/cpp/bzip/blocksort.c
diff --git a/cpp_native/src/main/cpp/bzip/bspatch.h → subs/cpp_native/src/main/cpp/bzip/bspatch.h b/cpp_native/src/main/cpp/bzip/bspatch.h → subs/cpp_native/src/main/cpp/bzip/bspatch.h
diff --git a/cpp_native/src/main/cpp/bzip/bzlib.c → subs/cpp_native/src/main/cpp/bzip/bzlib.c b/cpp_native/src/main/cpp/bzip/bzlib.c → subs/cpp_native/src/main/cpp/bzip/bzlib.c
diff --git a/cpp_native/src/main/cpp/bzip/bzlib.h → subs/cpp_native/src/main/cpp/bzip/bzlib.h b/cpp_native/src/main/cpp/bzip/bzlib.h → subs/cpp_native/src/main/cpp/bzip/bzlib.h
diff --git a/cpp_native/src/main/cpp/bzip/bzlib_private.h → ..._native/src/main/cpp/bzip/bzlib_private.h b/cpp_native/src/main/cpp/bzip/bzlib_private.h → ..._native/src/main/cpp/bzip/bzlib_private.h
diff --git a/cpp_native/src/main/cpp/bzip/compress.c → subs/cpp_native/src/main/cpp/bzip/compress.c b/cpp_native/src/main/cpp/bzip/compress.c → subs/cpp_native/src/main/cpp/bzip/compress.c
diff --git a/cpp_native/src/main/cpp/bzip/crctable.c → subs/cpp_native/src/main/cpp/bzip/crctable.c b/cpp_native/src/main/cpp/bzip/crctable.c → subs/cpp_native/src/main/cpp/bzip/crctable.c
diff --git a/cpp_native/src/main/cpp/bzip/decompress.c → ...cpp_native/src/main/cpp/bzip/decompress.c b/cpp_native/src/main/cpp/bzip/decompress.c → ...cpp_native/src/main/cpp/bzip/decompress.c
diff --git a/cpp_native/src/main/cpp/bzip/huffman.c → subs/cpp_native/src/main/cpp/bzip/huffman.c b/cpp_native/src/main/cpp/bzip/huffman.c → subs/cpp_native/src/main/cpp/bzip/huffman.c
diff --git a/cpp_native/src/main/cpp/bzip/randtable.c → .../cpp_native/src/main/cpp/bzip/randtable.c b/cpp_native/src/main/cpp/bzip/randtable.c → .../cpp_native/src/main/cpp/bzip/randtable.c
diff --git a/cpp_native/src/main/cpp/cpp_native.cpp → subs/cpp_native/src/main/cpp/cpp_native.cpp b/cpp_native/src/main/cpp/cpp_native.cpp → subs/cpp_native/src/main/cpp/cpp_native.cpp
diff --git a/cpp_native/src/main/cpp/logcat/androidlog.h → ...p_native/src/main/cpp/logcat/androidlog.h b/cpp_native/src/main/cpp/logcat/androidlog.h → ...p_native/src/main/cpp/logcat/androidlog.h
diff --git a/.../com/example/cpp_native/app/NativeRoot.kt → .../com/example/cpp_native/app/NativeRoot.kt b/.../com/example/cpp_native/app/NativeRoot.kt → .../com/example/cpp_native/app/NativeRoot.kt
diff --git a/...mple/cpp_native/internal/NativeHouse.java → ...mple/cpp_native/internal/NativeHouse.java b/...mple/cpp_native/internal/NativeHouse.java → ...mple/cpp_native/internal/NativeHouse.java
diff --git a/...xample/cpp_native/internal/PatchUtil.java → ...xample/cpp_native/internal/PatchUtil.java b/...xample/cpp_native/internal/PatchUtil.java → ...xample/cpp_native/internal/PatchUtil.java
diff --git a/dataview/.gitignore → subs/dataview/.gitignore b/dataview/.gitignore → subs/dataview/.gitignore
diff --git a/dataview/build.gradle → subs/dataview/build.gradle b/dataview/build.gradle → subs/dataview/build.gradle
diff --git a/dataview/proguard-rules.pro → subs/dataview/proguard-rules.pro b/dataview/proguard-rules.pro → subs/dataview/proguard-rules.pro
diff --git a/...eer/dateview/ExampleInstrumentedTest.java → ...eer/dateview/ExampleInstrumentedTest.java b/...eer/dateview/ExampleInstrumentedTest.java → ...eer/dateview/ExampleInstrumentedTest.java
diff --git a/dataview/src/main/AndroidManifest.xml → subs/dataview/src/main/AndroidManifest.xml b/dataview/src/main/AndroidManifest.xml → subs/dataview/src/main/AndroidManifest.xml
diff --git a/...neer/dateview/api/ActivityRepository.java → ...neer/dateview/api/ActivityRepository.java b/...neer/dateview/api/ActivityRepository.java → ...neer/dateview/api/ActivityRepository.java
diff --git a/...er/dateview/api/ActivityRoomDatabase.java → ...er/dateview/api/ActivityRoomDatabase.java b/...er/dateview/api/ActivityRoomDatabase.java → ...er/dateview/api/ActivityRoomDatabase.java
diff --git a/...a/com/engineer/dateview/api/DataView.java → ...a/com/engineer/dateview/api/DataView.java b/...a/com/engineer/dateview/api/DataView.java → ...a/com/engineer/dateview/api/DataView.java
diff --git a/...eer/dateview/api/UpdateModelDelegate.java → ...eer/dateview/api/UpdateModelDelegate.java b/...eer/dateview/api/UpdateModelDelegate.java → ...eer/dateview/api/UpdateModelDelegate.java
diff --git a/...om/engineer/dateview/dao/ActivityDao.java → ...om/engineer/dateview/dao/ActivityDao.java b/...om/engineer/dateview/dao/ActivityDao.java → ...om/engineer/dateview/dao/ActivityDao.java
diff --git a/...erfaces/MyActivityLifecycleCallbacks.java → ...erfaces/MyActivityLifecycleCallbacks.java b/...erfaces/MyActivityLifecycleCallbacks.java → ...erfaces/MyActivityLifecycleCallbacks.java
diff --git a/...view/internal/AutoSchedulerTransformer.kt → ...view/internal/AutoSchedulerTransformer.kt b/...view/internal/AutoSchedulerTransformer.kt → ...view/internal/AutoSchedulerTransformer.kt
diff --git a/...com/engineer/dateview/model/ActModel.java → ...com/engineer/dateview/model/ActModel.java b/...com/engineer/dateview/model/ActModel.java → ...com/engineer/dateview/model/ActModel.java
diff --git a/.../engineer/dateview/ui/DataViewActivity.kt → .../engineer/dateview/ui/DataViewActivity.kt b/.../engineer/dateview/ui/DataViewActivity.kt → .../engineer/dateview/ui/DataViewActivity.kt
diff --git a/...rc/main/res/layout/activity_data_view.xml → ...rc/main/res/layout/activity_data_view.xml b/...rc/main/res/layout/activity_data_view.xml → ...rc/main/res/layout/activity_data_view.xml
diff --git a/dataview/src/main/res/values/strings.xml → .../dataview/src/main/res/values/strings.xml b/dataview/src/main/res/values/strings.xml → .../dataview/src/main/res/values/strings.xml
diff --git a/...om/engineer/dateview/ExampleUnitTest.java → ...om/engineer/dateview/ExampleUnitTest.java b/...om/engineer/dateview/ExampleUnitTest.java → ...om/engineer/dateview/ExampleUnitTest.java
diff --git a/game/.gitignore → subs/game/.gitignore b/game/.gitignore → subs/game/.gitignore
diff --git a/game/build.gradle → subs/game/build.gradle b/game/build.gradle → subs/game/build.gradle
diff --git a/game/consumer-rules.pro → subs/game/consumer-rules.pro b/game/consumer-rules.pro → subs/game/consumer-rules.pro
diff --git a/game/proguard-rules.pro → subs/game/proguard-rules.pro b/game/proguard-rules.pro → subs/game/proguard-rules.pro
diff --git a/...r/android/game/ExampleInstrumentedTest.kt → ...r/android/game/ExampleInstrumentedTest.kt b/...r/android/game/ExampleInstrumentedTest.kt → ...r/android/game/ExampleInstrumentedTest.kt
diff --git a/game/src/main/AndroidManifest.xml → subs/game/src/main/AndroidManifest.xml b/game/src/main/AndroidManifest.xml → subs/game/src/main/AndroidManifest.xml
diff --git a/game/src/main/assets/2048/.gitignore → subs/game/src/main/assets/2048/.gitignore b/game/src/main/assets/2048/.gitignore → subs/game/src/main/assets/2048/.gitignore
diff --git a/game/src/main/assets/2048/.jshintrc → subs/game/src/main/assets/2048/.jshintrc b/game/src/main/assets/2048/.jshintrc → subs/game/src/main/assets/2048/.jshintrc
diff --git a/game/src/main/assets/2048/CONTRIBUTING.md → ...game/src/main/assets/2048/CONTRIBUTING.md b/game/src/main/assets/2048/CONTRIBUTING.md → ...game/src/main/assets/2048/CONTRIBUTING.md
diff --git a/game/src/main/assets/2048/LICENSE.txt → subs/game/src/main/assets/2048/LICENSE.txt b/game/src/main/assets/2048/LICENSE.txt → subs/game/src/main/assets/2048/LICENSE.txt
diff --git a/game/src/main/assets/2048/README.md → subs/game/src/main/assets/2048/README.md b/game/src/main/assets/2048/README.md → subs/game/src/main/assets/2048/README.md
diff --git a/game/src/main/assets/2048/Rakefile → subs/game/src/main/assets/2048/Rakefile b/game/src/main/assets/2048/Rakefile → subs/game/src/main/assets/2048/Rakefile
diff --git a/game/src/main/assets/2048/favicon.ico → subs/game/src/main/assets/2048/favicon.ico b/game/src/main/assets/2048/favicon.ico → subs/game/src/main/assets/2048/favicon.ico
diff --git a/game/src/main/assets/2048/index.html → subs/game/src/main/assets/2048/index.html b/game/src/main/assets/2048/index.html → subs/game/src/main/assets/2048/index.html
diff --git a/...main/assets/2048/js/animframe_polyfill.js → ...main/assets/2048/js/animframe_polyfill.js b/...main/assets/2048/js/animframe_polyfill.js → ...main/assets/2048/js/animframe_polyfill.js
diff --git a/game/src/main/assets/2048/js/application.js → ...me/src/main/assets/2048/js/application.js b/game/src/main/assets/2048/js/application.js → ...me/src/main/assets/2048/js/application.js
diff --git a/.../src/main/assets/2048/js/bind_polyfill.js → .../src/main/assets/2048/js/bind_polyfill.js b/.../src/main/assets/2048/js/bind_polyfill.js → .../src/main/assets/2048/js/bind_polyfill.js
diff --git a/...main/assets/2048/js/classlist_polyfill.js → ...main/assets/2048/js/classlist_polyfill.js b/...main/assets/2048/js/classlist_polyfill.js → ...main/assets/2048/js/classlist_polyfill.js
diff --git a/game/src/main/assets/2048/js/game_manager.js → ...e/src/main/assets/2048/js/game_manager.js b/game/src/main/assets/2048/js/game_manager.js → ...e/src/main/assets/2048/js/game_manager.js
diff --git a/game/src/main/assets/2048/js/grid.js → subs/game/src/main/assets/2048/js/grid.js b/game/src/main/assets/2048/js/grid.js → subs/game/src/main/assets/2048/js/grid.js
diff --git a/.../src/main/assets/2048/js/html_actuator.js → .../src/main/assets/2048/js/html_actuator.js b/.../src/main/assets/2048/js/html_actuator.js → .../src/main/assets/2048/js/html_actuator.js
diff --git a/game/src/main/assets/2048/js/i18n.js → subs/game/src/main/assets/2048/js/i18n.js b/game/src/main/assets/2048/js/i18n.js → subs/game/src/main/assets/2048/js/i18n.js
diff --git a/.../assets/2048/js/keyboard_input_manager.js → .../assets/2048/js/keyboard_input_manager.js b/.../assets/2048/js/keyboard_input_manager.js → .../assets/2048/js/keyboard_input_manager.js
diff --git a/...n/assets/2048/js/local_storage_manager.js → ...n/assets/2048/js/local_storage_manager.js b/...n/assets/2048/js/local_storage_manager.js → ...n/assets/2048/js/local_storage_manager.js
diff --git a/game/src/main/assets/2048/js/nightmode.js → ...game/src/main/assets/2048/js/nightmode.js b/game/src/main/assets/2048/js/nightmode.js → ...game/src/main/assets/2048/js/nightmode.js
diff --git a/game/src/main/assets/2048/js/tile.js → subs/game/src/main/assets/2048/js/tile.js b/game/src/main/assets/2048/js/tile.js → subs/game/src/main/assets/2048/js/tile.js
diff --git a/...ain/assets/2048/meta/apple-touch-icon.png → ...ain/assets/2048/meta/apple-touch-icon.png b/...ain/assets/2048/meta/apple-touch-icon.png → ...ain/assets/2048/meta/apple-touch-icon.png
diff --git a/...ta/apple-touch-startup-image-640x1096.png → ...ta/apple-touch-startup-image-640x1096.png b/...ta/apple-touch-startup-image-640x1096.png → ...ta/apple-touch-startup-image-640x1096.png
diff --git a/...eta/apple-touch-startup-image-640x920.png → ...eta/apple-touch-startup-image-640x920.png b/...eta/apple-touch-startup-image-640x920.png → ...eta/apple-touch-startup-image-640x920.png
diff --git a/...main/assets/2048/screenshots/screen01.png → ...main/assets/2048/screenshots/screen01.png b/...main/assets/2048/screenshots/screen01.png → ...main/assets/2048/screenshots/screen01.png
diff --git a/...48/style/fonts/ClearSans-Bold-webfont.eot → ...48/style/fonts/ClearSans-Bold-webfont.eot b/...48/style/fonts/ClearSans-Bold-webfont.eot → ...48/style/fonts/ClearSans-Bold-webfont.eot
diff --git a/...48/style/fonts/ClearSans-Bold-webfont.svg → ...48/style/fonts/ClearSans-Bold-webfont.svg b/...48/style/fonts/ClearSans-Bold-webfont.svg → ...48/style/fonts/ClearSans-Bold-webfont.svg
diff --git a/...8/style/fonts/ClearSans-Bold-webfont.woff → ...8/style/fonts/ClearSans-Bold-webfont.woff b/...8/style/fonts/ClearSans-Bold-webfont.woff → ...8/style/fonts/ClearSans-Bold-webfont.woff
diff --git a/...8/style/fonts/ClearSans-Light-webfont.eot → ...8/style/fonts/ClearSans-Light-webfont.eot b/...8/style/fonts/ClearSans-Light-webfont.eot → ...8/style/fonts/ClearSans-Light-webfont.eot
diff --git a/...8/style/fonts/ClearSans-Light-webfont.svg → ...8/style/fonts/ClearSans-Light-webfont.svg b/...8/style/fonts/ClearSans-Light-webfont.svg → ...8/style/fonts/ClearSans-Light-webfont.svg
diff --git a/.../style/fonts/ClearSans-Light-webfont.woff → .../style/fonts/ClearSans-Light-webfont.woff b/.../style/fonts/ClearSans-Light-webfont.woff → .../style/fonts/ClearSans-Light-webfont.woff
diff --git a/...style/fonts/ClearSans-Regular-webfont.eot → ...style/fonts/ClearSans-Regular-webfont.eot b/...style/fonts/ClearSans-Regular-webfont.eot → ...style/fonts/ClearSans-Regular-webfont.eot
diff --git a/...style/fonts/ClearSans-Regular-webfont.svg → ...style/fonts/ClearSans-Regular-webfont.svg b/...style/fonts/ClearSans-Regular-webfont.svg → ...style/fonts/ClearSans-Regular-webfont.svg
diff --git a/...tyle/fonts/ClearSans-Regular-webfont.woff → ...tyle/fonts/ClearSans-Regular-webfont.woff b/...tyle/fonts/ClearSans-Regular-webfont.woff → ...tyle/fonts/ClearSans-Regular-webfont.woff
diff --git a/...in/assets/2048/style/fonts/clear-sans.css → ...in/assets/2048/style/fonts/clear-sans.css b/...in/assets/2048/style/fonts/clear-sans.css → ...in/assets/2048/style/fonts/clear-sans.css
diff --git a/game/src/main/assets/2048/style/helpers.scss → ...e/src/main/assets/2048/style/helpers.scss b/game/src/main/assets/2048/style/helpers.scss → ...e/src/main/assets/2048/style/helpers.scss
diff --git a/game/src/main/assets/2048/style/main.css → .../game/src/main/assets/2048/style/main.css b/game/src/main/assets/2048/style/main.css → .../game/src/main/assets/2048/style/main.css
diff --git a/game/src/main/assets/2048/style/main.scss → ...game/src/main/assets/2048/style/main.scss b/game/src/main/assets/2048/style/main.scss → ...game/src/main/assets/2048/style/main.scss
diff --git a/game/src/main/assets/2048/style/night.png → ...game/src/main/assets/2048/style/night.png b/game/src/main/assets/2048/style/night.png → ...game/src/main/assets/2048/style/night.png
diff --git a/game/src/main/assets/fonts/grobold.ttf → subs/game/src/main/assets/fonts/grobold.ttf b/game/src/main/assets/fonts/grobold.ttf → subs/game/src/main/assets/fonts/grobold.ttf
diff --git a/game/src/main/assets/game/index.html → subs/game/src/main/assets/game/index.html b/game/src/main/assets/game/index.html → subs/game/src/main/assets/game/index.html
diff --git a/game/src/main/assets/game/res/icon.png → subs/game/src/main/assets/game/res/icon.png b/game/src/main/assets/game/res/icon.png → subs/game/src/main/assets/game/res/icon.png
diff --git a/.../main/assets/schulte/css/app.007af05c.css → .../main/assets/schulte/css/app.007af05c.css b/.../main/assets/schulte/css/app.007af05c.css → .../main/assets/schulte/css/app.007af05c.css
diff --git a/...ts/schulte/css/chunk-vendors.4cd1e086.css → ...ts/schulte/css/chunk-vendors.4cd1e086.css b/...ts/schulte/css/chunk-vendors.4cd1e086.css → ...ts/schulte/css/chunk-vendors.4cd1e086.css
diff --git a/game/src/main/assets/schulte/favicon.ico → .../game/src/main/assets/schulte/favicon.ico b/game/src/main/assets/schulte/favicon.ico → .../game/src/main/assets/schulte/favicon.ico
diff --git a/game/src/main/assets/schulte/index.html → subs/game/src/main/assets/schulte/index.html b/game/src/main/assets/schulte/index.html → subs/game/src/main/assets/schulte/index.html
diff --git a/...rc/main/assets/schulte/js/app.8fab308a.js → ...rc/main/assets/schulte/js/app.8fab308a.js b/...rc/main/assets/schulte/js/app.8fab308a.js → ...rc/main/assets/schulte/js/app.8fab308a.js
diff --git a/...sets/schulte/js/chunk-vendors.05af8bc6.js → ...sets/schulte/js/chunk-vendors.05af8bc6.js b/...sets/schulte/js/chunk-vendors.05af8bc6.js → ...sets/schulte/js/chunk-vendors.05af8bc6.js
diff --git a/game/src/main/assets/square/index.html → subs/game/src/main/assets/square/index.html b/game/src/main/assets/square/index.html → subs/game/src/main/assets/square/index.html
diff --git a/.../app.c4da78ddaaf0dc9ade5110b5ba476403.css → .../app.c4da78ddaaf0dc9ade5110b5ba476403.css b/.../app.c4da78ddaaf0dc9ade5110b5ba476403.css → .../app.c4da78ddaaf0dc9ade5110b5ba476403.css
diff --git a/....c4da78ddaaf0dc9ade5110b5ba476403.css.map → ....c4da78ddaaf0dc9ade5110b5ba476403.css.map b/....c4da78ddaaf0dc9ade5110b5ba476403.css.map → ....c4da78ddaaf0dc9ade5110b5ba476403.css.map
diff --git a/...are/static/js/app.870b44035107d02070ec.js → ...are/static/js/app.870b44035107d02070ec.js b/...are/static/js/app.870b44035107d02070ec.js → ...are/static/js/app.870b44035107d02070ec.js
diff --git a/...static/js/app.870b44035107d02070ec.js.map → ...static/js/app.870b44035107d02070ec.js.map b/...static/js/app.870b44035107d02070ec.js.map → ...static/js/app.870b44035107d02070ec.js.map
diff --git a/...tatic/js/manifest.5131a6dcf85fbcf7bf37.js → ...tatic/js/manifest.5131a6dcf85fbcf7bf37.js b/...tatic/js/manifest.5131a6dcf85fbcf7bf37.js → ...tatic/js/manifest.5131a6dcf85fbcf7bf37.js
diff --git a/...c/js/manifest.5131a6dcf85fbcf7bf37.js.map → ...c/js/manifest.5131a6dcf85fbcf7bf37.js.map b/...c/js/manifest.5131a6dcf85fbcf7bf37.js.map → ...c/js/manifest.5131a6dcf85fbcf7bf37.js.map
diff --git a/.../static/js/vendor.66c8ac3f43782ce33066.js → .../static/js/vendor.66c8ac3f43782ce33066.js b/.../static/js/vendor.66c8ac3f43782ce33066.js → .../static/js/vendor.66c8ac3f43782ce33066.js
diff --git a/...tic/js/vendor.66c8ac3f43782ce33066.js.map → ...tic/js/vendor.66c8ac3f43782ce33066.js.map b/...tic/js/vendor.66c8ac3f43782ce33066.js.map → ...tic/js/vendor.66c8ac3f43782ce33066.js.map
diff --git a/.../src/main/assets/square/static/loader.css → .../src/main/assets/square/static/loader.css b/.../src/main/assets/square/static/loader.css → .../src/main/assets/square/static/loader.css
diff --git a/game/src/main/assets/square/static/music.mp3 → ...e/src/main/assets/square/static/music.mp3 b/game/src/main/assets/square/static/music.mp3 → ...e/src/main/assets/square/static/music.mp3
diff --git a/game/src/main/assets/square/static/qr.jpeg → ...ame/src/main/assets/square/static/qr.jpeg b/game/src/main/assets/square/static/qr.jpeg → ...ame/src/main/assets/square/static/qr.jpeg
diff --git a/...c/main/assets/tower/assets/background.png → ...c/main/assets/tower/assets/background.png b/...c/main/assets/tower/assets/background.png → ...c/main/assets/tower/assets/background.png
diff --git a/game/src/main/assets/tower/assets/bgm.mp3 → ...game/src/main/assets/tower/assets/bgm.mp3 b/game/src/main/assets/tower/assets/bgm.mp3 → ...game/src/main/assets/tower/assets/bgm.mp3
diff --git a/game/src/main/assets/tower/assets/bgm.ogg → ...game/src/main/assets/tower/assets/bgm.ogg b/game/src/main/assets/tower/assets/bgm.ogg → ...game/src/main/assets/tower/assets/bgm.ogg
diff --git a/...ain/assets/tower/assets/block-perfect.png → ...ain/assets/tower/assets/block-perfect.png b/...ain/assets/tower/assets/block-perfect.png → ...ain/assets/tower/assets/block-perfect.png
diff --git a/...c/main/assets/tower/assets/block-rope.png → ...c/main/assets/tower/assets/block-rope.png b/...c/main/assets/tower/assets/block-rope.png → ...c/main/assets/tower/assets/block-rope.png
diff --git a/game/src/main/assets/tower/assets/block.png → ...me/src/main/assets/tower/assets/block.png b/game/src/main/assets/tower/assets/block.png → ...me/src/main/assets/tower/assets/block.png
diff --git a/game/src/main/assets/tower/assets/c1.png → .../game/src/main/assets/tower/assets/c1.png b/game/src/main/assets/tower/assets/c1.png → .../game/src/main/assets/tower/assets/c1.png
diff --git a/game/src/main/assets/tower/assets/c2.png → .../game/src/main/assets/tower/assets/c2.png b/game/src/main/assets/tower/assets/c2.png → .../game/src/main/assets/tower/assets/c2.png
diff --git a/game/src/main/assets/tower/assets/c3.png → .../game/src/main/assets/tower/assets/c3.png b/game/src/main/assets/tower/assets/c3.png → .../game/src/main/assets/tower/assets/c3.png
diff --git a/game/src/main/assets/tower/assets/c4.png → .../game/src/main/assets/tower/assets/c4.png b/game/src/main/assets/tower/assets/c4.png → .../game/src/main/assets/tower/assets/c4.png
diff --git a/game/src/main/assets/tower/assets/c5.png → .../game/src/main/assets/tower/assets/c5.png b/game/src/main/assets/tower/assets/c5.png → .../game/src/main/assets/tower/assets/c5.png
diff --git a/game/src/main/assets/tower/assets/c6.png → .../game/src/main/assets/tower/assets/c6.png b/game/src/main/assets/tower/assets/c6.png → .../game/src/main/assets/tower/assets/c6.png
diff --git a/game/src/main/assets/tower/assets/c7.png → .../game/src/main/assets/tower/assets/c7.png b/game/src/main/assets/tower/assets/c7.png → .../game/src/main/assets/tower/assets/c7.png
diff --git a/game/src/main/assets/tower/assets/c8.png → .../game/src/main/assets/tower/assets/c8.png b/game/src/main/assets/tower/assets/c8.png → .../game/src/main/assets/tower/assets/c8.png
diff --git a/...main/assets/tower/assets/drop-perfect.mp3 → ...main/assets/tower/assets/drop-perfect.mp3 b/...main/assets/tower/assets/drop-perfect.mp3 → ...main/assets/tower/assets/drop-perfect.mp3
diff --git a/...main/assets/tower/assets/drop-perfect.ogg → ...main/assets/tower/assets/drop-perfect.ogg b/...main/assets/tower/assets/drop-perfect.ogg → ...main/assets/tower/assets/drop-perfect.ogg
diff --git a/game/src/main/assets/tower/assets/drop.mp3 → ...ame/src/main/assets/tower/assets/drop.mp3 b/game/src/main/assets/tower/assets/drop.mp3 → ...ame/src/main/assets/tower/assets/drop.mp3
diff --git a/game/src/main/assets/tower/assets/drop.ogg → ...ame/src/main/assets/tower/assets/drop.ogg b/game/src/main/assets/tower/assets/drop.ogg → ...ame/src/main/assets/tower/assets/drop.ogg
diff --git a/game/src/main/assets/tower/assets/f1.png → .../game/src/main/assets/tower/assets/f1.png b/game/src/main/assets/tower/assets/f1.png → .../game/src/main/assets/tower/assets/f1.png
diff --git a/game/src/main/assets/tower/assets/f2.png → .../game/src/main/assets/tower/assets/f2.png b/game/src/main/assets/tower/assets/f2.png → .../game/src/main/assets/tower/assets/f2.png
diff --git a/game/src/main/assets/tower/assets/f3.png → .../game/src/main/assets/tower/assets/f3.png b/game/src/main/assets/tower/assets/f3.png → .../game/src/main/assets/tower/assets/f3.png
diff --git a/game/src/main/assets/tower/assets/f4.png → .../game/src/main/assets/tower/assets/f4.png b/game/src/main/assets/tower/assets/f4.png → .../game/src/main/assets/tower/assets/f4.png
diff --git a/game/src/main/assets/tower/assets/f5.png → .../game/src/main/assets/tower/assets/f5.png b/game/src/main/assets/tower/assets/f5.png → .../game/src/main/assets/tower/assets/f5.png
diff --git a/game/src/main/assets/tower/assets/f6.png → .../game/src/main/assets/tower/assets/f6.png b/game/src/main/assets/tower/assets/f6.png → .../game/src/main/assets/tower/assets/f6.png
diff --git a/game/src/main/assets/tower/assets/f7.png → .../game/src/main/assets/tower/assets/f7.png b/game/src/main/assets/tower/assets/f7.png → .../game/src/main/assets/tower/assets/f7.png
diff --git a/...rc/main/assets/tower/assets/game-over.mp3 → ...rc/main/assets/tower/assets/game-over.mp3 b/...rc/main/assets/tower/assets/game-over.mp3 → ...rc/main/assets/tower/assets/game-over.mp3
diff --git a/...rc/main/assets/tower/assets/game-over.ogg → ...rc/main/assets/tower/assets/game-over.ogg b/...rc/main/assets/tower/assets/game-over.ogg → ...rc/main/assets/tower/assets/game-over.ogg
diff --git a/game/src/main/assets/tower/assets/heart.png → ...me/src/main/assets/tower/assets/heart.png b/game/src/main/assets/tower/assets/heart.png → ...me/src/main/assets/tower/assets/heart.png
diff --git a/game/src/main/assets/tower/assets/hook.png → ...ame/src/main/assets/tower/assets/hook.png b/game/src/main/assets/tower/assets/hook.png → ...ame/src/main/assets/tower/assets/hook.png
diff --git a/.../src/main/assets/tower/assets/main-bg.png → .../src/main/assets/tower/assets/main-bg.png b/.../src/main/assets/tower/assets/main-bg.png → .../src/main/assets/tower/assets/main-bg.png
diff --git a/...n/assets/tower/assets/main-index-logo.png → ...n/assets/tower/assets/main-index-logo.png b/...n/assets/tower/assets/main-index-logo.png → ...n/assets/tower/assets/main-index-logo.png
diff --git a/.../assets/tower/assets/main-index-start.png → .../assets/tower/assets/main-index-start.png b/.../assets/tower/assets/main-index-start.png → .../assets/tower/assets/main-index-start.png
diff --git a/.../assets/tower/assets/main-index-title.png → .../assets/tower/assets/main-index-title.png b/.../assets/tower/assets/main-index-title.png → .../assets/tower/assets/main-index-title.png
diff --git a/...assets/tower/assets/main-loading-logo.png → ...assets/tower/assets/main-loading-logo.png b/...assets/tower/assets/main-loading-logo.png → ...assets/tower/assets/main-loading-logo.png
diff --git a/...main/assets/tower/assets/main-loading.gif → ...main/assets/tower/assets/main-loading.gif b/...main/assets/tower/assets/main-loading.gif → ...main/assets/tower/assets/main-loading.gif
diff --git a/...ssets/tower/assets/main-modal-again-b.png → ...ssets/tower/assets/main-modal-again-b.png b/...ssets/tower/assets/main-modal-again-b.png → ...ssets/tower/assets/main-modal-again-b.png
diff --git a/...ain/assets/tower/assets/main-modal-bg.png → ...ain/assets/tower/assets/main-modal-bg.png b/...ain/assets/tower/assets/main-modal-bg.png → ...ain/assets/tower/assets/main-modal-bg.png
diff --git a/...sets/tower/assets/main-modal-invite-b.png → ...sets/tower/assets/main-modal-invite-b.png b/...sets/tower/assets/main-modal-invite-b.png → ...sets/tower/assets/main-modal-invite-b.png
diff --git a/...n/assets/tower/assets/main-modal-over.png → ...n/assets/tower/assets/main-modal-over.png b/...n/assets/tower/assets/main-modal-over.png → ...n/assets/tower/assets/main-modal-over.png
diff --git a/...n/assets/tower/assets/main-share-icon.png → ...n/assets/tower/assets/main-share-icon.png b/...n/assets/tower/assets/main-share-icon.png → ...n/assets/tower/assets/main-share-icon.png
diff --git a/game/src/main/assets/tower/assets/main.js → ...game/src/main/assets/tower/assets/main.js b/game/src/main/assets/tower/assets/main.js → ...game/src/main/assets/tower/assets/main.js
diff --git a/game/src/main/assets/tower/assets/rope.png → ...ame/src/main/assets/tower/assets/rope.png b/game/src/main/assets/tower/assets/rope.png → ...ame/src/main/assets/tower/assets/rope.png
diff --git a/game/src/main/assets/tower/assets/rotate.mp3 → ...e/src/main/assets/tower/assets/rotate.mp3 b/game/src/main/assets/tower/assets/rotate.mp3 → ...e/src/main/assets/tower/assets/rotate.mp3
diff --git a/game/src/main/assets/tower/assets/rotate.ogg → ...e/src/main/assets/tower/assets/rotate.ogg b/game/src/main/assets/tower/assets/rotate.ogg → ...e/src/main/assets/tower/assets/rotate.ogg
diff --git a/game/src/main/assets/tower/assets/score.png → ...me/src/main/assets/tower/assets/score.png b/game/src/main/assets/tower/assets/score.png → ...me/src/main/assets/tower/assets/score.png
diff --git a/...in/assets/tower/assets/tutorial-arrow.png → ...in/assets/tower/assets/tutorial-arrow.png b/...in/assets/tower/assets/tutorial-arrow.png → ...in/assets/tower/assets/tutorial-arrow.png
diff --git a/...src/main/assets/tower/assets/tutorial.png → ...src/main/assets/tower/assets/tutorial.png b/...src/main/assets/tower/assets/tutorial.png → ...src/main/assets/tower/assets/tutorial.png
diff --git a/game/src/main/assets/tower/assets/wenxue.eot → ...e/src/main/assets/tower/assets/wenxue.eot b/game/src/main/assets/tower/assets/wenxue.eot → ...e/src/main/assets/tower/assets/wenxue.eot
diff --git a/game/src/main/assets/tower/assets/wenxue.svg → ...e/src/main/assets/tower/assets/wenxue.svg b/game/src/main/assets/tower/assets/wenxue.svg → ...e/src/main/assets/tower/assets/wenxue.svg
diff --git a/game/src/main/assets/tower/assets/wenxue.ttf → ...e/src/main/assets/tower/assets/wenxue.ttf b/game/src/main/assets/tower/assets/wenxue.ttf → ...e/src/main/assets/tower/assets/wenxue.ttf
diff --git a/.../src/main/assets/tower/assets/wenxue.woff → .../src/main/assets/tower/assets/wenxue.woff b/.../src/main/assets/tower/assets/wenxue.woff → .../src/main/assets/tower/assets/wenxue.woff
diff --git a/...in/assets/tower/assets/zepto-1.1.6.min.js → ...in/assets/tower/assets/zepto-1.1.6.min.js b/...in/assets/tower/assets/zepto-1.1.6.min.js → ...in/assets/tower/assets/zepto-1.1.6.min.js
diff --git a/game/src/main/assets/tower/index.html → subs/game/src/main/assets/tower/index.html b/game/src/main/assets/tower/index.html → subs/game/src/main/assets/tower/index.html
diff --git a/game/src/main/java/com/bird/BirdActivity.kt → ...me/src/main/java/com/bird/BirdActivity.kt b/game/src/main/java/com/bird/BirdActivity.kt → ...me/src/main/java/com/bird/BirdActivity.kt
diff --git a/.../src/main/java/com/bird/GameFlabbyBird.kt → .../src/main/java/com/bird/GameFlabbyBird.kt b/.../src/main/java/com/bird/GameFlabbyBird.kt → .../src/main/java/com/bird/GameFlabbyBird.kt
diff --git a/game/src/main/java/com/bird/internal/Bird.kt → ...e/src/main/java/com/bird/internal/Bird.kt b/game/src/main/java/com/bird/internal/Bird.kt → ...e/src/main/java/com/bird/internal/Bird.kt
diff --git a/game/src/main/java/com/bird/internal/Ext.kt → ...me/src/main/java/com/bird/internal/Ext.kt b/game/src/main/java/com/bird/internal/Ext.kt → ...me/src/main/java/com/bird/internal/Ext.kt
diff --git a/.../src/main/java/com/bird/internal/Floor.kt → .../src/main/java/com/bird/internal/Floor.kt b/.../src/main/java/com/bird/internal/Floor.kt → .../src/main/java/com/bird/internal/Floor.kt
diff --git a/...main/java/com/bird/internal/GameStatus.kt → ...main/java/com/bird/internal/GameStatus.kt b/...main/java/com/bird/internal/GameStatus.kt → ...main/java/com/bird/internal/GameStatus.kt
diff --git a/game/src/main/java/com/bird/internal/Pipe.kt → ...e/src/main/java/com/bird/internal/Pipe.kt b/game/src/main/java/com/bird/internal/Pipe.kt → ...e/src/main/java/com/bird/internal/Pipe.kt
diff --git a/...er/android/game/ui/BaseWebViewActivity.kt → ...er/android/game/ui/BaseWebViewActivity.kt b/...er/android/game/ui/BaseWebViewActivity.kt → ...er/android/game/ui/BaseWebViewActivity.kt
diff --git a/...ineer/android/game/ui/Game2048Activity.kt → ...ineer/android/game/ui/Game2048Activity.kt b/...ineer/android/game/ui/Game2048Activity.kt → ...ineer/android/game/ui/Game2048Activity.kt
diff --git a/...ineer/android/game/ui/GameRootActivity.kt → ...ineer/android/game/ui/GameRootActivity.kt b/...ineer/android/game/ui/GameRootActivity.kt → ...ineer/android/game/ui/GameRootActivity.kt
diff --git a/...er/android/game/ui/SchulteGridActivity.kt → ...er/android/game/ui/SchulteGridActivity.kt b/...er/android/game/ui/SchulteGridActivity.kt → ...er/android/game/ui/SchulteGridActivity.kt
diff --git a/...r/android/game/ui/SensorViewActivity.java → ...r/android/game/ui/SensorViewActivity.java b/...r/android/game/ui/SensorViewActivity.java → ...r/android/game/ui/SensorViewActivity.java
diff --git a/...ngineer/android/game/ui/SquareActivity.kt → ...ngineer/android/game/ui/SquareActivity.kt b/...ngineer/android/game/ui/SquareActivity.kt → ...ngineer/android/game/ui/SquareActivity.kt
diff --git a/...r/android/game/ui/TowerBuilderActivity.kt → ...r/android/game/ui/TowerBuilderActivity.kt b/...r/android/game/ui/TowerBuilderActivity.kt → ...r/android/game/ui/TowerBuilderActivity.kt
diff --git a/...r/android/game/util/DefaultOrientation.kt → ...r/android/game/util/DefaultOrientation.kt b/...r/android/game/util/DefaultOrientation.kt → ...r/android/game/util/DefaultOrientation.kt
diff --git a/...droid/game/util/DefaultOrientationUtil.kt → ...droid/game/util/DefaultOrientationUtil.kt b/...droid/game/util/DefaultOrientationUtil.kt → ...droid/game/util/DefaultOrientationUtil.kt
diff --git a/...ineer/android/game/widget/SensorView.java → ...ineer/android/game/widget/SensorView.java b/...ineer/android/game/widget/SensorView.java → ...ineer/android/game/widget/SensorView.java
diff --git a/...oid/game/widget/SensorViewDrawThread.java → ...oid/game/widget/SensorViewDrawThread.java b/...oid/game/widget/SensorViewDrawThread.java → ...oid/game/widget/SensorViewDrawThread.java
diff --git a/...om/snatik/matches/MemoryGameActivity.java → ...om/snatik/matches/MemoryGameActivity.java b/...om/snatik/matches/MemoryGameActivity.java → ...om/snatik/matches/MemoryGameActivity.java
diff --git a/...ava/com/snatik/matches/common/Memory.java → ...ava/com/snatik/matches/common/Memory.java b/...ava/com/snatik/matches/common/Memory.java → ...ava/com/snatik/matches/common/Memory.java
diff --git a/...java/com/snatik/matches/common/Music.java → ...java/com/snatik/matches/common/Music.java b/...java/com/snatik/matches/common/Music.java → ...java/com/snatik/matches/common/Music.java
diff --git a/...ava/com/snatik/matches/common/Shared.java → ...ava/com/snatik/matches/common/Shared.java b/...ava/com/snatik/matches/common/Shared.java → ...ava/com/snatik/matches/common/Shared.java
diff --git a/...ava/com/snatik/matches/engine/Engine.java → ...ava/com/snatik/matches/engine/Engine.java b/...ava/com/snatik/matches/engine/Engine.java → ...ava/com/snatik/matches/engine/Engine.java
diff --git a/...atik/matches/engine/ScreenController.java → ...atik/matches/engine/ScreenController.java b/...atik/matches/engine/ScreenController.java → ...atik/matches/engine/ScreenController.java
diff --git a/.../snatik/matches/events/AbstractEvent.java → .../snatik/matches/events/AbstractEvent.java b/.../snatik/matches/events/AbstractEvent.java → .../snatik/matches/events/AbstractEvent.java
diff --git a/...java/com/snatik/matches/events/Event.java → ...java/com/snatik/matches/events/Event.java b/...java/com/snatik/matches/events/Event.java → ...java/com/snatik/matches/events/Event.java
diff --git a/...a/com/snatik/matches/events/EventBus.java → ...a/com/snatik/matches/events/EventBus.java b/...a/com/snatik/matches/events/EventBus.java → ...a/com/snatik/matches/events/EventBus.java
diff --git a/.../snatik/matches/events/EventObserver.java → .../snatik/matches/events/EventObserver.java b/.../snatik/matches/events/EventObserver.java → .../snatik/matches/events/EventObserver.java
diff --git a/.../matches/events/EventObserverAdapter.java → .../matches/events/EventObserverAdapter.java b/.../matches/events/EventObserverAdapter.java → .../matches/events/EventObserverAdapter.java
diff --git a/...hes/events/engine/FlipDownCardsEvent.java → ...hes/events/engine/FlipDownCardsEvent.java b/...hes/events/engine/FlipDownCardsEvent.java → ...hes/events/engine/FlipDownCardsEvent.java
diff --git a/...k/matches/events/engine/GameWonEvent.java → ...k/matches/events/engine/GameWonEvent.java b/...k/matches/events/engine/GameWonEvent.java → ...k/matches/events/engine/GameWonEvent.java
diff --git a/...hes/events/engine/HidePairCardsEvent.java → ...hes/events/engine/HidePairCardsEvent.java b/...hes/events/engine/HidePairCardsEvent.java → ...hes/events/engine/HidePairCardsEvent.java
diff --git a/...atik/matches/events/ui/BackGameEvent.java → ...atik/matches/events/ui/BackGameEvent.java b/...atik/matches/events/ui/BackGameEvent.java → ...atik/matches/events/ui/BackGameEvent.java
diff --git a/...es/events/ui/DifficultySelectedEvent.java → ...es/events/ui/DifficultySelectedEvent.java b/...es/events/ui/DifficultySelectedEvent.java → ...es/events/ui/DifficultySelectedEvent.java
diff --git a/...atik/matches/events/ui/FlipCardEvent.java → ...atik/matches/events/ui/FlipCardEvent.java b/...atik/matches/events/ui/FlipCardEvent.java → ...atik/matches/events/ui/FlipCardEvent.java
diff --git a/...atik/matches/events/ui/NextGameEvent.java → ...atik/matches/events/ui/NextGameEvent.java b/...atik/matches/events/ui/NextGameEvent.java → ...atik/matches/events/ui/NextGameEvent.java
diff --git a/...tches/events/ui/ResetBackgroundEvent.java → ...tches/events/ui/ResetBackgroundEvent.java b/...tches/events/ui/ResetBackgroundEvent.java → ...tches/events/ui/ResetBackgroundEvent.java
diff --git a/.../snatik/matches/events/ui/StartEvent.java → .../snatik/matches/events/ui/StartEvent.java b/.../snatik/matches/events/ui/StartEvent.java → .../snatik/matches/events/ui/StartEvent.java
diff --git a/...matches/events/ui/ThemeSelectedEvent.java → ...matches/events/ui/ThemeSelectedEvent.java b/...matches/events/ui/ThemeSelectedEvent.java → ...matches/events/ui/ThemeSelectedEvent.java
diff --git a/...natik/matches/fragments/BaseFragment.java → ...natik/matches/fragments/BaseFragment.java b/...natik/matches/fragments/BaseFragment.java → ...natik/matches/fragments/BaseFragment.java
diff --git a/...s/fragments/DifficultySelectFragment.java → ...s/fragments/DifficultySelectFragment.java b/...s/fragments/DifficultySelectFragment.java → ...s/fragments/DifficultySelectFragment.java
diff --git a/...natik/matches/fragments/GameFragment.java → ...natik/matches/fragments/GameFragment.java b/...natik/matches/fragments/GameFragment.java → ...natik/matches/fragments/GameFragment.java
diff --git a/...natik/matches/fragments/MenuFragment.java → ...natik/matches/fragments/MenuFragment.java b/...natik/matches/fragments/MenuFragment.java → ...natik/matches/fragments/MenuFragment.java
diff --git a/...atches/fragments/ThemeSelectFragment.java → ...atches/fragments/ThemeSelectFragment.java b/...atches/fragments/ThemeSelectFragment.java → ...atches/fragments/ThemeSelectFragment.java
diff --git a/...snatik/matches/model/BoardArrangment.java → ...snatik/matches/model/BoardArrangment.java b/...snatik/matches/model/BoardArrangment.java → ...snatik/matches/model/BoardArrangment.java
diff --git a/...tik/matches/model/BoardConfiguration.java → ...tik/matches/model/BoardConfiguration.java b/...tik/matches/model/BoardConfiguration.java → ...tik/matches/model/BoardConfiguration.java
diff --git a/...n/java/com/snatik/matches/model/Game.java → ...n/java/com/snatik/matches/model/Game.java b/...n/java/com/snatik/matches/model/Game.java → ...n/java/com/snatik/matches/model/Game.java
diff --git a/...a/com/snatik/matches/model/GameState.java → ...a/com/snatik/matches/model/GameState.java b/...a/com/snatik/matches/model/GameState.java → ...a/com/snatik/matches/model/GameState.java
diff --git a/...java/com/snatik/matches/themes/Theme.java → ...java/com/snatik/matches/themes/Theme.java b/...java/com/snatik/matches/themes/Theme.java → ...java/com/snatik/matches/themes/Theme.java
diff --git a/...ava/com/snatik/matches/themes/Themes.java → ...ava/com/snatik/matches/themes/Themes.java b/...ava/com/snatik/matches/themes/Themes.java → ...ava/com/snatik/matches/themes/Themes.java
diff --git a/...java/com/snatik/matches/ui/BoardView.java → ...java/com/snatik/matches/ui/BoardView.java b/...java/com/snatik/matches/ui/BoardView.java → ...java/com/snatik/matches/ui/BoardView.java
diff --git a/...com/snatik/matches/ui/DifficultyView.java → ...com/snatik/matches/ui/DifficultyView.java b/...com/snatik/matches/ui/DifficultyView.java → ...com/snatik/matches/ui/DifficultyView.java
diff --git a/...a/com/snatik/matches/ui/PopupManager.java → ...a/com/snatik/matches/ui/PopupManager.java b/...a/com/snatik/matches/ui/PopupManager.java → ...a/com/snatik/matches/ui/PopupManager.java
diff --git a/.../snatik/matches/ui/PopupSettingsView.java → .../snatik/matches/ui/PopupSettingsView.java b/.../snatik/matches/ui/PopupSettingsView.java → .../snatik/matches/ui/PopupSettingsView.java
diff --git a/...a/com/snatik/matches/ui/PopupWonView.java → ...a/com/snatik/matches/ui/PopupWonView.java b/...a/com/snatik/matches/ui/PopupWonView.java → ...a/com/snatik/matches/ui/PopupWonView.java
diff --git a/.../java/com/snatik/matches/ui/TileView.java → .../java/com/snatik/matches/ui/TileView.java b/.../java/com/snatik/matches/ui/TileView.java → .../java/com/snatik/matches/ui/TileView.java
diff --git a/.../java/com/snatik/matches/utils/Clock.java → .../java/com/snatik/matches/utils/Clock.java b/.../java/com/snatik/matches/utils/Clock.java → .../java/com/snatik/matches/utils/Clock.java
diff --git a/.../snatik/matches/utils/CountDownClock.java → .../snatik/matches/utils/CountDownClock.java b/.../snatik/matches/utils/CountDownClock.java → .../snatik/matches/utils/CountDownClock.java
diff --git a/.../com/snatik/matches/utils/FontLoader.java → .../com/snatik/matches/utils/FontLoader.java b/.../com/snatik/matches/utils/FontLoader.java → .../com/snatik/matches/utils/FontLoader.java
diff --git a/.../java/com/snatik/matches/utils/Utils.java → .../java/com/snatik/matches/utils/Utils.java b/.../java/com/snatik/matches/utils/Utils.java → .../java/com/snatik/matches/utils/Utils.java
diff --git a/game/src/main/res/Temporary.java → subs/game/src/main/res/Temporary.java b/game/src/main/res/Temporary.java → subs/game/src/main/res/Temporary.java
diff --git a/...es/drawable-hdpi/animals_theme_star_0.png → ...es/drawable-hdpi/animals_theme_star_0.png b/...es/drawable-hdpi/animals_theme_star_0.png → ...es/drawable-hdpi/animals_theme_star_0.png
diff --git a/...es/drawable-hdpi/animals_theme_star_1.png → ...es/drawable-hdpi/animals_theme_star_1.png b/...es/drawable-hdpi/animals_theme_star_1.png → ...es/drawable-hdpi/animals_theme_star_1.png
diff --git a/...es/drawable-hdpi/animals_theme_star_2.png → ...es/drawable-hdpi/animals_theme_star_2.png b/...es/drawable-hdpi/animals_theme_star_2.png → ...es/drawable-hdpi/animals_theme_star_2.png
diff --git a/...es/drawable-hdpi/animals_theme_star_3.png → ...es/drawable-hdpi/animals_theme_star_3.png b/...es/drawable-hdpi/animals_theme_star_3.png → ...es/drawable-hdpi/animals_theme_star_3.png
diff --git a/...wable-hdpi/button_difficulty_1_star_0.png → ...wable-hdpi/button_difficulty_1_star_0.png b/...wable-hdpi/button_difficulty_1_star_0.png → ...wable-hdpi/button_difficulty_1_star_0.png
diff --git a/...wable-hdpi/button_difficulty_1_star_1.png → ...wable-hdpi/button_difficulty_1_star_1.png b/...wable-hdpi/button_difficulty_1_star_1.png → ...wable-hdpi/button_difficulty_1_star_1.png
diff --git a/...wable-hdpi/button_difficulty_1_star_2.png → ...wable-hdpi/button_difficulty_1_star_2.png b/...wable-hdpi/button_difficulty_1_star_2.png → ...wable-hdpi/button_difficulty_1_star_2.png
diff --git a/...wable-hdpi/button_difficulty_1_star_3.png → ...wable-hdpi/button_difficulty_1_star_3.png b/...wable-hdpi/button_difficulty_1_star_3.png → ...wable-hdpi/button_difficulty_1_star_3.png
diff --git a/...wable-hdpi/button_difficulty_2_star_0.png → ...wable-hdpi/button_difficulty_2_star_0.png b/...wable-hdpi/button_difficulty_2_star_0.png → ...wable-hdpi/button_difficulty_2_star_0.png
diff --git a/...wable-hdpi/button_difficulty_2_star_1.png → ...wable-hdpi/button_difficulty_2_star_1.png b/...wable-hdpi/button_difficulty_2_star_1.png → ...wable-hdpi/button_difficulty_2_star_1.png
diff --git a/...wable-hdpi/button_difficulty_2_star_2.png → ...wable-hdpi/button_difficulty_2_star_2.png b/...wable-hdpi/button_difficulty_2_star_2.png → ...wable-hdpi/button_difficulty_2_star_2.png
diff --git a/...wable-hdpi/button_difficulty_2_star_3.png → ...wable-hdpi/button_difficulty_2_star_3.png b/...wable-hdpi/button_difficulty_2_star_3.png → ...wable-hdpi/button_difficulty_2_star_3.png
diff --git a/...wable-hdpi/button_difficulty_3_star_0.png → ...wable-hdpi/button_difficulty_3_star_0.png b/...wable-hdpi/button_difficulty_3_star_0.png → ...wable-hdpi/button_difficulty_3_star_0.png
diff --git a/...wable-hdpi/button_difficulty_3_star_1.png → ...wable-hdpi/button_difficulty_3_star_1.png b/...wable-hdpi/button_difficulty_3_star_1.png → ...wable-hdpi/button_difficulty_3_star_1.png
diff --git a/...wable-hdpi/button_difficulty_3_star_2.png → ...wable-hdpi/button_difficulty_3_star_2.png b/...wable-hdpi/button_difficulty_3_star_2.png → ...wable-hdpi/button_difficulty_3_star_2.png
diff --git a/...wable-hdpi/button_difficulty_3_star_3.png → ...wable-hdpi/button_difficulty_3_star_3.png b/...wable-hdpi/button_difficulty_3_star_3.png → ...wable-hdpi/button_difficulty_3_star_3.png
diff --git a/...wable-hdpi/button_difficulty_4_star_0.png → ...wable-hdpi/button_difficulty_4_star_0.png b/...wable-hdpi/button_difficulty_4_star_0.png → ...wable-hdpi/button_difficulty_4_star_0.png
diff --git a/...wable-hdpi/button_difficulty_4_star_1.png → ...wable-hdpi/button_difficulty_4_star_1.png b/...wable-hdpi/button_difficulty_4_star_1.png → ...wable-hdpi/button_difficulty_4_star_1.png
diff --git a/...wable-hdpi/button_difficulty_4_star_2.png → ...wable-hdpi/button_difficulty_4_star_2.png b/...wable-hdpi/button_difficulty_4_star_2.png → ...wable-hdpi/button_difficulty_4_star_2.png
diff --git a/...wable-hdpi/button_difficulty_4_star_3.png → ...wable-hdpi/button_difficulty_4_star_3.png b/...wable-hdpi/button_difficulty_4_star_3.png → ...wable-hdpi/button_difficulty_4_star_3.png
diff --git a/...wable-hdpi/button_difficulty_5_star_0.png → ...wable-hdpi/button_difficulty_5_star_0.png b/...wable-hdpi/button_difficulty_5_star_0.png → ...wable-hdpi/button_difficulty_5_star_0.png
diff --git a/...wable-hdpi/button_difficulty_5_star_1.png → ...wable-hdpi/button_difficulty_5_star_1.png b/...wable-hdpi/button_difficulty_5_star_1.png → ...wable-hdpi/button_difficulty_5_star_1.png
diff --git a/...wable-hdpi/button_difficulty_5_star_2.png → ...wable-hdpi/button_difficulty_5_star_2.png b/...wable-hdpi/button_difficulty_5_star_2.png → ...wable-hdpi/button_difficulty_5_star_2.png
diff --git a/...wable-hdpi/button_difficulty_5_star_3.png → ...wable-hdpi/button_difficulty_5_star_3.png b/...wable-hdpi/button_difficulty_5_star_3.png → ...wable-hdpi/button_difficulty_5_star_3.png
diff --git a/...wable-hdpi/button_difficulty_6_star_0.png → ...wable-hdpi/button_difficulty_6_star_0.png b/...wable-hdpi/button_difficulty_6_star_0.png → ...wable-hdpi/button_difficulty_6_star_0.png
diff --git a/...wable-hdpi/button_difficulty_6_star_1.png → ...wable-hdpi/button_difficulty_6_star_1.png b/...wable-hdpi/button_difficulty_6_star_1.png → ...wable-hdpi/button_difficulty_6_star_1.png
diff --git a/...wable-hdpi/button_difficulty_6_star_2.png → ...wable-hdpi/button_difficulty_6_star_2.png b/...wable-hdpi/button_difficulty_6_star_2.png → ...wable-hdpi/button_difficulty_6_star_2.png
diff --git a/...wable-hdpi/button_difficulty_6_star_3.png → ...wable-hdpi/button_difficulty_6_star_3.png b/...wable-hdpi/button_difficulty_6_star_3.png → ...wable-hdpi/button_difficulty_6_star_3.png
diff --git a/.../res/drawable-hdpi/button_google_play.png → .../res/drawable-hdpi/button_google_play.png b/.../res/drawable-hdpi/button_google_play.png → .../res/drawable-hdpi/button_google_play.png
diff --git a/...in/res/drawable-hdpi/button_music_off.png → ...in/res/drawable-hdpi/button_music_off.png b/...in/res/drawable-hdpi/button_music_off.png → ...in/res/drawable-hdpi/button_music_off.png
diff --git a/...ain/res/drawable-hdpi/button_music_on.png → ...ain/res/drawable-hdpi/button_music_on.png b/...ain/res/drawable-hdpi/button_music_on.png → ...ain/res/drawable-hdpi/button_music_on.png
diff --git a/...rc/main/res/drawable-hdpi/button_rate.png → ...rc/main/res/drawable-hdpi/button_rate.png b/...rc/main/res/drawable-hdpi/button_rate.png → ...rc/main/res/drawable-hdpi/button_rate.png
diff --git a/...ain/res/drawable-hdpi/button_settings.png → ...ain/res/drawable-hdpi/button_settings.png b/...ain/res/drawable-hdpi/button_settings.png → ...ain/res/drawable-hdpi/button_settings.png
diff --git a/...c/main/res/drawable-hdpi/button_start.png → ...c/main/res/drawable-hdpi/button_start.png b/...c/main/res/drawable-hdpi/button_start.png → ...c/main/res/drawable-hdpi/button_start.png
diff --git a/...res/drawable-hdpi/button_start_lights.png → ...res/drawable-hdpi/button_start_lights.png b/...res/drawable-hdpi/button_start_lights.png → ...res/drawable-hdpi/button_start_lights.png
diff --git a/.../res/drawable-hdpi/emoji_theme_star_0.png → .../res/drawable-hdpi/emoji_theme_star_0.png b/.../res/drawable-hdpi/emoji_theme_star_0.png → .../res/drawable-hdpi/emoji_theme_star_0.png
diff --git a/.../res/drawable-hdpi/emoji_theme_star_1.png → .../res/drawable-hdpi/emoji_theme_star_1.png b/.../res/drawable-hdpi/emoji_theme_star_1.png → .../res/drawable-hdpi/emoji_theme_star_1.png
diff --git a/.../res/drawable-hdpi/emoji_theme_star_2.png → .../res/drawable-hdpi/emoji_theme_star_2.png b/.../res/drawable-hdpi/emoji_theme_star_2.png → .../res/drawable-hdpi/emoji_theme_star_2.png
diff --git a/.../res/drawable-hdpi/emoji_theme_star_3.png → .../res/drawable-hdpi/emoji_theme_star_3.png b/.../res/drawable-hdpi/emoji_theme_star_3.png → .../res/drawable-hdpi/emoji_theme_star_3.png
diff --git a/...rc/main/res/drawable-hdpi/ic_launcher.png → ...rc/main/res/drawable-hdpi/ic_launcher.png b/...rc/main/res/drawable-hdpi/ic_launcher.png → ...rc/main/res/drawable-hdpi/ic_launcher.png
diff --git a/game/src/main/res/drawable-hdpi/icon.png → .../game/src/main/res/drawable-hdpi/icon.png b/game/src/main/res/drawable-hdpi/icon.png → .../game/src/main/res/drawable-hdpi/icon.png
diff --git a/...s/drawable-hdpi/monsters_theme_star_0.png → ...s/drawable-hdpi/monsters_theme_star_0.png b/...s/drawable-hdpi/monsters_theme_star_0.png → ...s/drawable-hdpi/monsters_theme_star_0.png
diff --git a/...s/drawable-hdpi/monsters_theme_star_1.png → ...s/drawable-hdpi/monsters_theme_star_1.png b/...s/drawable-hdpi/monsters_theme_star_1.png → ...s/drawable-hdpi/monsters_theme_star_1.png
diff --git a/...s/drawable-hdpi/monsters_theme_star_2.png → ...s/drawable-hdpi/monsters_theme_star_2.png b/...s/drawable-hdpi/monsters_theme_star_2.png → ...s/drawable-hdpi/monsters_theme_star_2.png
diff --git a/...s/drawable-hdpi/monsters_theme_star_3.png → ...s/drawable-hdpi/monsters_theme_star_3.png b/...s/drawable-hdpi/monsters_theme_star_3.png → ...s/drawable-hdpi/monsters_theme_star_3.png
diff --git a/game/src/main/res/drawable-hdpi/qiushang.png → ...e/src/main/res/drawable-hdpi/qiushang.png b/game/src/main/res/drawable-hdpi/qiushang.png → ...e/src/main/res/drawable-hdpi/qiushang.png
diff --git a/game/src/main/res/drawable-hdpi/qiuzhong.png → ...e/src/main/res/drawable-hdpi/qiuzhong.png b/game/src/main/res/drawable-hdpi/qiuzhong.png → ...e/src/main/res/drawable-hdpi/qiuzhong.png
diff --git a/game/src/main/res/drawable-hdpi/qiuzuo.png → ...ame/src/main/res/drawable-hdpi/qiuzuo.png b/game/src/main/res/drawable-hdpi/qiuzuo.png → ...ame/src/main/res/drawable-hdpi/qiuzuo.png
diff --git a/game/src/main/res/drawable-hdpi/shang.png → ...game/src/main/res/drawable-hdpi/shang.png b/game/src/main/res/drawable-hdpi/shang.png → ...game/src/main/res/drawable-hdpi/shang.png
diff --git a/...c/main/res/drawable-hdpi/tooltip_play.png → ...c/main/res/drawable-hdpi/tooltip_play.png b/...c/main/res/drawable-hdpi/tooltip_play.png → ...c/main/res/drawable-hdpi/tooltip_play.png
diff --git a/game/src/main/res/drawable-hdpi/yuan.png → .../game/src/main/res/drawable-hdpi/yuan.png b/game/src/main/res/drawable-hdpi/yuan.png → .../game/src/main/res/drawable-hdpi/yuan.png
diff --git a/game/src/main/res/drawable-hdpi/zuo.png → subs/game/src/main/res/drawable-hdpi/zuo.png b/game/src/main/res/drawable-hdpi/zuo.png → subs/game/src/main/res/drawable-hdpi/zuo.png
diff --git a/...rc/main/res/drawable-mdpi/ic_launcher.png → ...rc/main/res/drawable-mdpi/ic_launcher.png b/...rc/main/res/drawable-mdpi/ic_launcher.png → ...rc/main/res/drawable-mdpi/ic_launcher.png
diff --git a/...src/main/res/drawable-nodpi/animals_1.png → ...src/main/res/drawable-nodpi/animals_1.png b/...src/main/res/drawable-nodpi/animals_1.png → ...src/main/res/drawable-nodpi/animals_1.png
diff --git a/...rc/main/res/drawable-nodpi/animals_10.png → ...rc/main/res/drawable-nodpi/animals_10.png b/...rc/main/res/drawable-nodpi/animals_10.png → ...rc/main/res/drawable-nodpi/animals_10.png
diff --git a/...rc/main/res/drawable-nodpi/animals_11.png → ...rc/main/res/drawable-nodpi/animals_11.png b/...rc/main/res/drawable-nodpi/animals_11.png → ...rc/main/res/drawable-nodpi/animals_11.png
diff --git a/...rc/main/res/drawable-nodpi/animals_12.png → ...rc/main/res/drawable-nodpi/animals_12.png b/...rc/main/res/drawable-nodpi/animals_12.png → ...rc/main/res/drawable-nodpi/animals_12.png
diff --git a/...rc/main/res/drawable-nodpi/animals_13.png → ...rc/main/res/drawable-nodpi/animals_13.png b/...rc/main/res/drawable-nodpi/animals_13.png → ...rc/main/res/drawable-nodpi/animals_13.png
diff --git a/...rc/main/res/drawable-nodpi/animals_14.png → ...rc/main/res/drawable-nodpi/animals_14.png b/...rc/main/res/drawable-nodpi/animals_14.png → ...rc/main/res/drawable-nodpi/animals_14.png
diff --git a/...rc/main/res/drawable-nodpi/animals_15.png → ...rc/main/res/drawable-nodpi/animals_15.png b/...rc/main/res/drawable-nodpi/animals_15.png → ...rc/main/res/drawable-nodpi/animals_15.png
diff --git a/...rc/main/res/drawable-nodpi/animals_16.png → ...rc/main/res/drawable-nodpi/animals_16.png b/...rc/main/res/drawable-nodpi/animals_16.png → ...rc/main/res/drawable-nodpi/animals_16.png
diff --git a/...rc/main/res/drawable-nodpi/animals_17.png → ...rc/main/res/drawable-nodpi/animals_17.png b/...rc/main/res/drawable-nodpi/animals_17.png → ...rc/main/res/drawable-nodpi/animals_17.png
diff --git a/...rc/main/res/drawable-nodpi/animals_18.png → ...rc/main/res/drawable-nodpi/animals_18.png b/...rc/main/res/drawable-nodpi/animals_18.png → ...rc/main/res/drawable-nodpi/animals_18.png
diff --git a/...rc/main/res/drawable-nodpi/animals_19.png → ...rc/main/res/drawable-nodpi/animals_19.png b/...rc/main/res/drawable-nodpi/animals_19.png → ...rc/main/res/drawable-nodpi/animals_19.png
diff --git a/...src/main/res/drawable-nodpi/animals_2.png → ...src/main/res/drawable-nodpi/animals_2.png b/...src/main/res/drawable-nodpi/animals_2.png → ...src/main/res/drawable-nodpi/animals_2.png
diff --git a/...rc/main/res/drawable-nodpi/animals_20.png → ...rc/main/res/drawable-nodpi/animals_20.png b/...rc/main/res/drawable-nodpi/animals_20.png → ...rc/main/res/drawable-nodpi/animals_20.png
diff --git a/...rc/main/res/drawable-nodpi/animals_21.png → ...rc/main/res/drawable-nodpi/animals_21.png b/...rc/main/res/drawable-nodpi/animals_21.png → ...rc/main/res/drawable-nodpi/animals_21.png
diff --git a/...rc/main/res/drawable-nodpi/animals_22.png → ...rc/main/res/drawable-nodpi/animals_22.png b/...rc/main/res/drawable-nodpi/animals_22.png → ...rc/main/res/drawable-nodpi/animals_22.png
diff --git a/...rc/main/res/drawable-nodpi/animals_23.png → ...rc/main/res/drawable-nodpi/animals_23.png b/...rc/main/res/drawable-nodpi/animals_23.png → ...rc/main/res/drawable-nodpi/animals_23.png
diff --git a/...rc/main/res/drawable-nodpi/animals_24.png → ...rc/main/res/drawable-nodpi/animals_24.png b/...rc/main/res/drawable-nodpi/animals_24.png → ...rc/main/res/drawable-nodpi/animals_24.png
diff --git a/...rc/main/res/drawable-nodpi/animals_25.png → ...rc/main/res/drawable-nodpi/animals_25.png b/...rc/main/res/drawable-nodpi/animals_25.png → ...rc/main/res/drawable-nodpi/animals_25.png
diff --git a/...rc/main/res/drawable-nodpi/animals_26.png → ...rc/main/res/drawable-nodpi/animals_26.png b/...rc/main/res/drawable-nodpi/animals_26.png → ...rc/main/res/drawable-nodpi/animals_26.png
diff --git a/...rc/main/res/drawable-nodpi/animals_27.png → ...rc/main/res/drawable-nodpi/animals_27.png b/...rc/main/res/drawable-nodpi/animals_27.png → ...rc/main/res/drawable-nodpi/animals_27.png
diff --git a/...rc/main/res/drawable-nodpi/animals_28.png → ...rc/main/res/drawable-nodpi/animals_28.png b/...rc/main/res/drawable-nodpi/animals_28.png → ...rc/main/res/drawable-nodpi/animals_28.png
diff --git a/...src/main/res/drawable-nodpi/animals_3.png → ...src/main/res/drawable-nodpi/animals_3.png b/...src/main/res/drawable-nodpi/animals_3.png → ...src/main/res/drawable-nodpi/animals_3.png
diff --git a/...src/main/res/drawable-nodpi/animals_4.png → ...src/main/res/drawable-nodpi/animals_4.png b/...src/main/res/drawable-nodpi/animals_4.png → ...src/main/res/drawable-nodpi/animals_4.png
diff --git a/...src/main/res/drawable-nodpi/animals_5.png → ...src/main/res/drawable-nodpi/animals_5.png b/...src/main/res/drawable-nodpi/animals_5.png → ...src/main/res/drawable-nodpi/animals_5.png
diff --git a/...src/main/res/drawable-nodpi/animals_6.png → ...src/main/res/drawable-nodpi/animals_6.png b/...src/main/res/drawable-nodpi/animals_6.png → ...src/main/res/drawable-nodpi/animals_6.png
diff --git a/...src/main/res/drawable-nodpi/animals_7.png → ...src/main/res/drawable-nodpi/animals_7.png b/...src/main/res/drawable-nodpi/animals_7.png → ...src/main/res/drawable-nodpi/animals_7.png