diff --git a/StartGamedev-160604-osx/README.txt b/android/README.txt
similarity index 100%
rename from StartGamedev-160604-osx/README.txt
rename to android/README.txt
diff --git a/StartGamedev-160604-osx/game.apk b/android/game.apk
similarity index 100%
rename from StartGamedev-160604-osx/game.apk
rename to android/game.apk
diff --git a/StartGamedev-160604-osx/game.love b/android/game.love
similarity index 100%
rename from StartGamedev-160604-osx/game.love
rename to android/game.love
diff --git a/StartGamedev-160604-osx/icon.png b/android/icon.png
similarity index 100%
rename from StartGamedev-160604-osx/icon.png
rename to android/icon.png
diff --git a/StartGamedev-160604-osx/make-apk.command b/android/make-apk.command
similarity index 100%
rename from StartGamedev-160604-osx/make-apk.command
rename to android/make-apk.command
diff --git a/StartGamedev-160604-osx/open-editor.command b/android/open-editor.command
similarity index 100%
rename from StartGamedev-160604-osx/open-editor.command
rename to android/open-editor.command
diff --git a/StartGamedev-160604-osx/start-game.command b/android/start-game.command
similarity index 100%
rename from StartGamedev-160604-osx/start-game.command
rename to android/start-game.command
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/NOTICE.txt b/android/tools/android-osx/build-tools/19.1.0/NOTICE.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/NOTICE.txt
rename to android/tools/android-osx/build-tools/19.1.0/NOTICE.txt
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/aapt b/android/tools/android-osx/build-tools/19.1.0/aapt
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/aapt
rename to android/tools/android-osx/build-tools/19.1.0/aapt
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/aidl b/android/tools/android-osx/build-tools/19.1.0/aidl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/aidl
rename to android/tools/android-osx/build-tools/19.1.0/aidl
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/bcc_compat b/android/tools/android-osx/build-tools/19.1.0/bcc_compat
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/bcc_compat
rename to android/tools/android-osx/build-tools/19.1.0/bcc_compat
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/dexdump b/android/tools/android-osx/build-tools/19.1.0/dexdump
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/dexdump
rename to android/tools/android-osx/build-tools/19.1.0/dexdump
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/dx b/android/tools/android-osx/build-tools/19.1.0/dx
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/dx
rename to android/tools/android-osx/build-tools/19.1.0/dx
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/lib/dx.jar b/android/tools/android-osx/build-tools/19.1.0/lib/dx.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/lib/dx.jar
rename to android/tools/android-osx/build-tools/19.1.0/lib/dx.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/libbcc.dylib b/android/tools/android-osx/build-tools/19.1.0/libbcc.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/libbcc.dylib
rename to android/tools/android-osx/build-tools/19.1.0/libbcc.dylib
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/libbcinfo.dylib b/android/tools/android-osx/build-tools/19.1.0/libbcinfo.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/libbcinfo.dylib
rename to android/tools/android-osx/build-tools/19.1.0/libbcinfo.dylib
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/CMakeLists.txt b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/CMakeLists.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/CMakeLists.txt
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/CMakeLists.txt
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/LICENSE.TXT b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/LICENSE.TXT
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/LICENSE.TXT
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/LICENSE.TXT
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/altivec.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/altivec.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/altivec.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/altivec.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/ammintrin.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/ammintrin.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/ammintrin.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/ammintrin.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/avx2intrin.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/avx2intrin.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/avx2intrin.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/avx2intrin.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/avxintrin.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/avxintrin.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/avxintrin.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/avxintrin.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/bmi2intrin.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/bmi2intrin.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/bmi2intrin.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/bmi2intrin.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/bmiintrin.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/bmiintrin.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/bmiintrin.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/bmiintrin.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/cpuid.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/cpuid.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/cpuid.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/cpuid.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/emmintrin.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/emmintrin.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/emmintrin.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/emmintrin.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/f16cintrin.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/f16cintrin.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/f16cintrin.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/f16cintrin.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/float.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/float.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/float.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/float.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/fma4intrin.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/fma4intrin.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/fma4intrin.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/fma4intrin.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/fmaintrin.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/fmaintrin.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/fmaintrin.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/fmaintrin.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/immintrin.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/immintrin.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/immintrin.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/immintrin.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/iso646.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/iso646.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/iso646.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/iso646.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/limits.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/limits.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/limits.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/limits.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/lzcntintrin.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/lzcntintrin.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/lzcntintrin.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/lzcntintrin.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/mm3dnow.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/mm3dnow.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/mm3dnow.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/mm3dnow.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/mm_malloc.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/mm_malloc.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/mm_malloc.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/mm_malloc.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/mmintrin.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/mmintrin.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/mmintrin.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/mmintrin.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/module.map b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/module.map
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/module.map
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/module.map
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/nmmintrin.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/nmmintrin.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/nmmintrin.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/nmmintrin.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/pmmintrin.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/pmmintrin.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/pmmintrin.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/pmmintrin.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/popcntintrin.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/popcntintrin.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/popcntintrin.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/popcntintrin.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/prfchwintrin.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/prfchwintrin.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/prfchwintrin.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/prfchwintrin.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/rdseedintrin.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/rdseedintrin.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/rdseedintrin.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/rdseedintrin.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/rtmintrin.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/rtmintrin.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/rtmintrin.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/rtmintrin.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/smmintrin.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/smmintrin.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/smmintrin.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/smmintrin.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/stdalign.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/stdalign.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/stdalign.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/stdalign.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/stdarg.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/stdarg.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/stdarg.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/stdarg.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/stdbool.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/stdbool.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/stdbool.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/stdbool.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/stddef.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/stddef.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/stddef.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/stddef.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/stdint.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/stdint.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/stdint.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/stdint.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/stdnoreturn.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/stdnoreturn.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/stdnoreturn.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/stdnoreturn.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/tgmath.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/tgmath.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/tgmath.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/tgmath.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/tmmintrin.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/tmmintrin.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/tmmintrin.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/tmmintrin.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/unwind.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/unwind.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/unwind.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/unwind.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/varargs.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/varargs.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/varargs.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/varargs.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/wmmintrin.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/wmmintrin.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/wmmintrin.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/wmmintrin.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/x86intrin.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/x86intrin.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/x86intrin.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/x86intrin.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/xmmintrin.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/xmmintrin.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/xmmintrin.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/xmmintrin.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/xopintrin.h b/android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/xopintrin.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/xopintrin.h
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/clang-include/xopintrin.h
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_allocation.rsh b/android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_allocation.rsh
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_allocation.rsh
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_allocation.rsh
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_atomic.rsh b/android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_atomic.rsh
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_atomic.rsh
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_atomic.rsh
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_cl.rsh b/android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_cl.rsh
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_cl.rsh
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_cl.rsh
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_core.rsh b/android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_core.rsh
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_core.rsh
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_core.rsh
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_debug.rsh b/android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_debug.rsh
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_debug.rsh
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_debug.rsh
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_element.rsh b/android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_element.rsh
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_element.rsh
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_element.rsh
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_graphics.rsh b/android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_graphics.rsh
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_graphics.rsh
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_graphics.rsh
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_math.rsh b/android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_math.rsh
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_math.rsh
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_math.rsh
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_matrix.rsh b/android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_matrix.rsh
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_matrix.rsh
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_matrix.rsh
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_mesh.rsh b/android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_mesh.rsh
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_mesh.rsh
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_mesh.rsh
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_object.rsh b/android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_object.rsh
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_object.rsh
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_object.rsh
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_program.rsh b/android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_program.rsh
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_program.rsh
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_program.rsh
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_quaternion.rsh b/android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_quaternion.rsh
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_quaternion.rsh
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_quaternion.rsh
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_sampler.rsh b/android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_sampler.rsh
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_sampler.rsh
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_sampler.rsh
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_time.rsh b/android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_time.rsh
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_time.rsh
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_time.rsh
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_types.rsh b/android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_types.rsh
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_types.rsh
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/include/rs_types.rsh
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/bc/armeabi-v7a/libclcore.bc b/android/tools/android-osx/build-tools/19.1.0/renderscript/lib/bc/armeabi-v7a/libclcore.bc
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/bc/armeabi-v7a/libclcore.bc
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/lib/bc/armeabi-v7a/libclcore.bc
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/bc/mips/libclcore.bc b/android/tools/android-osx/build-tools/19.1.0/renderscript/lib/bc/mips/libclcore.bc
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/bc/mips/libclcore.bc
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/lib/bc/mips/libclcore.bc
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/bc/x86/libclcore.bc b/android/tools/android-osx/build-tools/19.1.0/renderscript/lib/bc/x86/libclcore.bc
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/bc/x86/libclcore.bc
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/lib/bc/x86/libclcore.bc
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/armeabi-v7a/libc.so b/android/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/armeabi-v7a/libc.so
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/armeabi-v7a/libc.so
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/armeabi-v7a/libc.so
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/armeabi-v7a/libcompiler_rt.a b/android/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/armeabi-v7a/libcompiler_rt.a
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/armeabi-v7a/libcompiler_rt.a
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/armeabi-v7a/libcompiler_rt.a
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/armeabi-v7a/libm.so b/android/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/armeabi-v7a/libm.so
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/armeabi-v7a/libm.so
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/armeabi-v7a/libm.so
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/mips/libc.so b/android/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/mips/libc.so
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/mips/libc.so
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/mips/libc.so
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/mips/libcompiler_rt.a b/android/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/mips/libcompiler_rt.a
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/mips/libcompiler_rt.a
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/mips/libcompiler_rt.a
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/mips/libm.so b/android/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/mips/libm.so
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/mips/libm.so
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/mips/libm.so
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/x86/libc.so b/android/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/x86/libc.so
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/x86/libc.so
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/x86/libc.so
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/x86/libcompiler_rt.a b/android/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/x86/libcompiler_rt.a
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/x86/libcompiler_rt.a
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/x86/libcompiler_rt.a
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/x86/libm.so b/android/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/x86/libm.so
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/x86/libm.so
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/lib/intermediates/x86/libm.so
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/packaged/armeabi-v7a/libRSSupport.so b/android/tools/android-osx/build-tools/19.1.0/renderscript/lib/packaged/armeabi-v7a/libRSSupport.so
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/packaged/armeabi-v7a/libRSSupport.so
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/lib/packaged/armeabi-v7a/libRSSupport.so
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/packaged/armeabi-v7a/librsjni.so b/android/tools/android-osx/build-tools/19.1.0/renderscript/lib/packaged/armeabi-v7a/librsjni.so
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/packaged/armeabi-v7a/librsjni.so
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/lib/packaged/armeabi-v7a/librsjni.so
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/packaged/mips/libRSSupport.so b/android/tools/android-osx/build-tools/19.1.0/renderscript/lib/packaged/mips/libRSSupport.so
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/packaged/mips/libRSSupport.so
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/lib/packaged/mips/libRSSupport.so
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/packaged/mips/librsjni.so b/android/tools/android-osx/build-tools/19.1.0/renderscript/lib/packaged/mips/librsjni.so
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/packaged/mips/librsjni.so
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/lib/packaged/mips/librsjni.so
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/packaged/x86/libRSSupport.so b/android/tools/android-osx/build-tools/19.1.0/renderscript/lib/packaged/x86/libRSSupport.so
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/packaged/x86/libRSSupport.so
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/lib/packaged/x86/libRSSupport.so
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/packaged/x86/librsjni.so b/android/tools/android-osx/build-tools/19.1.0/renderscript/lib/packaged/x86/librsjni.so
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/packaged/x86/librsjni.so
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/lib/packaged/x86/librsjni.so
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/renderscript-v8.jar b/android/tools/android-osx/build-tools/19.1.0/renderscript/lib/renderscript-v8.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/renderscript/lib/renderscript-v8.jar
rename to android/tools/android-osx/build-tools/19.1.0/renderscript/lib/renderscript-v8.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/source.properties b/android/tools/android-osx/build-tools/19.1.0/source.properties
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/source.properties
rename to android/tools/android-osx/build-tools/19.1.0/source.properties
diff --git a/StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/zipalign b/android/tools/android-osx/build-tools/19.1.0/zipalign
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/build-tools/19.1.0/zipalign
rename to android/tools/android-osx/build-tools/19.1.0/zipalign
diff --git a/StartGamedev-160604-osx/tools/android-osx/platform-tools/NOTICE.txt b/android/tools/android-osx/platform-tools/NOTICE.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/platform-tools/NOTICE.txt
rename to android/tools/android-osx/platform-tools/NOTICE.txt
diff --git a/StartGamedev-160604-osx/tools/android-osx/platform-tools/adb b/android/tools/android-osx/platform-tools/adb
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/platform-tools/adb
rename to android/tools/android-osx/platform-tools/adb
diff --git a/StartGamedev-160604-osx/tools/android-osx/platform-tools/api/api-versions.xml b/android/tools/android-osx/platform-tools/api/api-versions.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/platform-tools/api/api-versions.xml
rename to android/tools/android-osx/platform-tools/api/api-versions.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/platform-tools/dmtracedump b/android/tools/android-osx/platform-tools/dmtracedump
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/platform-tools/dmtracedump
rename to android/tools/android-osx/platform-tools/dmtracedump
diff --git a/StartGamedev-160604-osx/tools/android-osx/platform-tools/etc1tool b/android/tools/android-osx/platform-tools/etc1tool
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/platform-tools/etc1tool
rename to android/tools/android-osx/platform-tools/etc1tool
diff --git a/StartGamedev-160604-osx/tools/android-osx/platform-tools/fastboot b/android/tools/android-osx/platform-tools/fastboot
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/platform-tools/fastboot
rename to android/tools/android-osx/platform-tools/fastboot
diff --git a/StartGamedev-160604-osx/tools/android-osx/platform-tools/hprof-conv b/android/tools/android-osx/platform-tools/hprof-conv
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/platform-tools/hprof-conv
rename to android/tools/android-osx/platform-tools/hprof-conv
diff --git a/StartGamedev-160604-osx/tools/android-osx/platform-tools/source.properties b/android/tools/android-osx/platform-tools/source.properties
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/platform-tools/source.properties
rename to android/tools/android-osx/platform-tools/source.properties
diff --git a/StartGamedev-160604-osx/tools/android-osx/platform-tools/sqlite3 b/android/tools/android-osx/platform-tools/sqlite3
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/platform-tools/sqlite3
rename to android/tools/android-osx/platform-tools/sqlite3
diff --git a/StartGamedev-160604-osx/tools/android-osx/platform-tools/systrace/AUTHORS b/android/tools/android-osx/platform-tools/systrace/AUTHORS
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/platform-tools/systrace/AUTHORS
rename to android/tools/android-osx/platform-tools/systrace/AUTHORS
diff --git a/StartGamedev-160604-osx/tools/android-osx/platform-tools/systrace/LICENSE b/android/tools/android-osx/platform-tools/systrace/LICENSE
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/platform-tools/systrace/LICENSE
rename to android/tools/android-osx/platform-tools/systrace/LICENSE
diff --git a/StartGamedev-160604-osx/tools/android-osx/platform-tools/systrace/NOTICE b/android/tools/android-osx/platform-tools/systrace/NOTICE
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/platform-tools/systrace/NOTICE
rename to android/tools/android-osx/platform-tools/systrace/NOTICE
diff --git a/StartGamedev-160604-osx/tools/android-osx/platform-tools/systrace/UPSTREAM_REVISION b/android/tools/android-osx/platform-tools/systrace/UPSTREAM_REVISION
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/platform-tools/systrace/UPSTREAM_REVISION
rename to android/tools/android-osx/platform-tools/systrace/UPSTREAM_REVISION
diff --git a/StartGamedev-160604-osx/tools/android-osx/platform-tools/systrace/prefix.html b/android/tools/android-osx/platform-tools/systrace/prefix.html
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/platform-tools/systrace/prefix.html
rename to android/tools/android-osx/platform-tools/systrace/prefix.html
diff --git a/StartGamedev-160604-osx/tools/android-osx/platform-tools/systrace/script.js b/android/tools/android-osx/platform-tools/systrace/script.js
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/platform-tools/systrace/script.js
rename to android/tools/android-osx/platform-tools/systrace/script.js
diff --git a/StartGamedev-160604-osx/tools/android-osx/platform-tools/systrace/style.css b/android/tools/android-osx/platform-tools/systrace/style.css
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/platform-tools/systrace/style.css
rename to android/tools/android-osx/platform-tools/systrace/style.css
diff --git a/StartGamedev-160604-osx/tools/android-osx/platform-tools/systrace/suffix.html b/android/tools/android-osx/platform-tools/systrace/suffix.html
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/platform-tools/systrace/suffix.html
rename to android/tools/android-osx/platform-tools/systrace/suffix.html
diff --git a/StartGamedev-160604-osx/tools/android-osx/platform-tools/systrace/systrace-legacy.py b/android/tools/android-osx/platform-tools/systrace/systrace-legacy.py
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/platform-tools/systrace/systrace-legacy.py
rename to android/tools/android-osx/platform-tools/systrace/systrace-legacy.py
diff --git a/StartGamedev-160604-osx/tools/android-osx/platform-tools/systrace/systrace.py b/android/tools/android-osx/platform-tools/systrace/systrace.py
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/platform-tools/systrace/systrace.py
rename to android/tools/android-osx/platform-tools/systrace/systrace.py
diff --git a/StartGamedev-160604-osx/tools/android-osx/platforms/android-19/android.jar b/android/tools/android-osx/platforms/android-19/android.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/platforms/android-19/android.jar
rename to android/tools/android-osx/platforms/android-19/android.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/platforms/android-19/build.prop b/android/tools/android-osx/platforms/android-19/build.prop
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/platforms/android-19/build.prop
rename to android/tools/android-osx/platforms/android-19/build.prop
diff --git a/StartGamedev-160604-osx/tools/android-osx/platforms/android-19/framework.aidl b/android/tools/android-osx/platforms/android-19/framework.aidl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/platforms/android-19/framework.aidl
rename to android/tools/android-osx/platforms/android-19/framework.aidl
diff --git a/StartGamedev-160604-osx/tools/android-osx/platforms/android-19/sdk.properties b/android/tools/android-osx/platforms/android-19/sdk.properties
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/platforms/android-19/sdk.properties
rename to android/tools/android-osx/platforms/android-19/sdk.properties
diff --git a/StartGamedev-160604-osx/tools/android-osx/platforms/android-19/source.properties b/android/tools/android-osx/platforms/android-19/source.properties
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/platforms/android-19/source.properties
rename to android/tools/android-osx/platforms/android-19/source.properties
diff --git a/StartGamedev-160604-osx/tools/android-osx/platforms/android-19/uiautomator.jar b/android/tools/android-osx/platforms/android-19/uiautomator.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/platforms/android-19/uiautomator.jar
rename to android/tools/android-osx/platforms/android-19/uiautomator.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/NOTICE.txt b/android/tools/android-osx/tools/NOTICE.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/NOTICE.txt
rename to android/tools/android-osx/tools/NOTICE.txt
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/android b/android/tools/android-osx/tools/android
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/android
rename to android/tools/android-osx/tools/android
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/ant/NOTICE b/android/tools/android-osx/tools/ant/NOTICE
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/ant/NOTICE
rename to android/tools/android-osx/tools/ant/NOTICE
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/ant/build.xml b/android/tools/android-osx/tools/ant/build.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/ant/build.xml
rename to android/tools/android-osx/tools/ant/build.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/ant/uibuild.xml b/android/tools/android-osx/tools/ant/uibuild.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/ant/uibuild.xml
rename to android/tools/android-osx/tools/ant/uibuild.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/.classpath b/android/tools/android-osx/tools/apps/SdkController/.classpath
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/.classpath
rename to android/tools/android-osx/tools/apps/SdkController/.classpath
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/.project b/android/tools/android-osx/tools/apps/SdkController/.project
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/.project
rename to android/tools/android-osx/tools/apps/SdkController/.project
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/.settings/org.eclipse.jdt.core.prefs b/android/tools/android-osx/tools/apps/SdkController/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/.settings/org.eclipse.jdt.core.prefs
rename to android/tools/android-osx/tools/apps/SdkController/.settings/org.eclipse.jdt.core.prefs
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/AndroidManifest.xml b/android/tools/android-osx/tools/apps/SdkController/AndroidManifest.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/AndroidManifest.xml
rename to android/tools/android-osx/tools/apps/SdkController/AndroidManifest.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/Implementation.txt b/android/tools/android-osx/tools/apps/SdkController/Implementation.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/Implementation.txt
rename to android/tools/android-osx/tools/apps/SdkController/Implementation.txt
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/NOTICE b/android/tools/android-osx/tools/apps/SdkController/NOTICE
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/NOTICE
rename to android/tools/android-osx/tools/apps/SdkController/NOTICE
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/assets/intro_help.html b/android/tools/android-osx/tools/apps/SdkController/assets/intro_help.html
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/assets/intro_help.html
rename to android/tools/android-osx/tools/apps/SdkController/assets/intro_help.html
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/bin/SdkControllerApp.apk b/android/tools/android-osx/tools/apps/SdkController/bin/SdkControllerApp.apk
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/bin/SdkControllerApp.apk
rename to android/tools/android-osx/tools/apps/SdkController/bin/SdkControllerApp.apk
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/proguard-project.txt b/android/tools/android-osx/tools/apps/SdkController/proguard-project.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/proguard-project.txt
rename to android/tools/android-osx/tools/apps/SdkController/proguard-project.txt
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/project.properties b/android/tools/android-osx/tools/apps/SdkController/project.properties
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/project.properties
rename to android/tools/android-osx/tools/apps/SdkController/project.properties
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/res/drawable-hdpi/ic_launcher.png b/android/tools/android-osx/tools/apps/SdkController/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/res/drawable-hdpi/ic_launcher.png
rename to android/tools/android-osx/tools/apps/SdkController/res/drawable-hdpi/ic_launcher.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/res/drawable-ldpi/ic_launcher.png b/android/tools/android-osx/tools/apps/SdkController/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/res/drawable-ldpi/ic_launcher.png
rename to android/tools/android-osx/tools/apps/SdkController/res/drawable-ldpi/ic_launcher.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/res/drawable-mdpi/ic_launcher.png b/android/tools/android-osx/tools/apps/SdkController/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/res/drawable-mdpi/ic_launcher.png
rename to android/tools/android-osx/tools/apps/SdkController/res/drawable-mdpi/ic_launcher.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/res/drawable-xhdpi/ic_launcher.png b/android/tools/android-osx/tools/apps/SdkController/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/res/drawable-xhdpi/ic_launcher.png
rename to android/tools/android-osx/tools/apps/SdkController/res/drawable-xhdpi/ic_launcher.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/res/layout-land/sensors.xml b/android/tools/android-osx/tools/apps/SdkController/res/layout-land/sensors.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/res/layout-land/sensors.xml
rename to android/tools/android-osx/tools/apps/SdkController/res/layout-land/sensors.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/res/layout/main.xml b/android/tools/android-osx/tools/apps/SdkController/res/layout/main.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/res/layout/main.xml
rename to android/tools/android-osx/tools/apps/SdkController/res/layout/main.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/res/layout/multitouch.xml b/android/tools/android-osx/tools/apps/SdkController/res/layout/multitouch.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/res/layout/multitouch.xml
rename to android/tools/android-osx/tools/apps/SdkController/res/layout/multitouch.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/res/layout/sensor_row.xml b/android/tools/android-osx/tools/apps/SdkController/res/layout/sensor_row.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/res/layout/sensor_row.xml
rename to android/tools/android-osx/tools/apps/SdkController/res/layout/sensor_row.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/res/layout/sensors.xml b/android/tools/android-osx/tools/apps/SdkController/res/layout/sensors.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/res/layout/sensors.xml
rename to android/tools/android-osx/tools/apps/SdkController/res/layout/sensors.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/res/values-v11/styles_v11.xml b/android/tools/android-osx/tools/apps/SdkController/res/values-v11/styles_v11.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/res/values-v11/styles_v11.xml
rename to android/tools/android-osx/tools/apps/SdkController/res/values-v11/styles_v11.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/res/values/strings.xml b/android/tools/android-osx/tools/apps/SdkController/res/values/strings.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/res/values/strings.xml
rename to android/tools/android-osx/tools/apps/SdkController/res/values/strings.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/res/values/styles.xml b/android/tools/android-osx/tools/apps/SdkController/res/values/styles.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/res/values/styles.xml
rename to android/tools/android-osx/tools/apps/SdkController/res/values/styles.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/activities/BaseBindingActivity.java b/android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/activities/BaseBindingActivity.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/activities/BaseBindingActivity.java
rename to android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/activities/BaseBindingActivity.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/activities/MainActivity.java b/android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/activities/MainActivity.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/activities/MainActivity.java
rename to android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/activities/MainActivity.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/activities/MultiTouchActivity.java b/android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/activities/MultiTouchActivity.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/activities/MultiTouchActivity.java
rename to android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/activities/MultiTouchActivity.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/activities/SensorActivity.java b/android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/activities/SensorActivity.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/activities/SensorActivity.java
rename to android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/activities/SensorActivity.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/handlers/MultiTouchChannel.java b/android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/handlers/MultiTouchChannel.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/handlers/MultiTouchChannel.java
rename to android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/handlers/MultiTouchChannel.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/handlers/SensorChannel.java b/android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/handlers/SensorChannel.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/handlers/SensorChannel.java
rename to android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/handlers/SensorChannel.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/lib/Channel.java b/android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/lib/Channel.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/lib/Channel.java
rename to android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/lib/Channel.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/lib/Connection.java b/android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/lib/Connection.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/lib/Connection.java
rename to android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/lib/Connection.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/lib/ProtocolConstants.java b/android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/lib/ProtocolConstants.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/lib/ProtocolConstants.java
rename to android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/lib/ProtocolConstants.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/lib/Socket.java b/android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/lib/Socket.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/lib/Socket.java
rename to android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/lib/Socket.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/service/ControllerService.java b/android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/service/ControllerService.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/service/ControllerService.java
rename to android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/service/ControllerService.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/utils/ApiHelper.java b/android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/utils/ApiHelper.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/utils/ApiHelper.java
rename to android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/utils/ApiHelper.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/utils/ApiHelper_11.java b/android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/utils/ApiHelper_11.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/utils/ApiHelper_11.java
rename to android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/utils/ApiHelper_11.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/views/MultiTouchView.java b/android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/views/MultiTouchView.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/views/MultiTouchView.java
rename to android/tools/android-osx/tools/apps/SdkController/src/com/android/tools/sdkcontroller/views/MultiTouchView.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/ddms b/android/tools/android-osx/tools/ddms
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/ddms
rename to android/tools/android-osx/tools/ddms
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/draw9patch b/android/tools/android-osx/tools/draw9patch
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/draw9patch
rename to android/tools/android-osx/tools/draw9patch
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/hierarchyviewer b/android/tools/android-osx/tools/hierarchyviewer
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/hierarchyviewer
rename to android/tools/android-osx/tools/hierarchyviewer
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/jobb b/android/tools/android-osx/tools/jobb
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/jobb
rename to android/tools/android-osx/tools/jobb
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/android.el b/android/tools/android-osx/tools/lib/android.el
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/android.el
rename to android/tools/android-osx/tools/lib/android.el
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/annotations-12.0.jar b/android/tools/android-osx/tools/lib/annotations-12.0.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/annotations-12.0.jar
rename to android/tools/android-osx/tools/lib/annotations-12.0.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/annotations.jar b/android/tools/android-osx/tools/lib/annotations.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/annotations.jar
rename to android/tools/android-osx/tools/lib/annotations.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/ant-tasks.jar b/android/tools/android-osx/tools/lib/ant-tasks.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/ant-tasks.jar
rename to android/tools/android-osx/tools/lib/ant-tasks.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/archquery.jar b/android/tools/android-osx/tools/lib/archquery.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/archquery.jar
rename to android/tools/android-osx/tools/lib/archquery.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/asm-5.0.3.jar b/android/tools/android-osx/tools/lib/asm-5.0.3.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/asm-5.0.3.jar
rename to android/tools/android-osx/tools/lib/asm-5.0.3.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/asm-analysis-5.0.3.jar b/android/tools/android-osx/tools/lib/asm-analysis-5.0.3.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/asm-analysis-5.0.3.jar
rename to android/tools/android-osx/tools/lib/asm-analysis-5.0.3.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/asm-tree-5.0.3.jar b/android/tools/android-osx/tools/lib/asm-tree-5.0.3.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/asm-tree-5.0.3.jar
rename to android/tools/android-osx/tools/lib/asm-tree-5.0.3.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/asset-studio.jar b/android/tools/android-osx/tools/lib/asset-studio.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/asset-studio.jar
rename to android/tools/android-osx/tools/lib/asset-studio.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/build.template b/android/tools/android-osx/tools/lib/build.template
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/build.template
rename to android/tools/android-osx/tools/lib/build.template
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/build_gradle.template b/android/tools/android-osx/tools/lib/build_gradle.template
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/build_gradle.template
rename to android/tools/android-osx/tools/lib/build_gradle.template
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/builder-model.jar b/android/tools/android-osx/tools/lib/builder-model.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/builder-model.jar
rename to android/tools/android-osx/tools/lib/builder-model.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/cglib-nodep-3.1.jar b/android/tools/android-osx/tools/lib/cglib-nodep-3.1.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/cglib-nodep-3.1.jar
rename to android/tools/android-osx/tools/lib/cglib-nodep-3.1.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/chimpchat.jar b/android/tools/android-osx/tools/lib/chimpchat.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/chimpchat.jar
rename to android/tools/android-osx/tools/lib/chimpchat.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/common.jar b/android/tools/android-osx/tools/lib/common.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/common.jar
rename to android/tools/android-osx/tools/lib/common.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/commons-codec-1.4.jar b/android/tools/android-osx/tools/lib/commons-codec-1.4.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/commons-codec-1.4.jar
rename to android/tools/android-osx/tools/lib/commons-codec-1.4.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/commons-compress-1.8.1.jar b/android/tools/android-osx/tools/lib/commons-compress-1.8.1.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/commons-compress-1.8.1.jar
rename to android/tools/android-osx/tools/lib/commons-compress-1.8.1.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/commons-logging-1.1.1.jar b/android/tools/android-osx/tools/lib/commons-logging-1.1.1.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/commons-logging-1.1.1.jar
rename to android/tools/android-osx/tools/lib/commons-logging-1.1.1.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/ddmlib.jar b/android/tools/android-osx/tools/lib/ddmlib.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/ddmlib.jar
rename to android/tools/android-osx/tools/lib/ddmlib.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/ddms.jar b/android/tools/android-osx/tools/lib/ddms.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/ddms.jar
rename to android/tools/android-osx/tools/lib/ddms.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/ddmuilib.jar b/android/tools/android-osx/tools/lib/ddmuilib.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/ddmuilib.jar
rename to android/tools/android-osx/tools/lib/ddmuilib.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/devices.xml b/android/tools/android-osx/tools/lib/devices.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/devices.xml
rename to android/tools/android-osx/tools/lib/devices.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/draw9patch.jar b/android/tools/android-osx/tools/lib/draw9patch.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/draw9patch.jar
rename to android/tools/android-osx/tools/lib/draw9patch.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/dvlib.jar b/android/tools/android-osx/tools/lib/dvlib.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/dvlib.jar
rename to android/tools/android-osx/tools/lib/dvlib.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/easymock-3.3.jar b/android/tools/android-osx/tools/lib/easymock-3.3.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/easymock-3.3.jar
rename to android/tools/android-osx/tools/lib/easymock-3.3.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/ecj-4.4.2.jar b/android/tools/android-osx/tools/lib/ecj-4.4.2.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/ecj-4.4.2.jar
rename to android/tools/android-osx/tools/lib/ecj-4.4.2.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/emma.jar b/android/tools/android-osx/tools/lib/emma.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/emma.jar
rename to android/tools/android-osx/tools/lib/emma.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/emma_ant.jar b/android/tools/android-osx/tools/lib/emma_ant.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/emma_ant.jar
rename to android/tools/android-osx/tools/lib/emma_ant.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/emma_device.jar b/android/tools/android-osx/tools/lib/emma_device.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/emma_device.jar
rename to android/tools/android-osx/tools/lib/emma_device.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/fat32lib.jar b/android/tools/android-osx/tools/lib/fat32lib.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/fat32lib.jar
rename to android/tools/android-osx/tools/lib/fat32lib.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/gson-2.2.4.jar b/android/tools/android-osx/tools/lib/gson-2.2.4.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/gson-2.2.4.jar
rename to android/tools/android-osx/tools/lib/gson-2.2.4.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/guava-17.0.jar b/android/tools/android-osx/tools/lib/guava-17.0.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/guava-17.0.jar
rename to android/tools/android-osx/tools/lib/guava-17.0.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/hamcrest-core-1.3.jar b/android/tools/android-osx/tools/lib/hamcrest-core-1.3.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/hamcrest-core-1.3.jar
rename to android/tools/android-osx/tools/lib/hamcrest-core-1.3.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/hardware-properties.ini b/android/tools/android-osx/tools/lib/hardware-properties.ini
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/hardware-properties.ini
rename to android/tools/android-osx/tools/lib/hardware-properties.ini
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/hierarchyviewer2.jar b/android/tools/android-osx/tools/lib/hierarchyviewer2.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/hierarchyviewer2.jar
rename to android/tools/android-osx/tools/lib/hierarchyviewer2.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/hierarchyviewer2lib.jar b/android/tools/android-osx/tools/lib/hierarchyviewer2lib.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/hierarchyviewer2lib.jar
rename to android/tools/android-osx/tools/lib/hierarchyviewer2lib.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/httpclient-4.1.1.jar b/android/tools/android-osx/tools/lib/httpclient-4.1.1.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/httpclient-4.1.1.jar
rename to android/tools/android-osx/tools/lib/httpclient-4.1.1.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/httpcore-4.1.jar b/android/tools/android-osx/tools/lib/httpcore-4.1.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/httpcore-4.1.jar
rename to android/tools/android-osx/tools/lib/httpcore-4.1.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/httpmime-4.1.jar b/android/tools/android-osx/tools/lib/httpmime-4.1.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/httpmime-4.1.jar
rename to android/tools/android-osx/tools/lib/httpmime-4.1.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/jcommon-1.0.12.jar b/android/tools/android-osx/tools/lib/jcommon-1.0.12.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/jcommon-1.0.12.jar
rename to android/tools/android-osx/tools/lib/jcommon-1.0.12.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/jfreechart-1.0.9.jar b/android/tools/android-osx/tools/lib/jfreechart-1.0.9.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/jfreechart-1.0.9.jar
rename to android/tools/android-osx/tools/lib/jfreechart-1.0.9.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/jfreechart-swt-1.0.9.jar b/android/tools/android-osx/tools/lib/jfreechart-swt-1.0.9.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/jfreechart-swt-1.0.9.jar
rename to android/tools/android-osx/tools/lib/jfreechart-swt-1.0.9.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/jobb.jar b/android/tools/android-osx/tools/lib/jobb.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/jobb.jar
rename to android/tools/android-osx/tools/lib/jobb.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/jsilver-1.0.0.jar b/android/tools/android-osx/tools/lib/jsilver-1.0.0.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/jsilver-1.0.0.jar
rename to android/tools/android-osx/tools/lib/jsilver-1.0.0.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/junit-4.12.jar b/android/tools/android-osx/tools/lib/junit-4.12.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/junit-4.12.jar
rename to android/tools/android-osx/tools/lib/junit-4.12.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/jython-standalone-2.5.3.jar b/android/tools/android-osx/tools/lib/jython-standalone-2.5.3.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/jython-standalone-2.5.3.jar
rename to android/tools/android-osx/tools/lib/jython-standalone-2.5.3.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/kxml2-2.3.0.jar b/android/tools/android-osx/tools/lib/kxml2-2.3.0.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/kxml2-2.3.0.jar
rename to android/tools/android-osx/tools/lib/kxml2-2.3.0.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/layoutlib-api.jar b/android/tools/android-osx/tools/lib/layoutlib-api.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/layoutlib-api.jar
rename to android/tools/android-osx/tools/lib/layoutlib-api.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/lint-api.jar b/android/tools/android-osx/tools/lib/lint-api.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/lint-api.jar
rename to android/tools/android-osx/tools/lib/lint-api.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/lint-checks.jar b/android/tools/android-osx/tools/lib/lint-checks.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/lint-checks.jar
rename to android/tools/android-osx/tools/lib/lint-checks.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/lint-tests.jar b/android/tools/android-osx/tools/lib/lint-tests.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/lint-tests.jar
rename to android/tools/android-osx/tools/lib/lint-tests.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/lint.jar b/android/tools/android-osx/tools/lib/lint.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/lint.jar
rename to android/tools/android-osx/tools/lib/lint.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/lombok-ast-0.2.3.jar b/android/tools/android-osx/tools/lib/lombok-ast-0.2.3.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/lombok-ast-0.2.3.jar
rename to android/tools/android-osx/tools/lib/lombok-ast-0.2.3.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/manifest-merger.jar b/android/tools/android-osx/tools/lib/manifest-merger.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/manifest-merger.jar
rename to android/tools/android-osx/tools/lib/manifest-merger.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/monkeyrunner.jar b/android/tools/android-osx/tools/lib/monkeyrunner.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/monkeyrunner.jar
rename to android/tools/android-osx/tools/lib/monkeyrunner.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/ninepatch.jar b/android/tools/android-osx/tools/lib/ninepatch.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/ninepatch.jar
rename to android/tools/android-osx/tools/lib/ninepatch.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/objenesis-2.1.jar b/android/tools/android-osx/tools/lib/objenesis-2.1.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/objenesis-2.1.jar
rename to android/tools/android-osx/tools/lib/objenesis-2.1.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/org-eclipse-core-commands-3.6.0.jar b/android/tools/android-osx/tools/lib/org-eclipse-core-commands-3.6.0.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/org-eclipse-core-commands-3.6.0.jar
rename to android/tools/android-osx/tools/lib/org-eclipse-core-commands-3.6.0.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/org-eclipse-equinox-common-3.6.0.jar b/android/tools/android-osx/tools/lib/org-eclipse-equinox-common-3.6.0.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/org-eclipse-equinox-common-3.6.0.jar
rename to android/tools/android-osx/tools/lib/org-eclipse-equinox-common-3.6.0.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/org-eclipse-jface-3.6.2.jar b/android/tools/android-osx/tools/lib/org-eclipse-jface-3.6.2.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/org-eclipse-jface-3.6.2.jar
rename to android/tools/android-osx/tools/lib/org-eclipse-jface-3.6.2.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/osgi-4.0.0.jar b/android/tools/android-osx/tools/lib/osgi-4.0.0.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/osgi-4.0.0.jar
rename to android/tools/android-osx/tools/lib/osgi-4.0.0.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/pc-bios/bios.bin b/android/tools/android-osx/tools/lib/pc-bios/bios.bin
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/pc-bios/bios.bin
rename to android/tools/android-osx/tools/lib/pc-bios/bios.bin
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/pc-bios/vgabios-cirrus.bin b/android/tools/android-osx/tools/lib/pc-bios/vgabios-cirrus.bin
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/pc-bios/vgabios-cirrus.bin
rename to android/tools/android-osx/tools/lib/pc-bios/vgabios-cirrus.bin
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/plugin.prop b/android/tools/android-osx/tools/lib/plugin.prop
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/plugin.prop
rename to android/tools/android-osx/tools/lib/plugin.prop
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/proguard-project.txt b/android/tools/android-osx/tools/lib/proguard-project.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/proguard-project.txt
rename to android/tools/android-osx/tools/lib/proguard-project.txt
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/rule-api.jar b/android/tools/android-osx/tools/lib/rule-api.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/rule-api.jar
rename to android/tools/android-osx/tools/lib/rule-api.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/screenshot2.jar b/android/tools/android-osx/tools/lib/screenshot2.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/screenshot2.jar
rename to android/tools/android-osx/tools/lib/screenshot2.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/sdk-common.jar b/android/tools/android-osx/tools/lib/sdk-common.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/sdk-common.jar
rename to android/tools/android-osx/tools/lib/sdk-common.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/sdklib.jar b/android/tools/android-osx/tools/lib/sdklib.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/sdklib.jar
rename to android/tools/android-osx/tools/lib/sdklib.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/sdkmanager.jar b/android/tools/android-osx/tools/lib/sdkmanager.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/sdkmanager.jar
rename to android/tools/android-osx/tools/lib/sdkmanager.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/sdkstats.jar b/android/tools/android-osx/tools/lib/sdkstats.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/sdkstats.jar
rename to android/tools/android-osx/tools/lib/sdkstats.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/sdkuilib.jar b/android/tools/android-osx/tools/lib/sdkuilib.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/sdkuilib.jar
rename to android/tools/android-osx/tools/lib/sdkuilib.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/swtmenubar.jar b/android/tools/android-osx/tools/lib/swtmenubar.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/swtmenubar.jar
rename to android/tools/android-osx/tools/lib/swtmenubar.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/traceview.jar b/android/tools/android-osx/tools/lib/traceview.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/traceview.jar
rename to android/tools/android-osx/tools/lib/traceview.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/uiautomatorviewer.jar b/android/tools/android-osx/tools/lib/uiautomatorviewer.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/uiautomatorviewer.jar
rename to android/tools/android-osx/tools/lib/uiautomatorviewer.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/uibuild.template b/android/tools/android-osx/tools/lib/uibuild.template
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/uibuild.template
rename to android/tools/android-osx/tools/lib/uibuild.template
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/x86/swt.jar b/android/tools/android-osx/tools/lib/x86/swt.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/x86/swt.jar
rename to android/tools/android-osx/tools/lib/x86/swt.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib/x86_64/swt.jar b/android/tools/android-osx/tools/lib/x86_64/swt.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib/x86_64/swt.jar
rename to android/tools/android-osx/tools/lib/x86_64/swt.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib64/lib64EGL_translator.dylib b/android/tools/android-osx/tools/lib64/lib64EGL_translator.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib64/lib64EGL_translator.dylib
rename to android/tools/android-osx/tools/lib64/lib64EGL_translator.dylib
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib64/lib64GLES_CM_translator.dylib b/android/tools/android-osx/tools/lib64/lib64GLES_CM_translator.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib64/lib64GLES_CM_translator.dylib
rename to android/tools/android-osx/tools/lib64/lib64GLES_CM_translator.dylib
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib64/lib64GLES_V2_translator.dylib b/android/tools/android-osx/tools/lib64/lib64GLES_V2_translator.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib64/lib64GLES_V2_translator.dylib
rename to android/tools/android-osx/tools/lib64/lib64GLES_V2_translator.dylib
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib64/lib64OpenglRender.dylib b/android/tools/android-osx/tools/lib64/lib64OpenglRender.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib64/lib64OpenglRender.dylib
rename to android/tools/android-osx/tools/lib64/lib64OpenglRender.dylib
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lib64/lib64emugl_test_shared_library.dylib b/android/tools/android-osx/tools/lib64/lib64emugl_test_shared_library.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lib64/lib64emugl_test_shared_library.dylib
rename to android/tools/android-osx/tools/lib64/lib64emugl_test_shared_library.dylib
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/lint b/android/tools/android-osx/tools/lint
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/lint
rename to android/tools/android-osx/tools/lint
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/monitor b/android/tools/android-osx/tools/monitor
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/monitor
rename to android/tools/android-osx/tools/monitor
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/monkeyrunner b/android/tools/android-osx/tools/monkeyrunner
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/monkeyrunner
rename to android/tools/android-osx/tools/monkeyrunner
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/README b/android/tools/android-osx/tools/proguard/README
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/README
rename to android/tools/android-osx/tools/proguard/README
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/ant/task.properties b/android/tools/android-osx/tools/proguard/ant/task.properties
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/ant/task.properties
rename to android/tools/android-osx/tools/proguard/ant/task.properties
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/bin/proguard.sh b/android/tools/android-osx/tools/proguard/bin/proguard.sh
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/bin/proguard.sh
rename to android/tools/android-osx/tools/proguard/bin/proguard.sh
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/bin/proguardgui.sh b/android/tools/android-osx/tools/proguard/bin/proguardgui.sh
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/bin/proguardgui.sh
rename to android/tools/android-osx/tools/proguard/bin/proguardgui.sh
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/bin/retrace.sh b/android/tools/android-osx/tools/proguard/bin/retrace.sh
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/bin/retrace.sh
rename to android/tools/android-osx/tools/proguard/bin/retrace.sh
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/android.pro b/android/tools/android-osx/tools/proguard/examples/android.pro
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/android.pro
rename to android/tools/android-osx/tools/proguard/examples/android.pro
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/examples.pro b/android/tools/android-osx/tools/proguard/examples/annotations/examples.pro
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/examples.pro
rename to android/tools/android-osx/tools/proguard/examples/annotations/examples.pro
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/examples/Applet.java b/android/tools/android-osx/tools/proguard/examples/annotations/examples/Applet.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/examples/Applet.java
rename to android/tools/android-osx/tools/proguard/examples/annotations/examples/Applet.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/examples/Application.java b/android/tools/android-osx/tools/proguard/examples/annotations/examples/Application.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/examples/Application.java
rename to android/tools/android-osx/tools/proguard/examples/annotations/examples/Application.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/examples/Bean.java b/android/tools/android-osx/tools/proguard/examples/annotations/examples/Bean.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/examples/Bean.java
rename to android/tools/android-osx/tools/proguard/examples/annotations/examples/Bean.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/examples/NativeCallBack.java b/android/tools/android-osx/tools/proguard/examples/annotations/examples/NativeCallBack.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/examples/NativeCallBack.java
rename to android/tools/android-osx/tools/proguard/examples/annotations/examples/NativeCallBack.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/lib/annotations.jar b/android/tools/android-osx/tools/proguard/examples/annotations/lib/annotations.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/lib/annotations.jar
rename to android/tools/android-osx/tools/proguard/examples/annotations/lib/annotations.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/lib/annotations.pro b/android/tools/android-osx/tools/proguard/examples/annotations/lib/annotations.pro
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/lib/annotations.pro
rename to android/tools/android-osx/tools/proguard/examples/annotations/lib/annotations.pro
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/Keep.java b/android/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/Keep.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/Keep.java
rename to android/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/Keep.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepApplication.java b/android/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepApplication.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepApplication.java
rename to android/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepApplication.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepClassMemberNames.java b/android/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepClassMemberNames.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepClassMemberNames.java
rename to android/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepClassMemberNames.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepClassMembers.java b/android/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepClassMembers.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepClassMembers.java
rename to android/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepClassMembers.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepGettersSetters.java b/android/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepGettersSetters.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepGettersSetters.java
rename to android/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepGettersSetters.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepImplementations.java b/android/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepImplementations.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepImplementations.java
rename to android/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepImplementations.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepName.java b/android/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepName.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepName.java
rename to android/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepName.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepPublicClassMemberNames.java b/android/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepPublicClassMemberNames.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepPublicClassMemberNames.java
rename to android/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepPublicClassMemberNames.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepPublicClassMembers.java b/android/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepPublicClassMembers.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepPublicClassMembers.java
rename to android/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepPublicClassMembers.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepPublicGettersSetters.java b/android/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepPublicGettersSetters.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepPublicGettersSetters.java
rename to android/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepPublicGettersSetters.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepPublicImplementations.java b/android/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepPublicImplementations.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepPublicImplementations.java
rename to android/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepPublicImplementations.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepPublicProtectedClassMemberNames.java b/android/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepPublicProtectedClassMemberNames.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepPublicProtectedClassMemberNames.java
rename to android/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepPublicProtectedClassMemberNames.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepPublicProtectedClassMembers.java b/android/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepPublicProtectedClassMembers.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepPublicProtectedClassMembers.java
rename to android/tools/android-osx/tools/proguard/examples/annotations/src/proguard/annotation/KeepPublicProtectedClassMembers.java
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/ant/android-8.xml b/android/tools/android-osx/tools/proguard/examples/ant/android-8.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/ant/android-8.xml
rename to android/tools/android-osx/tools/proguard/examples/ant/android-8.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/ant/applets.xml b/android/tools/android-osx/tools/proguard/examples/ant/applets.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/ant/applets.xml
rename to android/tools/android-osx/tools/proguard/examples/ant/applets.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/ant/applications1.xml b/android/tools/android-osx/tools/proguard/examples/ant/applications1.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/ant/applications1.xml
rename to android/tools/android-osx/tools/proguard/examples/ant/applications1.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/ant/applications2.xml b/android/tools/android-osx/tools/proguard/examples/ant/applications2.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/ant/applications2.xml
rename to android/tools/android-osx/tools/proguard/examples/ant/applications2.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/ant/applications3.xml b/android/tools/android-osx/tools/proguard/examples/ant/applications3.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/ant/applications3.xml
rename to android/tools/android-osx/tools/proguard/examples/ant/applications3.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/ant/library.xml b/android/tools/android-osx/tools/proguard/examples/ant/library.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/ant/library.xml
rename to android/tools/android-osx/tools/proguard/examples/ant/library.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/ant/midlets.xml b/android/tools/android-osx/tools/proguard/examples/ant/midlets.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/ant/midlets.xml
rename to android/tools/android-osx/tools/proguard/examples/ant/midlets.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/ant/proguard.xml b/android/tools/android-osx/tools/proguard/examples/ant/proguard.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/ant/proguard.xml
rename to android/tools/android-osx/tools/proguard/examples/ant/proguard.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/ant/servlets.xml b/android/tools/android-osx/tools/proguard/examples/ant/servlets.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/ant/servlets.xml
rename to android/tools/android-osx/tools/proguard/examples/ant/servlets.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/applets.pro b/android/tools/android-osx/tools/proguard/examples/applets.pro
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/applets.pro
rename to android/tools/android-osx/tools/proguard/examples/applets.pro
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/applications.pro b/android/tools/android-osx/tools/proguard/examples/applications.pro
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/applications.pro
rename to android/tools/android-osx/tools/proguard/examples/applications.pro
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/dictionaries/compact.txt b/android/tools/android-osx/tools/proguard/examples/dictionaries/compact.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/dictionaries/compact.txt
rename to android/tools/android-osx/tools/proguard/examples/dictionaries/compact.txt
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/dictionaries/keywords.txt b/android/tools/android-osx/tools/proguard/examples/dictionaries/keywords.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/dictionaries/keywords.txt
rename to android/tools/android-osx/tools/proguard/examples/dictionaries/keywords.txt
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/dictionaries/shakespeare.txt b/android/tools/android-osx/tools/proguard/examples/dictionaries/shakespeare.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/dictionaries/shakespeare.txt
rename to android/tools/android-osx/tools/proguard/examples/dictionaries/shakespeare.txt
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/dictionaries/windows.txt b/android/tools/android-osx/tools/proguard/examples/dictionaries/windows.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/dictionaries/windows.txt
rename to android/tools/android-osx/tools/proguard/examples/dictionaries/windows.txt
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/library.pro b/android/tools/android-osx/tools/proguard/examples/library.pro
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/library.pro
rename to android/tools/android-osx/tools/proguard/examples/library.pro
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/midlets.pro b/android/tools/android-osx/tools/proguard/examples/midlets.pro
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/midlets.pro
rename to android/tools/android-osx/tools/proguard/examples/midlets.pro
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/proguard.pro b/android/tools/android-osx/tools/proguard/examples/proguard.pro
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/proguard.pro
rename to android/tools/android-osx/tools/proguard/examples/proguard.pro
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/proguardall.pro b/android/tools/android-osx/tools/proguard/examples/proguardall.pro
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/proguardall.pro
rename to android/tools/android-osx/tools/proguard/examples/proguardall.pro
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/proguardgui.pro b/android/tools/android-osx/tools/proguard/examples/proguardgui.pro
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/proguardgui.pro
rename to android/tools/android-osx/tools/proguard/examples/proguardgui.pro
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/retrace.pro b/android/tools/android-osx/tools/proguard/examples/retrace.pro
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/retrace.pro
rename to android/tools/android-osx/tools/proguard/examples/retrace.pro
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/scala.pro b/android/tools/android-osx/tools/proguard/examples/scala.pro
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/scala.pro
rename to android/tools/android-osx/tools/proguard/examples/scala.pro
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/servlets.pro b/android/tools/android-osx/tools/proguard/examples/servlets.pro
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/examples/servlets.pro
rename to android/tools/android-osx/tools/proguard/examples/servlets.pro
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/lib/proguard.jar b/android/tools/android-osx/tools/proguard/lib/proguard.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/lib/proguard.jar
rename to android/tools/android-osx/tools/proguard/lib/proguard.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/lib/proguardgui.jar b/android/tools/android-osx/tools/proguard/lib/proguardgui.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/lib/proguardgui.jar
rename to android/tools/android-osx/tools/proguard/lib/proguardgui.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/lib/retrace.jar b/android/tools/android-osx/tools/proguard/lib/retrace.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/lib/retrace.jar
rename to android/tools/android-osx/tools/proguard/lib/retrace.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/license.html b/android/tools/android-osx/tools/proguard/license.html
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/license.html
rename to android/tools/android-osx/tools/proguard/license.html
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/proguard-android-optimize.txt b/android/tools/android-osx/tools/proguard/proguard-android-optimize.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/proguard-android-optimize.txt
rename to android/tools/android-osx/tools/proguard/proguard-android-optimize.txt
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/proguard-android.txt b/android/tools/android-osx/tools/proguard/proguard-android.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/proguard-android.txt
rename to android/tools/android-osx/tools/proguard/proguard-android.txt
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/proguard/proguard-project.txt b/android/tools/android-osx/tools/proguard/proguard-project.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/proguard/proguard-project.txt
rename to android/tools/android-osx/tools/proguard/proguard-project.txt
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/screenshot2 b/android/tools/android-osx/tools/screenshot2
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/screenshot2
rename to android/tools/android-osx/tools/screenshot2
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/source.properties b/android/tools/android-osx/tools/source.properties
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/source.properties
rename to android/tools/android-osx/tools/source.properties
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/support/annotations.jar b/android/tools/android-osx/tools/support/annotations.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/support/annotations.jar
rename to android/tools/android-osx/tools/support/annotations.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/support/typos-de.txt b/android/tools/android-osx/tools/support/typos-de.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/support/typos-de.txt
rename to android/tools/android-osx/tools/support/typos-de.txt
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/support/typos-en.txt b/android/tools/android-osx/tools/support/typos-en.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/support/typos-en.txt
rename to android/tools/android-osx/tools/support/typos-en.txt
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/support/typos-es.txt b/android/tools/android-osx/tools/support/typos-es.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/support/typos-es.txt
rename to android/tools/android-osx/tools/support/typos-es.txt
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/support/typos-hu.txt b/android/tools/android-osx/tools/support/typos-hu.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/support/typos-hu.txt
rename to android/tools/android-osx/tools/support/typos-hu.txt
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/support/typos-it.txt b/android/tools/android-osx/tools/support/typos-it.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/support/typos-it.txt
rename to android/tools/android-osx/tools/support/typos-it.txt
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/support/typos-nb.txt b/android/tools/android-osx/tools/support/typos-nb.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/support/typos-nb.txt
rename to android/tools/android-osx/tools/support/typos-nb.txt
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/support/typos-pt.txt b/android/tools/android-osx/tools/support/typos-pt.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/support/typos-pt.txt
rename to android/tools/android-osx/tools/support/typos-pt.txt
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/support/typos-tr.txt b/android/tools/android-osx/tools/support/typos-tr.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/support/typos-tr.txt
rename to android/tools/android-osx/tools/support/typos-tr.txt
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivity/globals.xml.ftl b/android/tools/android-osx/tools/templates/activities/BlankActivity/globals.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivity/globals.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/BlankActivity/globals.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivity/recipe.xml.ftl b/android/tools/android-osx/tools/templates/activities/BlankActivity/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivity/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/BlankActivity/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivity/root/AndroidManifest.xml.ftl b/android/tools/android-osx/tools/templates/activities/BlankActivity/root/AndroidManifest.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivity/root/AndroidManifest.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/BlankActivity/root/AndroidManifest.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivity/root/res/layout/activity_simple.xml.ftl b/android/tools/android-osx/tools/templates/activities/BlankActivity/root/res/layout/activity_simple.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivity/root/res/layout/activity_simple.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/BlankActivity/root/res/layout/activity_simple.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivity/root/res/menu/main.xml.ftl b/android/tools/android-osx/tools/templates/activities/BlankActivity/root/res/menu/main.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivity/root/res/menu/main.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/BlankActivity/root/res/menu/main.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivity/root/res/values-w820dp/dimens.xml b/android/tools/android-osx/tools/templates/activities/BlankActivity/root/res/values-w820dp/dimens.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivity/root/res/values-w820dp/dimens.xml
rename to android/tools/android-osx/tools/templates/activities/BlankActivity/root/res/values-w820dp/dimens.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivity/root/res/values/dimens.xml.ftl b/android/tools/android-osx/tools/templates/activities/BlankActivity/root/res/values/dimens.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivity/root/res/values/dimens.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/BlankActivity/root/res/values/dimens.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivity/root/res/values/strings.xml.ftl b/android/tools/android-osx/tools/templates/activities/BlankActivity/root/res/values/strings.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivity/root/res/values/strings.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/BlankActivity/root/res/values/strings.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivity/root/src/app_package/SimpleActivity.java.ftl b/android/tools/android-osx/tools/templates/activities/BlankActivity/root/src/app_package/SimpleActivity.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivity/root/src/app_package/SimpleActivity.java.ftl
rename to android/tools/android-osx/tools/templates/activities/BlankActivity/root/src/app_package/SimpleActivity.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivity/template.xml b/android/tools/android-osx/tools/templates/activities/BlankActivity/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivity/template.xml
rename to android/tools/android-osx/tools/templates/activities/BlankActivity/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivity/template_blank_activity.png b/android/tools/android-osx/tools/templates/activities/BlankActivity/template_blank_activity.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivity/template_blank_activity.png
rename to android/tools/android-osx/tools/templates/activities/BlankActivity/template_blank_activity.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/globals.xml.ftl b/android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/globals.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/globals.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/globals.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/recipe.xml.ftl b/android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/AndroidManifest.xml.ftl b/android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/AndroidManifest.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/AndroidManifest.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/AndroidManifest.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/res/layout/activity_fragment_container.xml.ftl b/android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/res/layout/activity_fragment_container.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/res/layout/activity_fragment_container.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/res/layout/activity_fragment_container.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/res/layout/fragment_simple.xml.ftl b/android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/res/layout/fragment_simple.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/res/layout/fragment_simple.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/res/layout/fragment_simple.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/res/menu/main.xml.ftl b/android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/res/menu/main.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/res/menu/main.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/res/menu/main.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/res/values-w820dp/dimens.xml b/android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/res/values-w820dp/dimens.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/res/values-w820dp/dimens.xml
rename to android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/res/values-w820dp/dimens.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/res/values/dimens.xml.ftl b/android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/res/values/dimens.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/res/values/dimens.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/res/values/dimens.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/res/values/strings.xml.ftl b/android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/res/values/strings.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/res/values/strings.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/res/values/strings.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/src/app_package/SimpleActivity.java.ftl b/android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/src/app_package/SimpleActivity.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/src/app_package/SimpleActivity.java.ftl
rename to android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/src/app_package/SimpleActivity.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/src/app_package/include_fragment.java.ftl b/android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/src/app_package/include_fragment.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/src/app_package/include_fragment.java.ftl
rename to android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/src/app_package/include_fragment.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/src/app_package/include_options_menu.java.ftl b/android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/src/app_package/include_options_menu.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/src/app_package/include_options_menu.java.ftl
rename to android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/root/src/app_package/include_options_menu.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/template.xml b/android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/template.xml
rename to android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/template_blank_activity_fragment.png b/android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/template_blank_activity_fragment.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/template_blank_activity_fragment.png
rename to android/tools/android-osx/tools/templates/activities/BlankActivityWithFragment/template_blank_activity_fragment.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/EmptyActivity/globals.xml.ftl b/android/tools/android-osx/tools/templates/activities/EmptyActivity/globals.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/EmptyActivity/globals.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/EmptyActivity/globals.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/EmptyActivity/recipe.xml.ftl b/android/tools/android-osx/tools/templates/activities/EmptyActivity/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/EmptyActivity/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/EmptyActivity/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/EmptyActivity/root/AndroidManifest.xml.ftl b/android/tools/android-osx/tools/templates/activities/EmptyActivity/root/AndroidManifest.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/EmptyActivity/root/AndroidManifest.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/EmptyActivity/root/AndroidManifest.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/EmptyActivity/root/res/layout/activity_simple.xml b/android/tools/android-osx/tools/templates/activities/EmptyActivity/root/res/layout/activity_simple.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/EmptyActivity/root/res/layout/activity_simple.xml
rename to android/tools/android-osx/tools/templates/activities/EmptyActivity/root/res/layout/activity_simple.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/EmptyActivity/root/res/values/strings.xml.ftl b/android/tools/android-osx/tools/templates/activities/EmptyActivity/root/res/values/strings.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/EmptyActivity/root/res/values/strings.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/EmptyActivity/root/res/values/strings.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/EmptyActivity/root/src/app_package/SimpleActivity.java.ftl b/android/tools/android-osx/tools/templates/activities/EmptyActivity/root/src/app_package/SimpleActivity.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/EmptyActivity/root/src/app_package/SimpleActivity.java.ftl
rename to android/tools/android-osx/tools/templates/activities/EmptyActivity/root/src/app_package/SimpleActivity.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/EmptyActivity/template.xml b/android/tools/android-osx/tools/templates/activities/EmptyActivity/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/EmptyActivity/template.xml
rename to android/tools/android-osx/tools/templates/activities/EmptyActivity/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/EmptyActivity/template_blank_activity.png b/android/tools/android-osx/tools/templates/activities/EmptyActivity/template_blank_activity.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/EmptyActivity/template_blank_activity.png
rename to android/tools/android-osx/tools/templates/activities/EmptyActivity/template_blank_activity.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/globals.xml.ftl b/android/tools/android-osx/tools/templates/activities/FullscreenActivity/globals.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/globals.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/FullscreenActivity/globals.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/recipe.xml.ftl b/android/tools/android-osx/tools/templates/activities/FullscreenActivity/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/FullscreenActivity/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/root/AndroidManifest.xml.ftl b/android/tools/android-osx/tools/templates/activities/FullscreenActivity/root/AndroidManifest.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/root/AndroidManifest.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/FullscreenActivity/root/AndroidManifest.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/root/res/layout/activity_fullscreen.xml.ftl b/android/tools/android-osx/tools/templates/activities/FullscreenActivity/root/res/layout/activity_fullscreen.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/root/res/layout/activity_fullscreen.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/FullscreenActivity/root/res/layout/activity_fullscreen.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/root/res/values-v11/styles.xml b/android/tools/android-osx/tools/templates/activities/FullscreenActivity/root/res/values-v11/styles.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/root/res/values-v11/styles.xml
rename to android/tools/android-osx/tools/templates/activities/FullscreenActivity/root/res/values-v11/styles.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/root/res/values/attrs.xml b/android/tools/android-osx/tools/templates/activities/FullscreenActivity/root/res/values/attrs.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/root/res/values/attrs.xml
rename to android/tools/android-osx/tools/templates/activities/FullscreenActivity/root/res/values/attrs.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/root/res/values/colors.xml b/android/tools/android-osx/tools/templates/activities/FullscreenActivity/root/res/values/colors.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/root/res/values/colors.xml
rename to android/tools/android-osx/tools/templates/activities/FullscreenActivity/root/res/values/colors.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/root/res/values/strings.xml.ftl b/android/tools/android-osx/tools/templates/activities/FullscreenActivity/root/res/values/strings.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/root/res/values/strings.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/FullscreenActivity/root/res/values/strings.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/root/res/values/styles.xml b/android/tools/android-osx/tools/templates/activities/FullscreenActivity/root/res/values/styles.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/root/res/values/styles.xml
rename to android/tools/android-osx/tools/templates/activities/FullscreenActivity/root/res/values/styles.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/root/src/app_package/FullscreenActivity.java.ftl b/android/tools/android-osx/tools/templates/activities/FullscreenActivity/root/src/app_package/FullscreenActivity.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/root/src/app_package/FullscreenActivity.java.ftl
rename to android/tools/android-osx/tools/templates/activities/FullscreenActivity/root/src/app_package/FullscreenActivity.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/root/src/app_package/util/SystemUiHider.java.ftl b/android/tools/android-osx/tools/templates/activities/FullscreenActivity/root/src/app_package/util/SystemUiHider.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/root/src/app_package/util/SystemUiHider.java.ftl
rename to android/tools/android-osx/tools/templates/activities/FullscreenActivity/root/src/app_package/util/SystemUiHider.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/root/src/app_package/util/SystemUiHiderBase.java.ftl b/android/tools/android-osx/tools/templates/activities/FullscreenActivity/root/src/app_package/util/SystemUiHiderBase.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/root/src/app_package/util/SystemUiHiderBase.java.ftl
rename to android/tools/android-osx/tools/templates/activities/FullscreenActivity/root/src/app_package/util/SystemUiHiderBase.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/root/src/app_package/util/SystemUiHiderHoneycomb.java.ftl b/android/tools/android-osx/tools/templates/activities/FullscreenActivity/root/src/app_package/util/SystemUiHiderHoneycomb.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/root/src/app_package/util/SystemUiHiderHoneycomb.java.ftl
rename to android/tools/android-osx/tools/templates/activities/FullscreenActivity/root/src/app_package/util/SystemUiHiderHoneycomb.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/template.xml b/android/tools/android-osx/tools/templates/activities/FullscreenActivity/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/template.xml
rename to android/tools/android-osx/tools/templates/activities/FullscreenActivity/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/template_fullscreen_activity.png b/android/tools/android-osx/tools/templates/activities/FullscreenActivity/template_fullscreen_activity.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/FullscreenActivity/template_fullscreen_activity.png
rename to android/tools/android-osx/tools/templates/activities/FullscreenActivity/template_fullscreen_activity.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/LoginActivity/globals.xml.ftl b/android/tools/android-osx/tools/templates/activities/LoginActivity/globals.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/LoginActivity/globals.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/LoginActivity/globals.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/LoginActivity/recipe.xml.ftl b/android/tools/android-osx/tools/templates/activities/LoginActivity/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/LoginActivity/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/LoginActivity/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/LoginActivity/root/AndroidManifest.xml.ftl b/android/tools/android-osx/tools/templates/activities/LoginActivity/root/AndroidManifest.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/LoginActivity/root/AndroidManifest.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/LoginActivity/root/AndroidManifest.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/LoginActivity/root/res/layout/activity_login.xml.ftl b/android/tools/android-osx/tools/templates/activities/LoginActivity/root/res/layout/activity_login.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/LoginActivity/root/res/layout/activity_login.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/LoginActivity/root/res/layout/activity_login.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/LoginActivity/root/res/values/dimens.xml b/android/tools/android-osx/tools/templates/activities/LoginActivity/root/res/values/dimens.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/LoginActivity/root/res/values/dimens.xml
rename to android/tools/android-osx/tools/templates/activities/LoginActivity/root/res/values/dimens.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/LoginActivity/root/res/values/strings.xml.ftl b/android/tools/android-osx/tools/templates/activities/LoginActivity/root/res/values/strings.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/LoginActivity/root/res/values/strings.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/LoginActivity/root/res/values/strings.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/LoginActivity/root/src/app_package/LoginActivity.java.ftl b/android/tools/android-osx/tools/templates/activities/LoginActivity/root/src/app_package/LoginActivity.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/LoginActivity/root/src/app_package/LoginActivity.java.ftl
rename to android/tools/android-osx/tools/templates/activities/LoginActivity/root/src/app_package/LoginActivity.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/LoginActivity/root/src/app_package/PlusBaseActivity.java.ftl b/android/tools/android-osx/tools/templates/activities/LoginActivity/root/src/app_package/PlusBaseActivity.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/LoginActivity/root/src/app_package/PlusBaseActivity.java.ftl
rename to android/tools/android-osx/tools/templates/activities/LoginActivity/root/src/app_package/PlusBaseActivity.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/LoginActivity/template.xml b/android/tools/android-osx/tools/templates/activities/LoginActivity/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/LoginActivity/template.xml
rename to android/tools/android-osx/tools/templates/activities/LoginActivity/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/LoginActivity/template_login_activity.png b/android/tools/android-osx/tools/templates/activities/LoginActivity/template_login_activity.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/LoginActivity/template_login_activity.png
rename to android/tools/android-osx/tools/templates/activities/LoginActivity/template_login_activity.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/globals.xml.ftl b/android/tools/android-osx/tools/templates/activities/MasterDetailFlow/globals.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/globals.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/MasterDetailFlow/globals.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/recipe.xml.ftl b/android/tools/android-osx/tools/templates/activities/MasterDetailFlow/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/MasterDetailFlow/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/AndroidManifest.xml.ftl b/android/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/AndroidManifest.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/AndroidManifest.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/AndroidManifest.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/layout/activity_content_detail.xml.ftl b/android/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/layout/activity_content_detail.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/layout/activity_content_detail.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/layout/activity_content_detail.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/layout/activity_content_list.xml.ftl b/android/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/layout/activity_content_list.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/layout/activity_content_list.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/layout/activity_content_list.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/layout/activity_content_twopane.xml.ftl b/android/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/layout/activity_content_twopane.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/layout/activity_content_twopane.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/layout/activity_content_twopane.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/layout/fragment_content_detail.xml.ftl b/android/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/layout/fragment_content_detail.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/layout/fragment_content_detail.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/layout/fragment_content_detail.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/values-large/refs.xml.ftl b/android/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/values-large/refs.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/values-large/refs.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/values-large/refs.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/values-sw600dp/refs.xml.ftl b/android/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/values-sw600dp/refs.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/values-sw600dp/refs.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/values-sw600dp/refs.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/values/strings.xml.ftl b/android/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/values/strings.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/values/strings.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/res/values/strings.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/src/app_package/ContentDetailActivity.java.ftl b/android/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/src/app_package/ContentDetailActivity.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/src/app_package/ContentDetailActivity.java.ftl
rename to android/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/src/app_package/ContentDetailActivity.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/src/app_package/ContentDetailFragment.java.ftl b/android/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/src/app_package/ContentDetailFragment.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/src/app_package/ContentDetailFragment.java.ftl
rename to android/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/src/app_package/ContentDetailFragment.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/src/app_package/ContentListActivity.java.ftl b/android/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/src/app_package/ContentListActivity.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/src/app_package/ContentListActivity.java.ftl
rename to android/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/src/app_package/ContentListActivity.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/src/app_package/ContentListFragment.java.ftl b/android/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/src/app_package/ContentListFragment.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/src/app_package/ContentListFragment.java.ftl
rename to android/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/src/app_package/ContentListFragment.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/src/app_package/dummy/DummyContent.java.ftl b/android/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/src/app_package/dummy/DummyContent.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/src/app_package/dummy/DummyContent.java.ftl
rename to android/tools/android-osx/tools/templates/activities/MasterDetailFlow/root/src/app_package/dummy/DummyContent.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/template.xml b/android/tools/android-osx/tools/templates/activities/MasterDetailFlow/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/template.xml
rename to android/tools/android-osx/tools/templates/activities/MasterDetailFlow/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/template_master_detail.png b/android/tools/android-osx/tools/templates/activities/MasterDetailFlow/template_master_detail.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/MasterDetailFlow/template_master_detail.png
rename to android/tools/android-osx/tools/templates/activities/MasterDetailFlow/template_master_detail.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/globals.xml.ftl b/android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/globals.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/globals.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/globals.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/recipe.xml.ftl b/android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/AndroidManifest.xml.ftl b/android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/AndroidManifest.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/AndroidManifest.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/AndroidManifest.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/build.gradle.ftl b/android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/build.gradle.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/build.gradle.ftl
rename to android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/build.gradle.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-hdpi/drawer_shadow.9.png b/android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-hdpi/drawer_shadow.9.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-hdpi/drawer_shadow.9.png
rename to android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-hdpi/drawer_shadow.9.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-hdpi/ic_drawer.png b/android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-hdpi/ic_drawer.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-hdpi/ic_drawer.png
rename to android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-hdpi/ic_drawer.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-mdpi/drawer_shadow.9.png b/android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-mdpi/drawer_shadow.9.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-mdpi/drawer_shadow.9.png
rename to android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-mdpi/drawer_shadow.9.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-mdpi/ic_drawer.png b/android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-mdpi/ic_drawer.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-mdpi/ic_drawer.png
rename to android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-mdpi/ic_drawer.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-xhdpi/drawer_shadow.9.png b/android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-xhdpi/drawer_shadow.9.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-xhdpi/drawer_shadow.9.png
rename to android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-xhdpi/drawer_shadow.9.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-xhdpi/ic_drawer.png b/android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-xhdpi/ic_drawer.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-xhdpi/ic_drawer.png
rename to android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-xhdpi/ic_drawer.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-xxhdpi/drawer_shadow.9.png b/android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-xxhdpi/drawer_shadow.9.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-xxhdpi/drawer_shadow.9.png
rename to android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-xxhdpi/drawer_shadow.9.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-xxhdpi/ic_drawer.png b/android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-xxhdpi/ic_drawer.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-xxhdpi/ic_drawer.png
rename to android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/drawable-xxhdpi/ic_drawer.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/layout/activity_drawer.xml.ftl b/android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/layout/activity_drawer.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/layout/activity_drawer.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/layout/activity_drawer.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/layout/fragment_navigation_drawer.xml.ftl b/android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/layout/fragment_navigation_drawer.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/layout/fragment_navigation_drawer.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/layout/fragment_navigation_drawer.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/layout/fragment_simple.xml.ftl b/android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/layout/fragment_simple.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/layout/fragment_simple.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/layout/fragment_simple.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/menu/global.xml.ftl b/android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/menu/global.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/menu/global.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/menu/global.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/menu/main.xml.ftl b/android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/menu/main.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/menu/main.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/menu/main.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/values-w820dp/dimens.xml b/android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/values-w820dp/dimens.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/values-w820dp/dimens.xml
rename to android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/values-w820dp/dimens.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/values/dimens.xml.ftl b/android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/values/dimens.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/values/dimens.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/values/dimens.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/values/strings.xml.ftl b/android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/values/strings.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/values/strings.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/res/values/strings.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/src/app_package/DrawerActivity.java.ftl b/android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/src/app_package/DrawerActivity.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/src/app_package/DrawerActivity.java.ftl
rename to android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/src/app_package/DrawerActivity.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/src/app_package/NavigationDrawerFragment.java.ftl b/android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/src/app_package/NavigationDrawerFragment.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/src/app_package/NavigationDrawerFragment.java.ftl
rename to android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/src/app_package/NavigationDrawerFragment.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/src/app_package/include_fragment.java.ftl b/android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/src/app_package/include_fragment.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/src/app_package/include_fragment.java.ftl
rename to android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/src/app_package/include_fragment.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/src/app_package/include_options_menu.java.ftl b/android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/src/app_package/include_options_menu.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/src/app_package/include_options_menu.java.ftl
rename to android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/root/src/app_package/include_options_menu.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/template.xml b/android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/template.xml
rename to android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/template_blank_activity_drawer.png b/android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/template_blank_activity_drawer.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/template_blank_activity_drawer.png
rename to android/tools/android-osx/tools/templates/activities/NavigationDrawerActivity/template_blank_activity_drawer.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/SettingsActivity/globals.xml.ftl b/android/tools/android-osx/tools/templates/activities/SettingsActivity/globals.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/SettingsActivity/globals.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/SettingsActivity/globals.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/SettingsActivity/recipe.xml.ftl b/android/tools/android-osx/tools/templates/activities/SettingsActivity/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/SettingsActivity/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/SettingsActivity/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/SettingsActivity/root/AndroidManifest.xml.ftl b/android/tools/android-osx/tools/templates/activities/SettingsActivity/root/AndroidManifest.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/SettingsActivity/root/AndroidManifest.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/SettingsActivity/root/AndroidManifest.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/SettingsActivity/root/res/values/strings.xml.ftl b/android/tools/android-osx/tools/templates/activities/SettingsActivity/root/res/values/strings.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/SettingsActivity/root/res/values/strings.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/SettingsActivity/root/res/values/strings.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/SettingsActivity/root/res/xml/pref_data_sync.xml b/android/tools/android-osx/tools/templates/activities/SettingsActivity/root/res/xml/pref_data_sync.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/SettingsActivity/root/res/xml/pref_data_sync.xml
rename to android/tools/android-osx/tools/templates/activities/SettingsActivity/root/res/xml/pref_data_sync.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/SettingsActivity/root/res/xml/pref_general.xml b/android/tools/android-osx/tools/templates/activities/SettingsActivity/root/res/xml/pref_general.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/SettingsActivity/root/res/xml/pref_general.xml
rename to android/tools/android-osx/tools/templates/activities/SettingsActivity/root/res/xml/pref_general.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/SettingsActivity/root/res/xml/pref_headers.xml.ftl b/android/tools/android-osx/tools/templates/activities/SettingsActivity/root/res/xml/pref_headers.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/SettingsActivity/root/res/xml/pref_headers.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/SettingsActivity/root/res/xml/pref_headers.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/SettingsActivity/root/res/xml/pref_notification.xml b/android/tools/android-osx/tools/templates/activities/SettingsActivity/root/res/xml/pref_notification.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/SettingsActivity/root/res/xml/pref_notification.xml
rename to android/tools/android-osx/tools/templates/activities/SettingsActivity/root/res/xml/pref_notification.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/SettingsActivity/root/src/app_package/SettingsActivity.java.ftl b/android/tools/android-osx/tools/templates/activities/SettingsActivity/root/src/app_package/SettingsActivity.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/SettingsActivity/root/src/app_package/SettingsActivity.java.ftl
rename to android/tools/android-osx/tools/templates/activities/SettingsActivity/root/src/app_package/SettingsActivity.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/SettingsActivity/template.xml b/android/tools/android-osx/tools/templates/activities/SettingsActivity/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/SettingsActivity/template.xml
rename to android/tools/android-osx/tools/templates/activities/SettingsActivity/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/SettingsActivity/template_settings_activity.png b/android/tools/android-osx/tools/templates/activities/SettingsActivity/template_settings_activity.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/SettingsActivity/template_settings_activity.png
rename to android/tools/android-osx/tools/templates/activities/SettingsActivity/template_settings_activity.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/globals.xml.ftl b/android/tools/android-osx/tools/templates/activities/TabbedActivity/globals.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/globals.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/TabbedActivity/globals.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/recipe.xml.ftl b/android/tools/android-osx/tools/templates/activities/TabbedActivity/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/TabbedActivity/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/root/AndroidManifest.xml.ftl b/android/tools/android-osx/tools/templates/activities/TabbedActivity/root/AndroidManifest.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/root/AndroidManifest.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/TabbedActivity/root/AndroidManifest.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/layout/activity_fragment_container.xml.ftl b/android/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/layout/activity_fragment_container.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/layout/activity_fragment_container.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/layout/activity_fragment_container.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/layout/activity_pager.xml.ftl b/android/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/layout/activity_pager.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/layout/activity_pager.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/layout/activity_pager.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/layout/fragment_simple.xml.ftl b/android/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/layout/fragment_simple.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/layout/fragment_simple.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/layout/fragment_simple.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/menu/main.xml.ftl b/android/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/menu/main.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/menu/main.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/menu/main.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/values-w820dp/dimens.xml b/android/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/values-w820dp/dimens.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/values-w820dp/dimens.xml
rename to android/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/values-w820dp/dimens.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/values/dimens.xml.ftl b/android/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/values/dimens.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/values/dimens.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/values/dimens.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/values/strings.xml.ftl b/android/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/values/strings.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/values/strings.xml.ftl
rename to android/tools/android-osx/tools/templates/activities/TabbedActivity/root/res/values/strings.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/root/src/app_package/DropdownActivity.java.ftl b/android/tools/android-osx/tools/templates/activities/TabbedActivity/root/src/app_package/DropdownActivity.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/root/src/app_package/DropdownActivity.java.ftl
rename to android/tools/android-osx/tools/templates/activities/TabbedActivity/root/src/app_package/DropdownActivity.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/root/src/app_package/TabsAndPagerActivity.java.ftl b/android/tools/android-osx/tools/templates/activities/TabbedActivity/root/src/app_package/TabsAndPagerActivity.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/root/src/app_package/TabsAndPagerActivity.java.ftl
rename to android/tools/android-osx/tools/templates/activities/TabbedActivity/root/src/app_package/TabsAndPagerActivity.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/root/src/app_package/include_fragment.java.ftl b/android/tools/android-osx/tools/templates/activities/TabbedActivity/root/src/app_package/include_fragment.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/root/src/app_package/include_fragment.java.ftl
rename to android/tools/android-osx/tools/templates/activities/TabbedActivity/root/src/app_package/include_fragment.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/root/src/app_package/include_options_menu.java.ftl b/android/tools/android-osx/tools/templates/activities/TabbedActivity/root/src/app_package/include_options_menu.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/root/src/app_package/include_options_menu.java.ftl
rename to android/tools/android-osx/tools/templates/activities/TabbedActivity/root/src/app_package/include_options_menu.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/template.xml b/android/tools/android-osx/tools/templates/activities/TabbedActivity/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/template.xml
rename to android/tools/android-osx/tools/templates/activities/TabbedActivity/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/template_blank_activity_dropdown.png b/android/tools/android-osx/tools/templates/activities/TabbedActivity/template_blank_activity_dropdown.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/template_blank_activity_dropdown.png
rename to android/tools/android-osx/tools/templates/activities/TabbedActivity/template_blank_activity_dropdown.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/template_blank_activity_pager.png b/android/tools/android-osx/tools/templates/activities/TabbedActivity/template_blank_activity_pager.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/template_blank_activity_pager.png
rename to android/tools/android-osx/tools/templates/activities/TabbedActivity/template_blank_activity_pager.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/template_blank_activity_tabs.png b/android/tools/android-osx/tools/templates/activities/TabbedActivity/template_blank_activity_tabs.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/activities/TabbedActivity/template_blank_activity_tabs.png
rename to android/tools/android-osx/tools/templates/activities/TabbedActivity/template_blank_activity_tabs.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/gradle/utils/dependencies.gradle.ftl b/android/tools/android-osx/tools/templates/gradle/utils/dependencies.gradle.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/gradle/utils/dependencies.gradle.ftl
rename to android/tools/android-osx/tools/templates/gradle/utils/dependencies.gradle.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/gradle/wrapper/gradle/wrapper/gradle-wrapper.jar b/android/tools/android-osx/tools/templates/gradle/wrapper/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/gradle/wrapper/gradle/wrapper/gradle-wrapper.jar
rename to android/tools/android-osx/tools/templates/gradle/wrapper/gradle/wrapper/gradle-wrapper.jar
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/gradle/wrapper/gradle/wrapper/gradle-wrapper.properties b/android/tools/android-osx/tools/templates/gradle/wrapper/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/gradle/wrapper/gradle/wrapper/gradle-wrapper.properties
rename to android/tools/android-osx/tools/templates/gradle/wrapper/gradle/wrapper/gradle-wrapper.properties
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/gradle/wrapper/gradlew b/android/tools/android-osx/tools/templates/gradle/wrapper/gradlew
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/gradle/wrapper/gradlew
rename to android/tools/android-osx/tools/templates/gradle/wrapper/gradlew
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/gradle/wrapper/gradlew.bat b/android/tools/android-osx/tools/templates/gradle/wrapper/gradlew.bat
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/gradle/wrapper/gradlew.bat
rename to android/tools/android-osx/tools/templates/gradle/wrapper/gradlew.bat
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AidlFile/recipe.xml.ftl b/android/tools/android-osx/tools/templates/other/AidlFile/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AidlFile/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/other/AidlFile/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AidlFile/root/src/app_package/interface.aidl.ftl b/android/tools/android-osx/tools/templates/other/AidlFile/root/src/app_package/interface.aidl.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AidlFile/root/src/app_package/interface.aidl.ftl
rename to android/tools/android-osx/tools/templates/other/AidlFile/root/src/app_package/interface.aidl.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AidlFile/template.xml b/android/tools/android-osx/tools/templates/other/AidlFile/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AidlFile/template.xml
rename to android/tools/android-osx/tools/templates/other/AidlFile/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AidlFolder/recipe.xml.ftl b/android/tools/android-osx/tools/templates/other/AidlFolder/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AidlFolder/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/other/AidlFolder/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AidlFolder/root/build.gradle.ftl b/android/tools/android-osx/tools/templates/other/AidlFolder/root/build.gradle.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AidlFolder/root/build.gradle.ftl
rename to android/tools/android-osx/tools/templates/other/AidlFolder/root/build.gradle.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AidlFolder/template.xml b/android/tools/android-osx/tools/templates/other/AidlFolder/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AidlFolder/template.xml
rename to android/tools/android-osx/tools/templates/other/AidlFolder/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AndroidManifest/recipe.xml.ftl b/android/tools/android-osx/tools/templates/other/AndroidManifest/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AndroidManifest/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/other/AndroidManifest/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AndroidManifest/root/AndroidManifest.xml.ftl b/android/tools/android-osx/tools/templates/other/AndroidManifest/root/AndroidManifest.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AndroidManifest/root/AndroidManifest.xml.ftl
rename to android/tools/android-osx/tools/templates/other/AndroidManifest/root/AndroidManifest.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AndroidManifest/root/build.gradle.ftl b/android/tools/android-osx/tools/templates/other/AndroidManifest/root/build.gradle.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AndroidManifest/root/build.gradle.ftl
rename to android/tools/android-osx/tools/templates/other/AndroidManifest/root/build.gradle.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AndroidManifest/template.xml b/android/tools/android-osx/tools/templates/other/AndroidManifest/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AndroidManifest/template.xml
rename to android/tools/android-osx/tools/templates/other/AndroidManifest/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/globals.xml.ftl b/android/tools/android-osx/tools/templates/other/AppWidget/globals.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/globals.xml.ftl
rename to android/tools/android-osx/tools/templates/other/AppWidget/globals.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/recipe.xml.ftl b/android/tools/android-osx/tools/templates/other/AppWidget/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/other/AppWidget/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/root/AndroidManifest.xml.ftl b/android/tools/android-osx/tools/templates/other/AppWidget/root/AndroidManifest.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/root/AndroidManifest.xml.ftl
rename to android/tools/android-osx/tools/templates/other/AppWidget/root/AndroidManifest.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/root/res/drawable-nodpi/example_appwidget_preview.png b/android/tools/android-osx/tools/templates/other/AppWidget/root/res/drawable-nodpi/example_appwidget_preview.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/root/res/drawable-nodpi/example_appwidget_preview.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/root/res/drawable-nodpi/example_appwidget_preview.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/root/res/layout/appwidget.xml b/android/tools/android-osx/tools/templates/other/AppWidget/root/res/layout/appwidget.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/root/res/layout/appwidget.xml
rename to android/tools/android-osx/tools/templates/other/AppWidget/root/res/layout/appwidget.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/root/res/layout/appwidget_configure.xml b/android/tools/android-osx/tools/templates/other/AppWidget/root/res/layout/appwidget_configure.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/root/res/layout/appwidget_configure.xml
rename to android/tools/android-osx/tools/templates/other/AppWidget/root/res/layout/appwidget_configure.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/root/res/values-v14/dimens.xml b/android/tools/android-osx/tools/templates/other/AppWidget/root/res/values-v14/dimens.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/root/res/values-v14/dimens.xml
rename to android/tools/android-osx/tools/templates/other/AppWidget/root/res/values-v14/dimens.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/root/res/values/dimens.xml b/android/tools/android-osx/tools/templates/other/AppWidget/root/res/values/dimens.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/root/res/values/dimens.xml
rename to android/tools/android-osx/tools/templates/other/AppWidget/root/res/values/dimens.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/root/res/values/strings.xml.ftl b/android/tools/android-osx/tools/templates/other/AppWidget/root/res/values/strings.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/root/res/values/strings.xml.ftl
rename to android/tools/android-osx/tools/templates/other/AppWidget/root/res/values/strings.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/root/res/xml/appwidget_info.xml.ftl b/android/tools/android-osx/tools/templates/other/AppWidget/root/res/xml/appwidget_info.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/root/res/xml/appwidget_info.xml.ftl
rename to android/tools/android-osx/tools/templates/other/AppWidget/root/res/xml/appwidget_info.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/root/src/app_package/AppWidget.java.ftl b/android/tools/android-osx/tools/templates/other/AppWidget/root/src/app_package/AppWidget.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/root/src/app_package/AppWidget.java.ftl
rename to android/tools/android-osx/tools/templates/other/AppWidget/root/src/app_package/AppWidget.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/root/src/app_package/AppWidgetConfigureActivity.java.ftl b/android/tools/android-osx/tools/templates/other/AppWidget/root/src/app_package/AppWidgetConfigureActivity.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/root/src/app_package/AppWidgetConfigureActivity.java.ftl
rename to android/tools/android-osx/tools/templates/other/AppWidget/root/src/app_package/AppWidgetConfigureActivity.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/template.xml b/android/tools/android-osx/tools/templates/other/AppWidget/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/template.xml
rename to android/tools/android-osx/tools/templates/other/AppWidget/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x1.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x1.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x1.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x1.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x1_h.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x1_h.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x1_h.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x1_h.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x1_v.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x1_v.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x1_v.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x1_v.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x1_vh.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x1_vh.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x1_vh.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x1_vh.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x2.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x2.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x2.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x2.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x2_h.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x2_h.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x2_h.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x2_h.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x2_v.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x2_v.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x2_v.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x2_v.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x2_vh.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x2_vh.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x2_vh.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x2_vh.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x3.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x3.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x3.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x3.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x3_h.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x3_h.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x3_h.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x3_h.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x3_v.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x3_v.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x3_v.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x3_v.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x3_vh.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x3_vh.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x3_vh.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x3_vh.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x4.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x4.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x4.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x4.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x4_h.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x4_h.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x4_h.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x4_h.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x4_v.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x4_v.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x4_v.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x4_v.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x4_vh.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x4_vh.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x4_vh.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_1x4_vh.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x1.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x1.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x1.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x1.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x1_h.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x1_h.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x1_h.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x1_h.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x1_v.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x1_v.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x1_v.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x1_v.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x1_vh.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x1_vh.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x1_vh.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x1_vh.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x2.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x2.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x2.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x2.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x2_h.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x2_h.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x2_h.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x2_h.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x2_v.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x2_v.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x2_v.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x2_v.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x2_vh.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x2_vh.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x2_vh.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x2_vh.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x3.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x3.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x3.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x3.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x3_h.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x3_h.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x3_h.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x3_h.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x3_v.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x3_v.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x3_v.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x3_v.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x3_vh.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x3_vh.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x3_vh.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x3_vh.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x4.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x4.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x4.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x4.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x4_h.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x4_h.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x4_h.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x4_h.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x4_v.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x4_v.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x4_v.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x4_v.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x4_vh.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x4_vh.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x4_vh.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_2x4_vh.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x1.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x1.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x1.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x1.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x1_h.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x1_h.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x1_h.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x1_h.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x1_v.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x1_v.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x1_v.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x1_v.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x1_vh.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x1_vh.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x1_vh.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x1_vh.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x2.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x2.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x2.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x2.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x2_h.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x2_h.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x2_h.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x2_h.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x2_v.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x2_v.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x2_v.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x2_v.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x2_vh.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x2_vh.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x2_vh.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x2_vh.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x3.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x3.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x3.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x3.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x3_h.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x3_h.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x3_h.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x3_h.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x3_v.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x3_v.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x3_v.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x3_v.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x3_vh.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x3_vh.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x3_vh.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x3_vh.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x4.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x4.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x4.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x4.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x4_h.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x4_h.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x4_h.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x4_h.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x4_v.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x4_v.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x4_v.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x4_v.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x4_vh.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x4_vh.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x4_vh.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_3x4_vh.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x1.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x1.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x1.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x1.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x1_h.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x1_h.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x1_h.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x1_h.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x1_v.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x1_v.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x1_v.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x1_v.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x1_vh.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x1_vh.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x1_vh.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x1_vh.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x2.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x2.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x2.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x2.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x2_h.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x2_h.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x2_h.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x2_h.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x2_v.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x2_v.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x2_v.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x2_v.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x2_vh.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x2_vh.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x2_vh.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x2_vh.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x3.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x3.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x3.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x3.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x3_h.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x3_h.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x3_h.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x3_h.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x3_v.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x3_v.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x3_v.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x3_v.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x3_vh.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x3_vh.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x3_vh.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x3_vh.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x4.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x4.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x4.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x4.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x4_h.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x4_h.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x4_h.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x4_h.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x4_v.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x4_v.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x4_v.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x4_v.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x4_vh.png b/android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x4_vh.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x4_vh.png
rename to android/tools/android-osx/tools/templates/other/AppWidget/thumbs/template_widget_4x4_vh.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AssetsFolder/recipe.xml.ftl b/android/tools/android-osx/tools/templates/other/AssetsFolder/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AssetsFolder/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/other/AssetsFolder/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AssetsFolder/root/build.gradle.ftl b/android/tools/android-osx/tools/templates/other/AssetsFolder/root/build.gradle.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AssetsFolder/root/build.gradle.ftl
rename to android/tools/android-osx/tools/templates/other/AssetsFolder/root/build.gradle.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AssetsFolder/template.xml b/android/tools/android-osx/tools/templates/other/AssetsFolder/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/AssetsFolder/template.xml
rename to android/tools/android-osx/tools/templates/other/AssetsFolder/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/BlankFragment/globals.xml.ftl b/android/tools/android-osx/tools/templates/other/BlankFragment/globals.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/BlankFragment/globals.xml.ftl
rename to android/tools/android-osx/tools/templates/other/BlankFragment/globals.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/BlankFragment/recipe.xml.ftl b/android/tools/android-osx/tools/templates/other/BlankFragment/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/BlankFragment/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/other/BlankFragment/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/BlankFragment/root/res/layout/fragment_blank.xml.ftl b/android/tools/android-osx/tools/templates/other/BlankFragment/root/res/layout/fragment_blank.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/BlankFragment/root/res/layout/fragment_blank.xml.ftl
rename to android/tools/android-osx/tools/templates/other/BlankFragment/root/res/layout/fragment_blank.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/BlankFragment/root/res/values/strings.xml b/android/tools/android-osx/tools/templates/other/BlankFragment/root/res/values/strings.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/BlankFragment/root/res/values/strings.xml
rename to android/tools/android-osx/tools/templates/other/BlankFragment/root/res/values/strings.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/BlankFragment/root/src/app_package/BlankFragment.java.ftl b/android/tools/android-osx/tools/templates/other/BlankFragment/root/src/app_package/BlankFragment.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/BlankFragment/root/src/app_package/BlankFragment.java.ftl
rename to android/tools/android-osx/tools/templates/other/BlankFragment/root/src/app_package/BlankFragment.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/BlankFragment/template.xml b/android/tools/android-osx/tools/templates/other/BlankFragment/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/BlankFragment/template.xml
rename to android/tools/android-osx/tools/templates/other/BlankFragment/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/BlankFragment/template_blank_fragment.png b/android/tools/android-osx/tools/templates/other/BlankFragment/template_blank_fragment.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/BlankFragment/template_blank_fragment.png
rename to android/tools/android-osx/tools/templates/other/BlankFragment/template_blank_fragment.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/BroadcastReceiver/globals.xml.ftl b/android/tools/android-osx/tools/templates/other/BroadcastReceiver/globals.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/BroadcastReceiver/globals.xml.ftl
rename to android/tools/android-osx/tools/templates/other/BroadcastReceiver/globals.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/BroadcastReceiver/recipe.xml.ftl b/android/tools/android-osx/tools/templates/other/BroadcastReceiver/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/BroadcastReceiver/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/other/BroadcastReceiver/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/BroadcastReceiver/root/AndroidManifest.xml.ftl b/android/tools/android-osx/tools/templates/other/BroadcastReceiver/root/AndroidManifest.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/BroadcastReceiver/root/AndroidManifest.xml.ftl
rename to android/tools/android-osx/tools/templates/other/BroadcastReceiver/root/AndroidManifest.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/BroadcastReceiver/root/src/app_package/BroadcastReceiver.java.ftl b/android/tools/android-osx/tools/templates/other/BroadcastReceiver/root/src/app_package/BroadcastReceiver.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/BroadcastReceiver/root/src/app_package/BroadcastReceiver.java.ftl
rename to android/tools/android-osx/tools/templates/other/BroadcastReceiver/root/src/app_package/BroadcastReceiver.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/BroadcastReceiver/template.xml b/android/tools/android-osx/tools/templates/other/BroadcastReceiver/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/BroadcastReceiver/template.xml
rename to android/tools/android-osx/tools/templates/other/BroadcastReceiver/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ContentProvider/globals.xml.ftl b/android/tools/android-osx/tools/templates/other/ContentProvider/globals.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ContentProvider/globals.xml.ftl
rename to android/tools/android-osx/tools/templates/other/ContentProvider/globals.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ContentProvider/recipe.xml.ftl b/android/tools/android-osx/tools/templates/other/ContentProvider/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ContentProvider/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/other/ContentProvider/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ContentProvider/root/AndroidManifest.xml.ftl b/android/tools/android-osx/tools/templates/other/ContentProvider/root/AndroidManifest.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ContentProvider/root/AndroidManifest.xml.ftl
rename to android/tools/android-osx/tools/templates/other/ContentProvider/root/AndroidManifest.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ContentProvider/root/src/app_package/ContentProvider.java.ftl b/android/tools/android-osx/tools/templates/other/ContentProvider/root/src/app_package/ContentProvider.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ContentProvider/root/src/app_package/ContentProvider.java.ftl
rename to android/tools/android-osx/tools/templates/other/ContentProvider/root/src/app_package/ContentProvider.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ContentProvider/template.xml b/android/tools/android-osx/tools/templates/other/ContentProvider/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ContentProvider/template.xml
rename to android/tools/android-osx/tools/templates/other/ContentProvider/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/CustomView/globals.xml.ftl b/android/tools/android-osx/tools/templates/other/CustomView/globals.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/CustomView/globals.xml.ftl
rename to android/tools/android-osx/tools/templates/other/CustomView/globals.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/CustomView/recipe.xml.ftl b/android/tools/android-osx/tools/templates/other/CustomView/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/CustomView/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/other/CustomView/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/CustomView/root/res/layout/sample.xml.ftl b/android/tools/android-osx/tools/templates/other/CustomView/root/res/layout/sample.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/CustomView/root/res/layout/sample.xml.ftl
rename to android/tools/android-osx/tools/templates/other/CustomView/root/res/layout/sample.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/CustomView/root/res/values/attrs.xml.ftl b/android/tools/android-osx/tools/templates/other/CustomView/root/res/values/attrs.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/CustomView/root/res/values/attrs.xml.ftl
rename to android/tools/android-osx/tools/templates/other/CustomView/root/res/values/attrs.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/CustomView/root/src/app_package/CustomView.java.ftl b/android/tools/android-osx/tools/templates/other/CustomView/root/src/app_package/CustomView.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/CustomView/root/src/app_package/CustomView.java.ftl
rename to android/tools/android-osx/tools/templates/other/CustomView/root/src/app_package/CustomView.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/CustomView/template.xml b/android/tools/android-osx/tools/templates/other/CustomView/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/CustomView/template.xml
rename to android/tools/android-osx/tools/templates/other/CustomView/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Daydream/globals.xml.ftl b/android/tools/android-osx/tools/templates/other/Daydream/globals.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Daydream/globals.xml.ftl
rename to android/tools/android-osx/tools/templates/other/Daydream/globals.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Daydream/recipe.xml.ftl b/android/tools/android-osx/tools/templates/other/Daydream/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Daydream/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/other/Daydream/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Daydream/root/AndroidManifest.xml.ftl b/android/tools/android-osx/tools/templates/other/Daydream/root/AndroidManifest.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Daydream/root/AndroidManifest.xml.ftl
rename to android/tools/android-osx/tools/templates/other/Daydream/root/AndroidManifest.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Daydream/root/res/layout-v17/dream.xml b/android/tools/android-osx/tools/templates/other/Daydream/root/res/layout-v17/dream.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Daydream/root/res/layout-v17/dream.xml
rename to android/tools/android-osx/tools/templates/other/Daydream/root/res/layout-v17/dream.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Daydream/root/res/values/strings.xml.ftl b/android/tools/android-osx/tools/templates/other/Daydream/root/res/values/strings.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Daydream/root/res/values/strings.xml.ftl
rename to android/tools/android-osx/tools/templates/other/Daydream/root/res/values/strings.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Daydream/root/res/xml/dream_prefs.xml b/android/tools/android-osx/tools/templates/other/Daydream/root/res/xml/dream_prefs.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Daydream/root/res/xml/dream_prefs.xml
rename to android/tools/android-osx/tools/templates/other/Daydream/root/res/xml/dream_prefs.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Daydream/root/res/xml/xml_dream.xml.ftl b/android/tools/android-osx/tools/templates/other/Daydream/root/res/xml/xml_dream.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Daydream/root/res/xml/xml_dream.xml.ftl
rename to android/tools/android-osx/tools/templates/other/Daydream/root/res/xml/xml_dream.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Daydream/root/src/app_package/DreamService.java.ftl b/android/tools/android-osx/tools/templates/other/Daydream/root/src/app_package/DreamService.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Daydream/root/src/app_package/DreamService.java.ftl
rename to android/tools/android-osx/tools/templates/other/Daydream/root/src/app_package/DreamService.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Daydream/root/src/app_package/SettingsActivity.java.ftl b/android/tools/android-osx/tools/templates/other/Daydream/root/src/app_package/SettingsActivity.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Daydream/root/src/app_package/SettingsActivity.java.ftl
rename to android/tools/android-osx/tools/templates/other/Daydream/root/src/app_package/SettingsActivity.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Daydream/template.xml b/android/tools/android-osx/tools/templates/other/Daydream/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Daydream/template.xml
rename to android/tools/android-osx/tools/templates/other/Daydream/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/IntentService/globals.xml.ftl b/android/tools/android-osx/tools/templates/other/IntentService/globals.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/IntentService/globals.xml.ftl
rename to android/tools/android-osx/tools/templates/other/IntentService/globals.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/IntentService/recipe.xml.ftl b/android/tools/android-osx/tools/templates/other/IntentService/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/IntentService/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/other/IntentService/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/IntentService/root/AndroidManifest.xml.ftl b/android/tools/android-osx/tools/templates/other/IntentService/root/AndroidManifest.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/IntentService/root/AndroidManifest.xml.ftl
rename to android/tools/android-osx/tools/templates/other/IntentService/root/AndroidManifest.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/IntentService/root/src/app_package/IntentService.java.ftl b/android/tools/android-osx/tools/templates/other/IntentService/root/src/app_package/IntentService.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/IntentService/root/src/app_package/IntentService.java.ftl
rename to android/tools/android-osx/tools/templates/other/IntentService/root/src/app_package/IntentService.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/IntentService/template.xml b/android/tools/android-osx/tools/templates/other/IntentService/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/IntentService/template.xml
rename to android/tools/android-osx/tools/templates/other/IntentService/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/JavaFolder/recipe.xml.ftl b/android/tools/android-osx/tools/templates/other/JavaFolder/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/JavaFolder/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/other/JavaFolder/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/JavaFolder/root/build.gradle.ftl b/android/tools/android-osx/tools/templates/other/JavaFolder/root/build.gradle.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/JavaFolder/root/build.gradle.ftl
rename to android/tools/android-osx/tools/templates/other/JavaFolder/root/build.gradle.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/JavaFolder/template.xml b/android/tools/android-osx/tools/templates/other/JavaFolder/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/JavaFolder/template.xml
rename to android/tools/android-osx/tools/templates/other/JavaFolder/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/JniFolder/recipe.xml.ftl b/android/tools/android-osx/tools/templates/other/JniFolder/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/JniFolder/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/other/JniFolder/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/JniFolder/root/build.gradle.ftl b/android/tools/android-osx/tools/templates/other/JniFolder/root/build.gradle.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/JniFolder/root/build.gradle.ftl
rename to android/tools/android-osx/tools/templates/other/JniFolder/root/build.gradle.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/JniFolder/template.xml b/android/tools/android-osx/tools/templates/other/JniFolder/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/JniFolder/template.xml
rename to android/tools/android-osx/tools/templates/other/JniFolder/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/LayoutResourceFile/recipe.xml.ftl b/android/tools/android-osx/tools/templates/other/LayoutResourceFile/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/LayoutResourceFile/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/other/LayoutResourceFile/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/LayoutResourceFile/root/res/layout.xml.ftl b/android/tools/android-osx/tools/templates/other/LayoutResourceFile/root/res/layout.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/LayoutResourceFile/root/res/layout.xml.ftl
rename to android/tools/android-osx/tools/templates/other/LayoutResourceFile/root/res/layout.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/LayoutResourceFile/template.xml b/android/tools/android-osx/tools/templates/other/LayoutResourceFile/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/LayoutResourceFile/template.xml
rename to android/tools/android-osx/tools/templates/other/LayoutResourceFile/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ListFragment/globals.xml.ftl b/android/tools/android-osx/tools/templates/other/ListFragment/globals.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ListFragment/globals.xml.ftl
rename to android/tools/android-osx/tools/templates/other/ListFragment/globals.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ListFragment/recipe.xml.ftl b/android/tools/android-osx/tools/templates/other/ListFragment/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ListFragment/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/other/ListFragment/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ListFragment/root/res/layout/fragment_grid.xml b/android/tools/android-osx/tools/templates/other/ListFragment/root/res/layout/fragment_grid.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ListFragment/root/res/layout/fragment_grid.xml
rename to android/tools/android-osx/tools/templates/other/ListFragment/root/res/layout/fragment_grid.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ListFragment/root/res/layout/fragment_list.xml b/android/tools/android-osx/tools/templates/other/ListFragment/root/res/layout/fragment_list.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ListFragment/root/res/layout/fragment_list.xml
rename to android/tools/android-osx/tools/templates/other/ListFragment/root/res/layout/fragment_list.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ListFragment/root/res/values-large/refs_lrg.xml.ftl b/android/tools/android-osx/tools/templates/other/ListFragment/root/res/values-large/refs_lrg.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ListFragment/root/res/values-large/refs_lrg.xml.ftl
rename to android/tools/android-osx/tools/templates/other/ListFragment/root/res/values-large/refs_lrg.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ListFragment/root/res/values-sw600dp/refs_lrg.xml.ftl b/android/tools/android-osx/tools/templates/other/ListFragment/root/res/values-sw600dp/refs_lrg.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ListFragment/root/res/values-sw600dp/refs_lrg.xml.ftl
rename to android/tools/android-osx/tools/templates/other/ListFragment/root/res/values-sw600dp/refs_lrg.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ListFragment/root/res/values/refs.xml.ftl b/android/tools/android-osx/tools/templates/other/ListFragment/root/res/values/refs.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ListFragment/root/res/values/refs.xml.ftl
rename to android/tools/android-osx/tools/templates/other/ListFragment/root/res/values/refs.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ListFragment/root/res/values/refs_lrg.xml.ftl b/android/tools/android-osx/tools/templates/other/ListFragment/root/res/values/refs_lrg.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ListFragment/root/res/values/refs_lrg.xml.ftl
rename to android/tools/android-osx/tools/templates/other/ListFragment/root/res/values/refs_lrg.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ListFragment/root/src/app_package/ListFragment.java.ftl b/android/tools/android-osx/tools/templates/other/ListFragment/root/src/app_package/ListFragment.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ListFragment/root/src/app_package/ListFragment.java.ftl
rename to android/tools/android-osx/tools/templates/other/ListFragment/root/src/app_package/ListFragment.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ListFragment/root/src/app_package/dummy/DummyContent.java.ftl b/android/tools/android-osx/tools/templates/other/ListFragment/root/src/app_package/dummy/DummyContent.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ListFragment/root/src/app_package/dummy/DummyContent.java.ftl
rename to android/tools/android-osx/tools/templates/other/ListFragment/root/src/app_package/dummy/DummyContent.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ListFragment/template.xml b/android/tools/android-osx/tools/templates/other/ListFragment/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ListFragment/template.xml
rename to android/tools/android-osx/tools/templates/other/ListFragment/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ListFragment/templates_list_fragment.png b/android/tools/android-osx/tools/templates/other/ListFragment/templates_list_fragment.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ListFragment/templates_list_fragment.png
rename to android/tools/android-osx/tools/templates/other/ListFragment/templates_list_fragment.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/globals.xml.ftl b/android/tools/android-osx/tools/templates/other/Notification/globals.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/globals.xml.ftl
rename to android/tools/android-osx/tools/templates/other/Notification/globals.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/recipe.xml.ftl b/android/tools/android-osx/tools/templates/other/Notification/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/other/Notification/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/root/AndroidManifest.xml.ftl b/android/tools/android-osx/tools/templates/other/Notification/root/AndroidManifest.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/root/AndroidManifest.xml.ftl
rename to android/tools/android-osx/tools/templates/other/Notification/root/AndroidManifest.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/root/res/drawable-hdpi/ic_action_stat_reply.png b/android/tools/android-osx/tools/templates/other/Notification/root/res/drawable-hdpi/ic_action_stat_reply.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/root/res/drawable-hdpi/ic_action_stat_reply.png
rename to android/tools/android-osx/tools/templates/other/Notification/root/res/drawable-hdpi/ic_action_stat_reply.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/root/res/drawable-hdpi/ic_action_stat_share.png b/android/tools/android-osx/tools/templates/other/Notification/root/res/drawable-hdpi/ic_action_stat_share.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/root/res/drawable-hdpi/ic_action_stat_share.png
rename to android/tools/android-osx/tools/templates/other/Notification/root/res/drawable-hdpi/ic_action_stat_share.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/root/res/drawable-mdpi/ic_action_stat_reply.png b/android/tools/android-osx/tools/templates/other/Notification/root/res/drawable-mdpi/ic_action_stat_reply.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/root/res/drawable-mdpi/ic_action_stat_reply.png
rename to android/tools/android-osx/tools/templates/other/Notification/root/res/drawable-mdpi/ic_action_stat_reply.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/root/res/drawable-mdpi/ic_action_stat_share.png b/android/tools/android-osx/tools/templates/other/Notification/root/res/drawable-mdpi/ic_action_stat_share.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/root/res/drawable-mdpi/ic_action_stat_share.png
rename to android/tools/android-osx/tools/templates/other/Notification/root/res/drawable-mdpi/ic_action_stat_share.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/root/res/drawable-nodpi/example_picture_large.png b/android/tools/android-osx/tools/templates/other/Notification/root/res/drawable-nodpi/example_picture_large.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/root/res/drawable-nodpi/example_picture_large.png
rename to android/tools/android-osx/tools/templates/other/Notification/root/res/drawable-nodpi/example_picture_large.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/root/res/drawable-nodpi/example_picture_small.png b/android/tools/android-osx/tools/templates/other/Notification/root/res/drawable-nodpi/example_picture_small.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/root/res/drawable-nodpi/example_picture_small.png
rename to android/tools/android-osx/tools/templates/other/Notification/root/res/drawable-nodpi/example_picture_small.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/root/res/drawable-xhdpi/ic_action_stat_reply.png b/android/tools/android-osx/tools/templates/other/Notification/root/res/drawable-xhdpi/ic_action_stat_reply.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/root/res/drawable-xhdpi/ic_action_stat_reply.png
rename to android/tools/android-osx/tools/templates/other/Notification/root/res/drawable-xhdpi/ic_action_stat_reply.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/root/res/drawable-xhdpi/ic_action_stat_share.png b/android/tools/android-osx/tools/templates/other/Notification/root/res/drawable-xhdpi/ic_action_stat_share.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/root/res/drawable-xhdpi/ic_action_stat_share.png
rename to android/tools/android-osx/tools/templates/other/Notification/root/res/drawable-xhdpi/ic_action_stat_share.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/root/res/values/strings.xml.ftl b/android/tools/android-osx/tools/templates/other/Notification/root/res/values/strings.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/root/res/values/strings.xml.ftl
rename to android/tools/android-osx/tools/templates/other/Notification/root/res/values/strings.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/root/src/app_package/NotificationHelper.java.ftl b/android/tools/android-osx/tools/templates/other/Notification/root/src/app_package/NotificationHelper.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/root/src/app_package/NotificationHelper.java.ftl
rename to android/tools/android-osx/tools/templates/other/Notification/root/src/app_package/NotificationHelper.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/template.xml b/android/tools/android-osx/tools/templates/other/Notification/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/template.xml
rename to android/tools/android-osx/tools/templates/other/Notification/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/template_notification_list.png b/android/tools/android-osx/tools/templates/other/Notification/template_notification_list.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/template_notification_list.png
rename to android/tools/android-osx/tools/templates/other/Notification/template_notification_list.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/template_notification_list_actions.png b/android/tools/android-osx/tools/templates/other/Notification/template_notification_list_actions.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/template_notification_list_actions.png
rename to android/tools/android-osx/tools/templates/other/Notification/template_notification_list_actions.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/template_notification_none.png b/android/tools/android-osx/tools/templates/other/Notification/template_notification_none.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/template_notification_none.png
rename to android/tools/android-osx/tools/templates/other/Notification/template_notification_none.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/template_notification_none_actions.png b/android/tools/android-osx/tools/templates/other/Notification/template_notification_none_actions.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/template_notification_none_actions.png
rename to android/tools/android-osx/tools/templates/other/Notification/template_notification_none_actions.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/template_notification_picture.png b/android/tools/android-osx/tools/templates/other/Notification/template_notification_picture.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/template_notification_picture.png
rename to android/tools/android-osx/tools/templates/other/Notification/template_notification_picture.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/template_notification_picture_actions.png b/android/tools/android-osx/tools/templates/other/Notification/template_notification_picture_actions.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/template_notification_picture_actions.png
rename to android/tools/android-osx/tools/templates/other/Notification/template_notification_picture_actions.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/template_notification_text.png b/android/tools/android-osx/tools/templates/other/Notification/template_notification_text.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/template_notification_text.png
rename to android/tools/android-osx/tools/templates/other/Notification/template_notification_text.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/template_notification_text_actions.png b/android/tools/android-osx/tools/templates/other/Notification/template_notification_text_actions.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Notification/template_notification_text_actions.png
rename to android/tools/android-osx/tools/templates/other/Notification/template_notification_text_actions.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/PlusOneFragment/globals.xml.ftl b/android/tools/android-osx/tools/templates/other/PlusOneFragment/globals.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/PlusOneFragment/globals.xml.ftl
rename to android/tools/android-osx/tools/templates/other/PlusOneFragment/globals.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/PlusOneFragment/recipe.xml.ftl b/android/tools/android-osx/tools/templates/other/PlusOneFragment/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/PlusOneFragment/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/other/PlusOneFragment/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/PlusOneFragment/root/AndroidManifest.xml.ftl b/android/tools/android-osx/tools/templates/other/PlusOneFragment/root/AndroidManifest.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/PlusOneFragment/root/AndroidManifest.xml.ftl
rename to android/tools/android-osx/tools/templates/other/PlusOneFragment/root/AndroidManifest.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/PlusOneFragment/root/res/layout/fragment_plus_one.xml.ftl b/android/tools/android-osx/tools/templates/other/PlusOneFragment/root/res/layout/fragment_plus_one.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/PlusOneFragment/root/res/layout/fragment_plus_one.xml.ftl
rename to android/tools/android-osx/tools/templates/other/PlusOneFragment/root/res/layout/fragment_plus_one.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/PlusOneFragment/root/src/app_package/PlusOneFragment.java.ftl b/android/tools/android-osx/tools/templates/other/PlusOneFragment/root/src/app_package/PlusOneFragment.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/PlusOneFragment/root/src/app_package/PlusOneFragment.java.ftl
rename to android/tools/android-osx/tools/templates/other/PlusOneFragment/root/src/app_package/PlusOneFragment.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/PlusOneFragment/template.xml b/android/tools/android-osx/tools/templates/other/PlusOneFragment/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/PlusOneFragment/template.xml
rename to android/tools/android-osx/tools/templates/other/PlusOneFragment/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/PlusOneFragment/templates_plusone_fragment.png b/android/tools/android-osx/tools/templates/other/PlusOneFragment/templates_plusone_fragment.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/PlusOneFragment/templates_plusone_fragment.png
rename to android/tools/android-osx/tools/templates/other/PlusOneFragment/templates_plusone_fragment.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ResFolder/recipe.xml.ftl b/android/tools/android-osx/tools/templates/other/ResFolder/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ResFolder/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/other/ResFolder/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ResFolder/root/build.gradle.ftl b/android/tools/android-osx/tools/templates/other/ResFolder/root/build.gradle.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ResFolder/root/build.gradle.ftl
rename to android/tools/android-osx/tools/templates/other/ResFolder/root/build.gradle.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ResFolder/template.xml b/android/tools/android-osx/tools/templates/other/ResFolder/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ResFolder/template.xml
rename to android/tools/android-osx/tools/templates/other/ResFolder/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ResourcesFolder/recipe.xml.ftl b/android/tools/android-osx/tools/templates/other/ResourcesFolder/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ResourcesFolder/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/other/ResourcesFolder/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ResourcesFolder/root/build.gradle.ftl b/android/tools/android-osx/tools/templates/other/ResourcesFolder/root/build.gradle.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ResourcesFolder/root/build.gradle.ftl
rename to android/tools/android-osx/tools/templates/other/ResourcesFolder/root/build.gradle.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ResourcesFolder/template.xml b/android/tools/android-osx/tools/templates/other/ResourcesFolder/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ResourcesFolder/template.xml
rename to android/tools/android-osx/tools/templates/other/ResourcesFolder/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/RsFolder/recipe.xml.ftl b/android/tools/android-osx/tools/templates/other/RsFolder/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/RsFolder/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/other/RsFolder/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/RsFolder/root/build.gradle.ftl b/android/tools/android-osx/tools/templates/other/RsFolder/root/build.gradle.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/RsFolder/root/build.gradle.ftl
rename to android/tools/android-osx/tools/templates/other/RsFolder/root/build.gradle.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/RsFolder/template.xml b/android/tools/android-osx/tools/templates/other/RsFolder/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/RsFolder/template.xml
rename to android/tools/android-osx/tools/templates/other/RsFolder/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Service/globals.xml.ftl b/android/tools/android-osx/tools/templates/other/Service/globals.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Service/globals.xml.ftl
rename to android/tools/android-osx/tools/templates/other/Service/globals.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Service/recipe.xml.ftl b/android/tools/android-osx/tools/templates/other/Service/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Service/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/other/Service/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Service/root/AndroidManifest.xml.ftl b/android/tools/android-osx/tools/templates/other/Service/root/AndroidManifest.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Service/root/AndroidManifest.xml.ftl
rename to android/tools/android-osx/tools/templates/other/Service/root/AndroidManifest.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Service/root/src/app_package/Service.java.ftl b/android/tools/android-osx/tools/templates/other/Service/root/src/app_package/Service.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Service/root/src/app_package/Service.java.ftl
rename to android/tools/android-osx/tools/templates/other/Service/root/src/app_package/Service.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Service/template.xml b/android/tools/android-osx/tools/templates/other/Service/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/Service/template.xml
rename to android/tools/android-osx/tools/templates/other/Service/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ValueResourceFile/recipe.xml.ftl b/android/tools/android-osx/tools/templates/other/ValueResourceFile/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ValueResourceFile/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/other/ValueResourceFile/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ValueResourceFile/root/res/values.xml.ftl b/android/tools/android-osx/tools/templates/other/ValueResourceFile/root/res/values.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ValueResourceFile/root/res/values.xml.ftl
rename to android/tools/android-osx/tools/templates/other/ValueResourceFile/root/res/values.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ValueResourceFile/template.xml b/android/tools/android-osx/tools/templates/other/ValueResourceFile/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/other/ValueResourceFile/template.xml
rename to android/tools/android-osx/tools/templates/other/ValueResourceFile/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/globals.xml.ftl b/android/tools/android-osx/tools/templates/projects/NewAndroidApplication/globals.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/globals.xml.ftl
rename to android/tools/android-osx/tools/templates/projects/NewAndroidApplication/globals.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/recipe.xml.ftl b/android/tools/android-osx/tools/templates/projects/NewAndroidApplication/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/projects/NewAndroidApplication/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/AndroidManifest.xml.ftl b/android/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/AndroidManifest.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/AndroidManifest.xml.ftl
rename to android/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/AndroidManifest.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/build.gradle.ftl b/android/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/build.gradle.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/build.gradle.ftl
rename to android/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/build.gradle.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/drawable-hdpi/ic_launcher.png b/android/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/drawable-hdpi/ic_launcher.png
rename to android/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/drawable-hdpi/ic_launcher.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/drawable-mdpi/ic_launcher.png b/android/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/drawable-mdpi/ic_launcher.png
rename to android/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/drawable-mdpi/ic_launcher.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/drawable-xhdpi/ic_launcher.png b/android/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/drawable-xhdpi/ic_launcher.png
rename to android/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/drawable-xhdpi/ic_launcher.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/values-v11/styles_hc.xml.ftl b/android/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/values-v11/styles_hc.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/values-v11/styles_hc.xml.ftl
rename to android/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/values-v11/styles_hc.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/values-v14/styles_ics.xml.ftl b/android/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/values-v14/styles_ics.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/values-v14/styles_ics.xml.ftl
rename to android/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/values-v14/styles_ics.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/values/strings.xml.ftl b/android/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/values/strings.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/values/strings.xml.ftl
rename to android/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/values/strings.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/values/styles.xml.ftl b/android/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/values/styles.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/values/styles.xml.ftl
rename to android/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/res/values/styles.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/settings.gradle.ftl b/android/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/settings.gradle.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/settings.gradle.ftl
rename to android/tools/android-osx/tools/templates/projects/NewAndroidApplication/root/settings.gradle.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/template.xml b/android/tools/android-osx/tools/templates/projects/NewAndroidApplication/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/template.xml
rename to android/tools/android-osx/tools/templates/projects/NewAndroidApplication/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/template_new_project.png b/android/tools/android-osx/tools/templates/projects/NewAndroidApplication/template_new_project.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidApplication/template_new_project.png
rename to android/tools/android-osx/tools/templates/projects/NewAndroidApplication/template_new_project.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/globals.xml.ftl b/android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/globals.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/globals.xml.ftl
rename to android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/globals.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/recipe.xml.ftl b/android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/AndroidManifest.xml.ftl b/android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/AndroidManifest.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/AndroidManifest.xml.ftl
rename to android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/AndroidManifest.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/build.gradle.ftl b/android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/build.gradle.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/build.gradle.ftl
rename to android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/build.gradle.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/drawable-hdpi/ic_launcher.png b/android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/drawable-hdpi/ic_launcher.png
rename to android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/drawable-hdpi/ic_launcher.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/drawable-mdpi/ic_launcher.png b/android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/drawable-mdpi/ic_launcher.png
rename to android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/drawable-mdpi/ic_launcher.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/drawable-xhdpi/ic_launcher.png b/android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/drawable-xhdpi/ic_launcher.png
rename to android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/drawable-xhdpi/ic_launcher.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/values-v11/styles_hc.xml.ftl b/android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/values-v11/styles_hc.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/values-v11/styles_hc.xml.ftl
rename to android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/values-v11/styles_hc.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/values-v14/styles_ics.xml.ftl b/android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/values-v14/styles_ics.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/values-v14/styles_ics.xml.ftl
rename to android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/values-v14/styles_ics.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/values/strings.xml.ftl b/android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/values/strings.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/values/strings.xml.ftl
rename to android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/values/strings.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/values/styles.xml.ftl b/android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/values/styles.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/values/styles.xml.ftl
rename to android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/res/values/styles.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/settings.gradle.ftl b/android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/settings.gradle.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/settings.gradle.ftl
rename to android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/root/settings.gradle.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/template.xml b/android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/template.xml
rename to android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/template_new_project.png b/android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/template_new_project.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewAndroidLibrary/template_new_project.png
rename to android/tools/android-osx/tools/templates/projects/NewAndroidLibrary/template_new_project.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewJavaLibrary/globals.xml.ftl b/android/tools/android-osx/tools/templates/projects/NewJavaLibrary/globals.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewJavaLibrary/globals.xml.ftl
rename to android/tools/android-osx/tools/templates/projects/NewJavaLibrary/globals.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewJavaLibrary/recipe.xml.ftl b/android/tools/android-osx/tools/templates/projects/NewJavaLibrary/recipe.xml.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewJavaLibrary/recipe.xml.ftl
rename to android/tools/android-osx/tools/templates/projects/NewJavaLibrary/recipe.xml.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewJavaLibrary/root/build.gradle.ftl b/android/tools/android-osx/tools/templates/projects/NewJavaLibrary/root/build.gradle.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewJavaLibrary/root/build.gradle.ftl
rename to android/tools/android-osx/tools/templates/projects/NewJavaLibrary/root/build.gradle.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewJavaLibrary/root/settings.gradle.ftl b/android/tools/android-osx/tools/templates/projects/NewJavaLibrary/root/settings.gradle.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewJavaLibrary/root/settings.gradle.ftl
rename to android/tools/android-osx/tools/templates/projects/NewJavaLibrary/root/settings.gradle.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewJavaLibrary/root/src/library_package/Placeholder.java.ftl b/android/tools/android-osx/tools/templates/projects/NewJavaLibrary/root/src/library_package/Placeholder.java.ftl
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewJavaLibrary/root/src/library_package/Placeholder.java.ftl
rename to android/tools/android-osx/tools/templates/projects/NewJavaLibrary/root/src/library_package/Placeholder.java.ftl
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewJavaLibrary/template.xml b/android/tools/android-osx/tools/templates/projects/NewJavaLibrary/template.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewJavaLibrary/template.xml
rename to android/tools/android-osx/tools/templates/projects/NewJavaLibrary/template.xml
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewJavaLibrary/template_new_project.png b/android/tools/android-osx/tools/templates/projects/NewJavaLibrary/template_new_project.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/templates/projects/NewJavaLibrary/template_new_project.png
rename to android/tools/android-osx/tools/templates/projects/NewJavaLibrary/template_new_project.png
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/traceview b/android/tools/android-osx/tools/traceview
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/traceview
rename to android/tools/android-osx/tools/traceview
diff --git a/StartGamedev-160604-osx/tools/android-osx/tools/uiautomatorviewer b/android/tools/android-osx/tools/uiautomatorviewer
similarity index 100%
rename from StartGamedev-160604-osx/tools/android-osx/tools/uiautomatorviewer
rename to android/tools/android-osx/tools/uiautomatorviewer
diff --git a/StartGamedev-160604-osx/tools/ant/CONTRIBUTORS b/android/tools/ant/CONTRIBUTORS
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/CONTRIBUTORS
rename to android/tools/ant/CONTRIBUTORS
diff --git a/StartGamedev-160604-osx/tools/ant/INSTALL b/android/tools/ant/INSTALL
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/INSTALL
rename to android/tools/ant/INSTALL
diff --git a/StartGamedev-160604-osx/tools/ant/KEYS b/android/tools/ant/KEYS
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/KEYS
rename to android/tools/ant/KEYS
diff --git a/StartGamedev-160604-osx/tools/ant/LICENSE b/android/tools/ant/LICENSE
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/LICENSE
rename to android/tools/ant/LICENSE
diff --git a/StartGamedev-160604-osx/tools/ant/NOTICE b/android/tools/ant/NOTICE
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/NOTICE
rename to android/tools/ant/NOTICE
diff --git a/StartGamedev-160604-osx/tools/ant/README b/android/tools/ant/README
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/README
rename to android/tools/ant/README
diff --git a/StartGamedev-160604-osx/tools/ant/WHATSNEW b/android/tools/ant/WHATSNEW
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/WHATSNEW
rename to android/tools/ant/WHATSNEW
diff --git a/StartGamedev-160604-osx/tools/ant/bin/ant b/android/tools/ant/bin/ant
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/bin/ant
rename to android/tools/ant/bin/ant
diff --git a/StartGamedev-160604-osx/tools/ant/bin/ant.bat b/android/tools/ant/bin/ant.bat
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/bin/ant.bat
rename to android/tools/ant/bin/ant.bat
diff --git a/StartGamedev-160604-osx/tools/ant/bin/ant.cmd b/android/tools/ant/bin/ant.cmd
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/bin/ant.cmd
rename to android/tools/ant/bin/ant.cmd
diff --git a/StartGamedev-160604-osx/tools/ant/bin/antRun b/android/tools/ant/bin/antRun
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/bin/antRun
rename to android/tools/ant/bin/antRun
diff --git a/StartGamedev-160604-osx/tools/ant/bin/antRun.bat b/android/tools/ant/bin/antRun.bat
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/bin/antRun.bat
rename to android/tools/ant/bin/antRun.bat
diff --git a/StartGamedev-160604-osx/tools/ant/bin/antRun.pl b/android/tools/ant/bin/antRun.pl
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/bin/antRun.pl
rename to android/tools/ant/bin/antRun.pl
diff --git a/StartGamedev-160604-osx/tools/ant/bin/antenv.cmd b/android/tools/ant/bin/antenv.cmd
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/bin/antenv.cmd
rename to android/tools/ant/bin/antenv.cmd
diff --git a/StartGamedev-160604-osx/tools/ant/bin/complete-ant-cmd.pl b/android/tools/ant/bin/complete-ant-cmd.pl
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/bin/complete-ant-cmd.pl
rename to android/tools/ant/bin/complete-ant-cmd.pl
diff --git a/StartGamedev-160604-osx/tools/ant/bin/envset.cmd b/android/tools/ant/bin/envset.cmd
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/bin/envset.cmd
rename to android/tools/ant/bin/envset.cmd
diff --git a/StartGamedev-160604-osx/tools/ant/bin/lcp.bat b/android/tools/ant/bin/lcp.bat
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/bin/lcp.bat
rename to android/tools/ant/bin/lcp.bat
diff --git a/StartGamedev-160604-osx/tools/ant/bin/runant.pl b/android/tools/ant/bin/runant.pl
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/bin/runant.pl
rename to android/tools/ant/bin/runant.pl
diff --git a/StartGamedev-160604-osx/tools/ant/bin/runant.py b/android/tools/ant/bin/runant.py
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/bin/runant.py
rename to android/tools/ant/bin/runant.py
diff --git a/StartGamedev-160604-osx/tools/ant/bin/runrc.cmd b/android/tools/ant/bin/runrc.cmd
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/bin/runrc.cmd
rename to android/tools/ant/bin/runrc.cmd
diff --git a/StartGamedev-160604-osx/tools/ant/contributors.xml b/android/tools/ant/contributors.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/contributors.xml
rename to android/tools/ant/contributors.xml
diff --git a/StartGamedev-160604-osx/tools/ant/etc/ant-bootstrap.jar b/android/tools/ant/etc/ant-bootstrap.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/etc/ant-bootstrap.jar
rename to android/tools/ant/etc/ant-bootstrap.jar
diff --git a/StartGamedev-160604-osx/tools/ant/etc/changelog.xsl b/android/tools/ant/etc/changelog.xsl
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/etc/changelog.xsl
rename to android/tools/ant/etc/changelog.xsl
diff --git a/StartGamedev-160604-osx/tools/ant/etc/checkstyle/checkstyle-frames-sortby-check.xsl b/android/tools/ant/etc/checkstyle/checkstyle-frames-sortby-check.xsl
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/etc/checkstyle/checkstyle-frames-sortby-check.xsl
rename to android/tools/ant/etc/checkstyle/checkstyle-frames-sortby-check.xsl
diff --git a/StartGamedev-160604-osx/tools/ant/etc/checkstyle/checkstyle-frames.xsl b/android/tools/ant/etc/checkstyle/checkstyle-frames.xsl
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/etc/checkstyle/checkstyle-frames.xsl
rename to android/tools/ant/etc/checkstyle/checkstyle-frames.xsl
diff --git a/StartGamedev-160604-osx/tools/ant/etc/checkstyle/checkstyle-text.xsl b/android/tools/ant/etc/checkstyle/checkstyle-text.xsl
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/etc/checkstyle/checkstyle-text.xsl
rename to android/tools/ant/etc/checkstyle/checkstyle-text.xsl
diff --git a/StartGamedev-160604-osx/tools/ant/etc/checkstyle/checkstyle-xdoc.xsl b/android/tools/ant/etc/checkstyle/checkstyle-xdoc.xsl
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/etc/checkstyle/checkstyle-xdoc.xsl
rename to android/tools/ant/etc/checkstyle/checkstyle-xdoc.xsl
diff --git a/StartGamedev-160604-osx/tools/ant/etc/coverage-frames.xsl b/android/tools/ant/etc/coverage-frames.xsl
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/etc/coverage-frames.xsl
rename to android/tools/ant/etc/coverage-frames.xsl
diff --git a/StartGamedev-160604-osx/tools/ant/etc/jdepend-frames.xsl b/android/tools/ant/etc/jdepend-frames.xsl
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/etc/jdepend-frames.xsl
rename to android/tools/ant/etc/jdepend-frames.xsl
diff --git a/StartGamedev-160604-osx/tools/ant/etc/jdepend.xsl b/android/tools/ant/etc/jdepend.xsl
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/etc/jdepend.xsl
rename to android/tools/ant/etc/jdepend.xsl
diff --git a/StartGamedev-160604-osx/tools/ant/etc/junit-frames-xalan1.xsl b/android/tools/ant/etc/junit-frames-xalan1.xsl
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/etc/junit-frames-xalan1.xsl
rename to android/tools/ant/etc/junit-frames-xalan1.xsl
diff --git a/StartGamedev-160604-osx/tools/ant/etc/junit-frames.xsl b/android/tools/ant/etc/junit-frames.xsl
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/etc/junit-frames.xsl
rename to android/tools/ant/etc/junit-frames.xsl
diff --git a/StartGamedev-160604-osx/tools/ant/etc/junit-noframes.xsl b/android/tools/ant/etc/junit-noframes.xsl
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/etc/junit-noframes.xsl
rename to android/tools/ant/etc/junit-noframes.xsl
diff --git a/StartGamedev-160604-osx/tools/ant/etc/log.xsl b/android/tools/ant/etc/log.xsl
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/etc/log.xsl
rename to android/tools/ant/etc/log.xsl
diff --git a/StartGamedev-160604-osx/tools/ant/etc/maudit-frames.xsl b/android/tools/ant/etc/maudit-frames.xsl
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/etc/maudit-frames.xsl
rename to android/tools/ant/etc/maudit-frames.xsl
diff --git a/StartGamedev-160604-osx/tools/ant/etc/mmetrics-frames.xsl b/android/tools/ant/etc/mmetrics-frames.xsl
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/etc/mmetrics-frames.xsl
rename to android/tools/ant/etc/mmetrics-frames.xsl
diff --git a/StartGamedev-160604-osx/tools/ant/etc/tagdiff.xsl b/android/tools/ant/etc/tagdiff.xsl
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/etc/tagdiff.xsl
rename to android/tools/ant/etc/tagdiff.xsl
diff --git a/StartGamedev-160604-osx/tools/ant/fetch.xml b/android/tools/ant/fetch.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/fetch.xml
rename to android/tools/ant/fetch.xml
diff --git a/StartGamedev-160604-osx/tools/ant/get-m2.xml b/android/tools/ant/get-m2.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/get-m2.xml
rename to android/tools/ant/get-m2.xml
diff --git a/StartGamedev-160604-osx/tools/ant/lib/README b/android/tools/ant/lib/README
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/README
rename to android/tools/ant/lib/README
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-antlr.jar b/android/tools/ant/lib/ant-antlr.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-antlr.jar
rename to android/tools/ant/lib/ant-antlr.jar
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-antlr.pom b/android/tools/ant/lib/ant-antlr.pom
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-antlr.pom
rename to android/tools/ant/lib/ant-antlr.pom
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-apache-bcel.jar b/android/tools/ant/lib/ant-apache-bcel.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-apache-bcel.jar
rename to android/tools/ant/lib/ant-apache-bcel.jar
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-apache-bcel.pom b/android/tools/ant/lib/ant-apache-bcel.pom
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-apache-bcel.pom
rename to android/tools/ant/lib/ant-apache-bcel.pom
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-apache-bsf.jar b/android/tools/ant/lib/ant-apache-bsf.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-apache-bsf.jar
rename to android/tools/ant/lib/ant-apache-bsf.jar
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-apache-bsf.pom b/android/tools/ant/lib/ant-apache-bsf.pom
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-apache-bsf.pom
rename to android/tools/ant/lib/ant-apache-bsf.pom
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-apache-log4j.jar b/android/tools/ant/lib/ant-apache-log4j.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-apache-log4j.jar
rename to android/tools/ant/lib/ant-apache-log4j.jar
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-apache-log4j.pom b/android/tools/ant/lib/ant-apache-log4j.pom
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-apache-log4j.pom
rename to android/tools/ant/lib/ant-apache-log4j.pom
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-apache-oro.jar b/android/tools/ant/lib/ant-apache-oro.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-apache-oro.jar
rename to android/tools/ant/lib/ant-apache-oro.jar
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-apache-oro.pom b/android/tools/ant/lib/ant-apache-oro.pom
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-apache-oro.pom
rename to android/tools/ant/lib/ant-apache-oro.pom
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-apache-regexp.jar b/android/tools/ant/lib/ant-apache-regexp.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-apache-regexp.jar
rename to android/tools/ant/lib/ant-apache-regexp.jar
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-apache-regexp.pom b/android/tools/ant/lib/ant-apache-regexp.pom
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-apache-regexp.pom
rename to android/tools/ant/lib/ant-apache-regexp.pom
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-apache-resolver.jar b/android/tools/ant/lib/ant-apache-resolver.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-apache-resolver.jar
rename to android/tools/ant/lib/ant-apache-resolver.jar
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-apache-resolver.pom b/android/tools/ant/lib/ant-apache-resolver.pom
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-apache-resolver.pom
rename to android/tools/ant/lib/ant-apache-resolver.pom
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-apache-xalan2.jar b/android/tools/ant/lib/ant-apache-xalan2.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-apache-xalan2.jar
rename to android/tools/ant/lib/ant-apache-xalan2.jar
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-apache-xalan2.pom b/android/tools/ant/lib/ant-apache-xalan2.pom
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-apache-xalan2.pom
rename to android/tools/ant/lib/ant-apache-xalan2.pom
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-commons-logging.jar b/android/tools/ant/lib/ant-commons-logging.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-commons-logging.jar
rename to android/tools/ant/lib/ant-commons-logging.jar
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-commons-logging.pom b/android/tools/ant/lib/ant-commons-logging.pom
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-commons-logging.pom
rename to android/tools/ant/lib/ant-commons-logging.pom
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-commons-net.jar b/android/tools/ant/lib/ant-commons-net.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-commons-net.jar
rename to android/tools/ant/lib/ant-commons-net.jar
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-commons-net.pom b/android/tools/ant/lib/ant-commons-net.pom
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-commons-net.pom
rename to android/tools/ant/lib/ant-commons-net.pom
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-jai.jar b/android/tools/ant/lib/ant-jai.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-jai.jar
rename to android/tools/ant/lib/ant-jai.jar
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-jai.pom b/android/tools/ant/lib/ant-jai.pom
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-jai.pom
rename to android/tools/ant/lib/ant-jai.pom
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-javamail.jar b/android/tools/ant/lib/ant-javamail.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-javamail.jar
rename to android/tools/ant/lib/ant-javamail.jar
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-javamail.pom b/android/tools/ant/lib/ant-javamail.pom
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-javamail.pom
rename to android/tools/ant/lib/ant-javamail.pom
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-jdepend.jar b/android/tools/ant/lib/ant-jdepend.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-jdepend.jar
rename to android/tools/ant/lib/ant-jdepend.jar
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-jdepend.pom b/android/tools/ant/lib/ant-jdepend.pom
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-jdepend.pom
rename to android/tools/ant/lib/ant-jdepend.pom
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-jmf.jar b/android/tools/ant/lib/ant-jmf.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-jmf.jar
rename to android/tools/ant/lib/ant-jmf.jar
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-jmf.pom b/android/tools/ant/lib/ant-jmf.pom
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-jmf.pom
rename to android/tools/ant/lib/ant-jmf.pom
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-jsch.jar b/android/tools/ant/lib/ant-jsch.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-jsch.jar
rename to android/tools/ant/lib/ant-jsch.jar
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-jsch.pom b/android/tools/ant/lib/ant-jsch.pom
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-jsch.pom
rename to android/tools/ant/lib/ant-jsch.pom
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-junit.jar b/android/tools/ant/lib/ant-junit.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-junit.jar
rename to android/tools/ant/lib/ant-junit.jar
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-junit.pom b/android/tools/ant/lib/ant-junit.pom
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-junit.pom
rename to android/tools/ant/lib/ant-junit.pom
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-junit4.jar b/android/tools/ant/lib/ant-junit4.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-junit4.jar
rename to android/tools/ant/lib/ant-junit4.jar
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-junit4.pom b/android/tools/ant/lib/ant-junit4.pom
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-junit4.pom
rename to android/tools/ant/lib/ant-junit4.pom
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-launcher.jar b/android/tools/ant/lib/ant-launcher.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-launcher.jar
rename to android/tools/ant/lib/ant-launcher.jar
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-launcher.pom b/android/tools/ant/lib/ant-launcher.pom
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-launcher.pom
rename to android/tools/ant/lib/ant-launcher.pom
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-netrexx.jar b/android/tools/ant/lib/ant-netrexx.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-netrexx.jar
rename to android/tools/ant/lib/ant-netrexx.jar
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-netrexx.pom b/android/tools/ant/lib/ant-netrexx.pom
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-netrexx.pom
rename to android/tools/ant/lib/ant-netrexx.pom
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-parent.pom b/android/tools/ant/lib/ant-parent.pom
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-parent.pom
rename to android/tools/ant/lib/ant-parent.pom
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-swing.jar b/android/tools/ant/lib/ant-swing.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-swing.jar
rename to android/tools/ant/lib/ant-swing.jar
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-swing.pom b/android/tools/ant/lib/ant-swing.pom
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-swing.pom
rename to android/tools/ant/lib/ant-swing.pom
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-testutil.jar b/android/tools/ant/lib/ant-testutil.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-testutil.jar
rename to android/tools/ant/lib/ant-testutil.jar
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant-testutil.pom b/android/tools/ant/lib/ant-testutil.pom
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant-testutil.pom
rename to android/tools/ant/lib/ant-testutil.pom
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant.jar b/android/tools/ant/lib/ant.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant.jar
rename to android/tools/ant/lib/ant.jar
diff --git a/StartGamedev-160604-osx/tools/ant/lib/ant.pom b/android/tools/ant/lib/ant.pom
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/ant.pom
rename to android/tools/ant/lib/ant.pom
diff --git a/StartGamedev-160604-osx/tools/ant/lib/libraries.properties b/android/tools/ant/lib/libraries.properties
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/lib/libraries.properties
rename to android/tools/ant/lib/libraries.properties
diff --git a/StartGamedev-160604-osx/tools/ant/patch.xml b/android/tools/ant/patch.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/ant/patch.xml
rename to android/tools/ant/patch.xml
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/COPYRIGHT b/android/tools/jdk-osx/COPYRIGHT
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/COPYRIGHT
rename to android/tools/jdk-osx/COPYRIGHT
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/LICENSE b/android/tools/jdk-osx/LICENSE
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/LICENSE
rename to android/tools/jdk-osx/LICENSE
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/README.html b/android/tools/jdk-osx/README.html
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/README.html
rename to android/tools/jdk-osx/README.html
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/THIRDPARTYLICENSEREADME-JAVAFX.txt b/android/tools/jdk-osx/THIRDPARTYLICENSEREADME-JAVAFX.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/THIRDPARTYLICENSEREADME-JAVAFX.txt
rename to android/tools/jdk-osx/THIRDPARTYLICENSEREADME-JAVAFX.txt
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/THIRDPARTYLICENSEREADME.txt b/android/tools/jdk-osx/THIRDPARTYLICENSEREADME.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/THIRDPARTYLICENSEREADME.txt
rename to android/tools/jdk-osx/THIRDPARTYLICENSEREADME.txt
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/appletviewer b/android/tools/jdk-osx/bin/appletviewer
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/appletviewer
rename to android/tools/jdk-osx/bin/appletviewer
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/extcheck b/android/tools/jdk-osx/bin/extcheck
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/extcheck
rename to android/tools/jdk-osx/bin/extcheck
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/idlj b/android/tools/jdk-osx/bin/idlj
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/idlj
rename to android/tools/jdk-osx/bin/idlj
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/jar b/android/tools/jdk-osx/bin/jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/jar
rename to android/tools/jdk-osx/bin/jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/jarsigner b/android/tools/jdk-osx/bin/jarsigner
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/jarsigner
rename to android/tools/jdk-osx/bin/jarsigner
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/java b/android/tools/jdk-osx/bin/java
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/java
rename to android/tools/jdk-osx/bin/java
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/javac b/android/tools/jdk-osx/bin/javac
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/javac
rename to android/tools/jdk-osx/bin/javac
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/javadoc b/android/tools/jdk-osx/bin/javadoc
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/javadoc
rename to android/tools/jdk-osx/bin/javadoc
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/javafxpackager b/android/tools/jdk-osx/bin/javafxpackager
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/javafxpackager
rename to android/tools/jdk-osx/bin/javafxpackager
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/javah b/android/tools/jdk-osx/bin/javah
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/javah
rename to android/tools/jdk-osx/bin/javah
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/javap b/android/tools/jdk-osx/bin/javap
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/javap
rename to android/tools/jdk-osx/bin/javap
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/javapackager b/android/tools/jdk-osx/bin/javapackager
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/javapackager
rename to android/tools/jdk-osx/bin/javapackager
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/jcmd b/android/tools/jdk-osx/bin/jcmd
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/jcmd
rename to android/tools/jdk-osx/bin/jcmd
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/jconsole b/android/tools/jdk-osx/bin/jconsole
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/jconsole
rename to android/tools/jdk-osx/bin/jconsole
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/jdb b/android/tools/jdk-osx/bin/jdb
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/jdb
rename to android/tools/jdk-osx/bin/jdb
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/jdeps b/android/tools/jdk-osx/bin/jdeps
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/jdeps
rename to android/tools/jdk-osx/bin/jdeps
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/jhat b/android/tools/jdk-osx/bin/jhat
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/jhat
rename to android/tools/jdk-osx/bin/jhat
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/jinfo b/android/tools/jdk-osx/bin/jinfo
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/jinfo
rename to android/tools/jdk-osx/bin/jinfo
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/jjs b/android/tools/jdk-osx/bin/jjs
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/jjs
rename to android/tools/jdk-osx/bin/jjs
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/jmap b/android/tools/jdk-osx/bin/jmap
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/jmap
rename to android/tools/jdk-osx/bin/jmap
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/jmc b/android/tools/jdk-osx/bin/jmc
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/jmc
rename to android/tools/jdk-osx/bin/jmc
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/jps b/android/tools/jdk-osx/bin/jps
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/jps
rename to android/tools/jdk-osx/bin/jps
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/jrunscript b/android/tools/jdk-osx/bin/jrunscript
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/jrunscript
rename to android/tools/jdk-osx/bin/jrunscript
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/jsadebugd b/android/tools/jdk-osx/bin/jsadebugd
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/jsadebugd
rename to android/tools/jdk-osx/bin/jsadebugd
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/jstack b/android/tools/jdk-osx/bin/jstack
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/jstack
rename to android/tools/jdk-osx/bin/jstack
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/jstat b/android/tools/jdk-osx/bin/jstat
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/jstat
rename to android/tools/jdk-osx/bin/jstat
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/jstatd b/android/tools/jdk-osx/bin/jstatd
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/jstatd
rename to android/tools/jdk-osx/bin/jstatd
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/jvisualvm b/android/tools/jdk-osx/bin/jvisualvm
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/jvisualvm
rename to android/tools/jdk-osx/bin/jvisualvm
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/keytool b/android/tools/jdk-osx/bin/keytool
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/keytool
rename to android/tools/jdk-osx/bin/keytool
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/native2ascii b/android/tools/jdk-osx/bin/native2ascii
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/native2ascii
rename to android/tools/jdk-osx/bin/native2ascii
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/orbd b/android/tools/jdk-osx/bin/orbd
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/orbd
rename to android/tools/jdk-osx/bin/orbd
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/pack200 b/android/tools/jdk-osx/bin/pack200
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/pack200
rename to android/tools/jdk-osx/bin/pack200
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/policytool b/android/tools/jdk-osx/bin/policytool
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/policytool
rename to android/tools/jdk-osx/bin/policytool
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/rmic b/android/tools/jdk-osx/bin/rmic
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/rmic
rename to android/tools/jdk-osx/bin/rmic
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/rmid b/android/tools/jdk-osx/bin/rmid
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/rmid
rename to android/tools/jdk-osx/bin/rmid
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/rmiregistry b/android/tools/jdk-osx/bin/rmiregistry
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/rmiregistry
rename to android/tools/jdk-osx/bin/rmiregistry
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/schemagen b/android/tools/jdk-osx/bin/schemagen
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/schemagen
rename to android/tools/jdk-osx/bin/schemagen
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/serialver b/android/tools/jdk-osx/bin/serialver
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/serialver
rename to android/tools/jdk-osx/bin/serialver
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/servertool b/android/tools/jdk-osx/bin/servertool
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/servertool
rename to android/tools/jdk-osx/bin/servertool
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/tnameserv b/android/tools/jdk-osx/bin/tnameserv
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/tnameserv
rename to android/tools/jdk-osx/bin/tnameserv
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/unpack200 b/android/tools/jdk-osx/bin/unpack200
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/unpack200
rename to android/tools/jdk-osx/bin/unpack200
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/wsgen b/android/tools/jdk-osx/bin/wsgen
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/wsgen
rename to android/tools/jdk-osx/bin/wsgen
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/wsimport b/android/tools/jdk-osx/bin/wsimport
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/wsimport
rename to android/tools/jdk-osx/bin/wsimport
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/bin/xjc b/android/tools/jdk-osx/bin/xjc
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/bin/xjc
rename to android/tools/jdk-osx/bin/xjc
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/include/classfile_constants.h b/android/tools/jdk-osx/include/classfile_constants.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/include/classfile_constants.h
rename to android/tools/jdk-osx/include/classfile_constants.h
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/include/darwin/jawt_md.h b/android/tools/jdk-osx/include/darwin/jawt_md.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/include/darwin/jawt_md.h
rename to android/tools/jdk-osx/include/darwin/jawt_md.h
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/include/darwin/jni_md.h b/android/tools/jdk-osx/include/darwin/jni_md.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/include/darwin/jni_md.h
rename to android/tools/jdk-osx/include/darwin/jni_md.h
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/include/jawt.h b/android/tools/jdk-osx/include/jawt.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/include/jawt.h
rename to android/tools/jdk-osx/include/jawt.h
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/include/jdwpTransport.h b/android/tools/jdk-osx/include/jdwpTransport.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/include/jdwpTransport.h
rename to android/tools/jdk-osx/include/jdwpTransport.h
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/include/jni.h b/android/tools/jdk-osx/include/jni.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/include/jni.h
rename to android/tools/jdk-osx/include/jni.h
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/include/jvmti.h b/android/tools/jdk-osx/include/jvmti.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/include/jvmti.h
rename to android/tools/jdk-osx/include/jvmti.h
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/include/jvmticmlr.h b/android/tools/jdk-osx/include/jvmticmlr.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/include/jvmticmlr.h
rename to android/tools/jdk-osx/include/jvmticmlr.h
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/COPYRIGHT b/android/tools/jdk-osx/jre/COPYRIGHT
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/COPYRIGHT
rename to android/tools/jdk-osx/jre/COPYRIGHT
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/LICENSE b/android/tools/jdk-osx/jre/LICENSE
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/LICENSE
rename to android/tools/jdk-osx/jre/LICENSE
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/README b/android/tools/jdk-osx/jre/README
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/README
rename to android/tools/jdk-osx/jre/README
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/THIRDPARTYLICENSEREADME-JAVAFX.txt b/android/tools/jdk-osx/jre/THIRDPARTYLICENSEREADME-JAVAFX.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/THIRDPARTYLICENSEREADME-JAVAFX.txt
rename to android/tools/jdk-osx/jre/THIRDPARTYLICENSEREADME-JAVAFX.txt
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/THIRDPARTYLICENSEREADME.txt b/android/tools/jdk-osx/jre/THIRDPARTYLICENSEREADME.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/THIRDPARTYLICENSEREADME.txt
rename to android/tools/jdk-osx/jre/THIRDPARTYLICENSEREADME.txt
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/Welcome.html b/android/tools/jdk-osx/jre/Welcome.html
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/Welcome.html
rename to android/tools/jdk-osx/jre/Welcome.html
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/bin/java b/android/tools/jdk-osx/jre/bin/java
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/bin/java
rename to android/tools/jdk-osx/jre/bin/java
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/bin/jjs b/android/tools/jdk-osx/jre/bin/jjs
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/bin/jjs
rename to android/tools/jdk-osx/jre/bin/jjs
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/bin/keytool b/android/tools/jdk-osx/jre/bin/keytool
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/bin/keytool
rename to android/tools/jdk-osx/jre/bin/keytool
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/bin/orbd b/android/tools/jdk-osx/jre/bin/orbd
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/bin/orbd
rename to android/tools/jdk-osx/jre/bin/orbd
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/bin/pack200 b/android/tools/jdk-osx/jre/bin/pack200
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/bin/pack200
rename to android/tools/jdk-osx/jre/bin/pack200
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/bin/policytool b/android/tools/jdk-osx/jre/bin/policytool
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/bin/policytool
rename to android/tools/jdk-osx/jre/bin/policytool
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/bin/rmid b/android/tools/jdk-osx/jre/bin/rmid
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/bin/rmid
rename to android/tools/jdk-osx/jre/bin/rmid
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/bin/rmiregistry b/android/tools/jdk-osx/jre/bin/rmiregistry
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/bin/rmiregistry
rename to android/tools/jdk-osx/jre/bin/rmiregistry
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/bin/servertool b/android/tools/jdk-osx/jre/bin/servertool
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/bin/servertool
rename to android/tools/jdk-osx/jre/bin/servertool
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/bin/tnameserv b/android/tools/jdk-osx/jre/bin/tnameserv
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/bin/tnameserv
rename to android/tools/jdk-osx/jre/bin/tnameserv
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/bin/unpack200 b/android/tools/jdk-osx/jre/bin/unpack200
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/bin/unpack200
rename to android/tools/jdk-osx/jre/bin/unpack200
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/calendars.properties b/android/tools/jdk-osx/jre/lib/calendars.properties
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/calendars.properties
rename to android/tools/jdk-osx/jre/lib/calendars.properties
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/charsets.jar b/android/tools/jdk-osx/jre/lib/charsets.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/charsets.jar
rename to android/tools/jdk-osx/jre/lib/charsets.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/classlist b/android/tools/jdk-osx/jre/lib/classlist
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/classlist
rename to android/tools/jdk-osx/jre/lib/classlist
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/cmm/CIEXYZ.pf b/android/tools/jdk-osx/jre/lib/cmm/CIEXYZ.pf
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/cmm/CIEXYZ.pf
rename to android/tools/jdk-osx/jre/lib/cmm/CIEXYZ.pf
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/cmm/GRAY.pf b/android/tools/jdk-osx/jre/lib/cmm/GRAY.pf
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/cmm/GRAY.pf
rename to android/tools/jdk-osx/jre/lib/cmm/GRAY.pf
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/cmm/LINEAR_RGB.pf b/android/tools/jdk-osx/jre/lib/cmm/LINEAR_RGB.pf
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/cmm/LINEAR_RGB.pf
rename to android/tools/jdk-osx/jre/lib/cmm/LINEAR_RGB.pf
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/cmm/PYCC.pf b/android/tools/jdk-osx/jre/lib/cmm/PYCC.pf
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/cmm/PYCC.pf
rename to android/tools/jdk-osx/jre/lib/cmm/PYCC.pf
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/cmm/sRGB.pf b/android/tools/jdk-osx/jre/lib/cmm/sRGB.pf
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/cmm/sRGB.pf
rename to android/tools/jdk-osx/jre/lib/cmm/sRGB.pf
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/content-types.properties b/android/tools/jdk-osx/jre/lib/content-types.properties
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/content-types.properties
rename to android/tools/jdk-osx/jre/lib/content-types.properties
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/currency.data b/android/tools/jdk-osx/jre/lib/currency.data
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/currency.data
rename to android/tools/jdk-osx/jre/lib/currency.data
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/deploy.jar b/android/tools/jdk-osx/jre/lib/deploy.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/deploy.jar
rename to android/tools/jdk-osx/jre/lib/deploy.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/ext/cldrdata.jar b/android/tools/jdk-osx/jre/lib/ext/cldrdata.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/ext/cldrdata.jar
rename to android/tools/jdk-osx/jre/lib/ext/cldrdata.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/ext/dnsns.jar b/android/tools/jdk-osx/jre/lib/ext/dnsns.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/ext/dnsns.jar
rename to android/tools/jdk-osx/jre/lib/ext/dnsns.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/ext/jfxrt.jar b/android/tools/jdk-osx/jre/lib/ext/jfxrt.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/ext/jfxrt.jar
rename to android/tools/jdk-osx/jre/lib/ext/jfxrt.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/ext/localedata.jar b/android/tools/jdk-osx/jre/lib/ext/localedata.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/ext/localedata.jar
rename to android/tools/jdk-osx/jre/lib/ext/localedata.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/ext/meta-index b/android/tools/jdk-osx/jre/lib/ext/meta-index
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/ext/meta-index
rename to android/tools/jdk-osx/jre/lib/ext/meta-index
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/ext/nashorn.jar b/android/tools/jdk-osx/jre/lib/ext/nashorn.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/ext/nashorn.jar
rename to android/tools/jdk-osx/jre/lib/ext/nashorn.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/ext/sunec.jar b/android/tools/jdk-osx/jre/lib/ext/sunec.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/ext/sunec.jar
rename to android/tools/jdk-osx/jre/lib/ext/sunec.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/ext/sunjce_provider.jar b/android/tools/jdk-osx/jre/lib/ext/sunjce_provider.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/ext/sunjce_provider.jar
rename to android/tools/jdk-osx/jre/lib/ext/sunjce_provider.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/ext/sunpkcs11.jar b/android/tools/jdk-osx/jre/lib/ext/sunpkcs11.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/ext/sunpkcs11.jar
rename to android/tools/jdk-osx/jre/lib/ext/sunpkcs11.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/ext/zipfs.jar b/android/tools/jdk-osx/jre/lib/ext/zipfs.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/ext/zipfs.jar
rename to android/tools/jdk-osx/jre/lib/ext/zipfs.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/flavormap.properties b/android/tools/jdk-osx/jre/lib/flavormap.properties
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/flavormap.properties
rename to android/tools/jdk-osx/jre/lib/flavormap.properties
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/fontconfig.bfc b/android/tools/jdk-osx/jre/lib/fontconfig.bfc
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/fontconfig.bfc
rename to android/tools/jdk-osx/jre/lib/fontconfig.bfc
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/fontconfig.properties.src b/android/tools/jdk-osx/jre/lib/fontconfig.properties.src
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/fontconfig.properties.src
rename to android/tools/jdk-osx/jre/lib/fontconfig.properties.src
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/fonts/LucidaBrightDemiBold.ttf b/android/tools/jdk-osx/jre/lib/fonts/LucidaBrightDemiBold.ttf
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/fonts/LucidaBrightDemiBold.ttf
rename to android/tools/jdk-osx/jre/lib/fonts/LucidaBrightDemiBold.ttf
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/fonts/LucidaBrightDemiItalic.ttf b/android/tools/jdk-osx/jre/lib/fonts/LucidaBrightDemiItalic.ttf
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/fonts/LucidaBrightDemiItalic.ttf
rename to android/tools/jdk-osx/jre/lib/fonts/LucidaBrightDemiItalic.ttf
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/fonts/LucidaBrightItalic.ttf b/android/tools/jdk-osx/jre/lib/fonts/LucidaBrightItalic.ttf
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/fonts/LucidaBrightItalic.ttf
rename to android/tools/jdk-osx/jre/lib/fonts/LucidaBrightItalic.ttf
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/fonts/LucidaBrightRegular.ttf b/android/tools/jdk-osx/jre/lib/fonts/LucidaBrightRegular.ttf
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/fonts/LucidaBrightRegular.ttf
rename to android/tools/jdk-osx/jre/lib/fonts/LucidaBrightRegular.ttf
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/fonts/LucidaSansDemiBold.ttf b/android/tools/jdk-osx/jre/lib/fonts/LucidaSansDemiBold.ttf
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/fonts/LucidaSansDemiBold.ttf
rename to android/tools/jdk-osx/jre/lib/fonts/LucidaSansDemiBold.ttf
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/fonts/LucidaSansRegular.ttf b/android/tools/jdk-osx/jre/lib/fonts/LucidaSansRegular.ttf
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/fonts/LucidaSansRegular.ttf
rename to android/tools/jdk-osx/jre/lib/fonts/LucidaSansRegular.ttf
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/fonts/LucidaTypewriterBold.ttf b/android/tools/jdk-osx/jre/lib/fonts/LucidaTypewriterBold.ttf
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/fonts/LucidaTypewriterBold.ttf
rename to android/tools/jdk-osx/jre/lib/fonts/LucidaTypewriterBold.ttf
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/fonts/LucidaTypewriterRegular.ttf b/android/tools/jdk-osx/jre/lib/fonts/LucidaTypewriterRegular.ttf
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/fonts/LucidaTypewriterRegular.ttf
rename to android/tools/jdk-osx/jre/lib/fonts/LucidaTypewriterRegular.ttf
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/fonts/fonts.dir b/android/tools/jdk-osx/jre/lib/fonts/fonts.dir
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/fonts/fonts.dir
rename to android/tools/jdk-osx/jre/lib/fonts/fonts.dir
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/hijrah-config-umalqura.properties b/android/tools/jdk-osx/jre/lib/hijrah-config-umalqura.properties
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/hijrah-config-umalqura.properties
rename to android/tools/jdk-osx/jre/lib/hijrah-config-umalqura.properties
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/images/cursors/cursors.properties b/android/tools/jdk-osx/jre/lib/images/cursors/cursors.properties
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/images/cursors/cursors.properties
rename to android/tools/jdk-osx/jre/lib/images/cursors/cursors.properties
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/images/cursors/invalid32x32.gif b/android/tools/jdk-osx/jre/lib/images/cursors/invalid32x32.gif
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/images/cursors/invalid32x32.gif
rename to android/tools/jdk-osx/jre/lib/images/cursors/invalid32x32.gif
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/images/cursors/motif_CopyDrop32x32.gif b/android/tools/jdk-osx/jre/lib/images/cursors/motif_CopyDrop32x32.gif
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/images/cursors/motif_CopyDrop32x32.gif
rename to android/tools/jdk-osx/jre/lib/images/cursors/motif_CopyDrop32x32.gif
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/images/cursors/motif_CopyNoDrop32x32.gif b/android/tools/jdk-osx/jre/lib/images/cursors/motif_CopyNoDrop32x32.gif
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/images/cursors/motif_CopyNoDrop32x32.gif
rename to android/tools/jdk-osx/jre/lib/images/cursors/motif_CopyNoDrop32x32.gif
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/images/cursors/motif_LinkDrop32x32.gif b/android/tools/jdk-osx/jre/lib/images/cursors/motif_LinkDrop32x32.gif
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/images/cursors/motif_LinkDrop32x32.gif
rename to android/tools/jdk-osx/jre/lib/images/cursors/motif_LinkDrop32x32.gif
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/images/cursors/motif_LinkNoDrop32x32.gif b/android/tools/jdk-osx/jre/lib/images/cursors/motif_LinkNoDrop32x32.gif
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/images/cursors/motif_LinkNoDrop32x32.gif
rename to android/tools/jdk-osx/jre/lib/images/cursors/motif_LinkNoDrop32x32.gif
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/images/cursors/motif_MoveDrop32x32.gif b/android/tools/jdk-osx/jre/lib/images/cursors/motif_MoveDrop32x32.gif
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/images/cursors/motif_MoveDrop32x32.gif
rename to android/tools/jdk-osx/jre/lib/images/cursors/motif_MoveDrop32x32.gif
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/images/cursors/motif_MoveNoDrop32x32.gif b/android/tools/jdk-osx/jre/lib/images/cursors/motif_MoveNoDrop32x32.gif
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/images/cursors/motif_MoveNoDrop32x32.gif
rename to android/tools/jdk-osx/jre/lib/images/cursors/motif_MoveNoDrop32x32.gif
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/javafx.properties b/android/tools/jdk-osx/jre/lib/javafx.properties
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/javafx.properties
rename to android/tools/jdk-osx/jre/lib/javafx.properties
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/javaws.jar b/android/tools/jdk-osx/jre/lib/javaws.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/javaws.jar
rename to android/tools/jdk-osx/jre/lib/javaws.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/jce.jar b/android/tools/jdk-osx/jre/lib/jce.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/jce.jar
rename to android/tools/jdk-osx/jre/lib/jce.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/jfr.jar b/android/tools/jdk-osx/jre/lib/jfr.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/jfr.jar
rename to android/tools/jdk-osx/jre/lib/jfr.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/jfr/default.jfc b/android/tools/jdk-osx/jre/lib/jfr/default.jfc
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/jfr/default.jfc
rename to android/tools/jdk-osx/jre/lib/jfr/default.jfc
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/jfr/profile.jfc b/android/tools/jdk-osx/jre/lib/jfr/profile.jfc
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/jfr/profile.jfc
rename to android/tools/jdk-osx/jre/lib/jfr/profile.jfc
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/jfxswt.jar b/android/tools/jdk-osx/jre/lib/jfxswt.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/jfxswt.jar
rename to android/tools/jdk-osx/jre/lib/jfxswt.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/jli/libjli.dylib b/android/tools/jdk-osx/jre/lib/jli/libjli.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/jli/libjli.dylib
rename to android/tools/jdk-osx/jre/lib/jli/libjli.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/jspawnhelper b/android/tools/jdk-osx/jre/lib/jspawnhelper
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/jspawnhelper
rename to android/tools/jdk-osx/jre/lib/jspawnhelper
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/jsse.jar b/android/tools/jdk-osx/jre/lib/jsse.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/jsse.jar
rename to android/tools/jdk-osx/jre/lib/jsse.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/jvm.cfg b/android/tools/jdk-osx/jre/lib/jvm.cfg
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/jvm.cfg
rename to android/tools/jdk-osx/jre/lib/jvm.cfg
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/jvm.hprof.txt b/android/tools/jdk-osx/jre/lib/jvm.hprof.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/jvm.hprof.txt
rename to android/tools/jdk-osx/jre/lib/jvm.hprof.txt
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libAppleScriptEngine.dylib b/android/tools/jdk-osx/jre/lib/libAppleScriptEngine.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libAppleScriptEngine.dylib
rename to android/tools/jdk-osx/jre/lib/libAppleScriptEngine.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libattach.dylib b/android/tools/jdk-osx/jre/lib/libattach.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libattach.dylib
rename to android/tools/jdk-osx/jre/lib/libattach.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libawt.dylib b/android/tools/jdk-osx/jre/lib/libawt.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libawt.dylib
rename to android/tools/jdk-osx/jre/lib/libawt.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libawt_lwawt.dylib b/android/tools/jdk-osx/jre/lib/libawt_lwawt.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libawt_lwawt.dylib
rename to android/tools/jdk-osx/jre/lib/libawt_lwawt.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libbci.dylib b/android/tools/jdk-osx/jre/lib/libbci.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libbci.dylib
rename to android/tools/jdk-osx/jre/lib/libbci.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libdcpr.dylib b/android/tools/jdk-osx/jre/lib/libdcpr.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libdcpr.dylib
rename to android/tools/jdk-osx/jre/lib/libdcpr.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libdecora_sse.dylib b/android/tools/jdk-osx/jre/lib/libdecora_sse.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libdecora_sse.dylib
rename to android/tools/jdk-osx/jre/lib/libdecora_sse.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libdeploy.dylib b/android/tools/jdk-osx/jre/lib/libdeploy.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libdeploy.dylib
rename to android/tools/jdk-osx/jre/lib/libdeploy.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libdt_socket.dylib b/android/tools/jdk-osx/jre/lib/libdt_socket.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libdt_socket.dylib
rename to android/tools/jdk-osx/jre/lib/libdt_socket.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libfontmanager.dylib b/android/tools/jdk-osx/jre/lib/libfontmanager.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libfontmanager.dylib
rename to android/tools/jdk-osx/jre/lib/libfontmanager.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libfxplugins.dylib b/android/tools/jdk-osx/jre/lib/libfxplugins.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libfxplugins.dylib
rename to android/tools/jdk-osx/jre/lib/libfxplugins.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libglass.dylib b/android/tools/jdk-osx/jre/lib/libglass.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libglass.dylib
rename to android/tools/jdk-osx/jre/lib/libglass.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libglib-lite.dylib b/android/tools/jdk-osx/jre/lib/libglib-lite.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libglib-lite.dylib
rename to android/tools/jdk-osx/jre/lib/libglib-lite.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libgstreamer-lite.dylib b/android/tools/jdk-osx/jre/lib/libgstreamer-lite.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libgstreamer-lite.dylib
rename to android/tools/jdk-osx/jre/lib/libgstreamer-lite.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libhprof.dylib b/android/tools/jdk-osx/jre/lib/libhprof.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libhprof.dylib
rename to android/tools/jdk-osx/jre/lib/libhprof.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libinstrument.dylib b/android/tools/jdk-osx/jre/lib/libinstrument.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libinstrument.dylib
rename to android/tools/jdk-osx/jre/lib/libinstrument.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libj2gss.dylib b/android/tools/jdk-osx/jre/lib/libj2gss.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libj2gss.dylib
rename to android/tools/jdk-osx/jre/lib/libj2gss.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libj2pcsc.dylib b/android/tools/jdk-osx/jre/lib/libj2pcsc.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libj2pcsc.dylib
rename to android/tools/jdk-osx/jre/lib/libj2pcsc.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libj2pkcs11.dylib b/android/tools/jdk-osx/jre/lib/libj2pkcs11.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libj2pkcs11.dylib
rename to android/tools/jdk-osx/jre/lib/libj2pkcs11.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjaas_unix.dylib b/android/tools/jdk-osx/jre/lib/libjaas_unix.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjaas_unix.dylib
rename to android/tools/jdk-osx/jre/lib/libjaas_unix.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjava.dylib b/android/tools/jdk-osx/jre/lib/libjava.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjava.dylib
rename to android/tools/jdk-osx/jre/lib/libjava.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjava_crw_demo.dylib b/android/tools/jdk-osx/jre/lib/libjava_crw_demo.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjava_crw_demo.dylib
rename to android/tools/jdk-osx/jre/lib/libjava_crw_demo.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjavafx_font.dylib b/android/tools/jdk-osx/jre/lib/libjavafx_font.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjavafx_font.dylib
rename to android/tools/jdk-osx/jre/lib/libjavafx_font.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjavafx_font_t2k.dylib b/android/tools/jdk-osx/jre/lib/libjavafx_font_t2k.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjavafx_font_t2k.dylib
rename to android/tools/jdk-osx/jre/lib/libjavafx_font_t2k.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjavafx_iio.dylib b/android/tools/jdk-osx/jre/lib/libjavafx_iio.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjavafx_iio.dylib
rename to android/tools/jdk-osx/jre/lib/libjavafx_iio.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjawt.dylib b/android/tools/jdk-osx/jre/lib/libjawt.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjawt.dylib
rename to android/tools/jdk-osx/jre/lib/libjawt.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjdwp.dylib b/android/tools/jdk-osx/jre/lib/libjdwp.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjdwp.dylib
rename to android/tools/jdk-osx/jre/lib/libjdwp.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjfr.dylib b/android/tools/jdk-osx/jre/lib/libjfr.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjfr.dylib
rename to android/tools/jdk-osx/jre/lib/libjfr.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjfxmedia.dylib b/android/tools/jdk-osx/jre/lib/libjfxmedia.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjfxmedia.dylib
rename to android/tools/jdk-osx/jre/lib/libjfxmedia.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjfxmedia_avf.dylib b/android/tools/jdk-osx/jre/lib/libjfxmedia_avf.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjfxmedia_avf.dylib
rename to android/tools/jdk-osx/jre/lib/libjfxmedia_avf.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjfxmedia_qtkit.dylib b/android/tools/jdk-osx/jre/lib/libjfxmedia_qtkit.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjfxmedia_qtkit.dylib
rename to android/tools/jdk-osx/jre/lib/libjfxmedia_qtkit.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjpeg.dylib b/android/tools/jdk-osx/jre/lib/libjpeg.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjpeg.dylib
rename to android/tools/jdk-osx/jre/lib/libjpeg.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjsdt.dylib b/android/tools/jdk-osx/jre/lib/libjsdt.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjsdt.dylib
rename to android/tools/jdk-osx/jre/lib/libjsdt.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjsig.dylib b/android/tools/jdk-osx/jre/lib/libjsig.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjsig.dylib
rename to android/tools/jdk-osx/jre/lib/libjsig.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjsound.dylib b/android/tools/jdk-osx/jre/lib/libjsound.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libjsound.dylib
rename to android/tools/jdk-osx/jre/lib/libjsound.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libkcms.dylib b/android/tools/jdk-osx/jre/lib/libkcms.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libkcms.dylib
rename to android/tools/jdk-osx/jre/lib/libkcms.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/liblcms.dylib b/android/tools/jdk-osx/jre/lib/liblcms.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/liblcms.dylib
rename to android/tools/jdk-osx/jre/lib/liblcms.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libmanagement.dylib b/android/tools/jdk-osx/jre/lib/libmanagement.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libmanagement.dylib
rename to android/tools/jdk-osx/jre/lib/libmanagement.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libmlib_image.dylib b/android/tools/jdk-osx/jre/lib/libmlib_image.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libmlib_image.dylib
rename to android/tools/jdk-osx/jre/lib/libmlib_image.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libnet.dylib b/android/tools/jdk-osx/jre/lib/libnet.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libnet.dylib
rename to android/tools/jdk-osx/jre/lib/libnet.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libnio.dylib b/android/tools/jdk-osx/jre/lib/libnio.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libnio.dylib
rename to android/tools/jdk-osx/jre/lib/libnio.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libnpt.dylib b/android/tools/jdk-osx/jre/lib/libnpt.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libnpt.dylib
rename to android/tools/jdk-osx/jre/lib/libnpt.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libosx.dylib b/android/tools/jdk-osx/jre/lib/libosx.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libosx.dylib
rename to android/tools/jdk-osx/jre/lib/libosx.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libosxapp.dylib b/android/tools/jdk-osx/jre/lib/libosxapp.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libosxapp.dylib
rename to android/tools/jdk-osx/jre/lib/libosxapp.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libosxkrb5.dylib b/android/tools/jdk-osx/jre/lib/libosxkrb5.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libosxkrb5.dylib
rename to android/tools/jdk-osx/jre/lib/libosxkrb5.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libosxui.dylib b/android/tools/jdk-osx/jre/lib/libosxui.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libosxui.dylib
rename to android/tools/jdk-osx/jre/lib/libosxui.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libprism_common.dylib b/android/tools/jdk-osx/jre/lib/libprism_common.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libprism_common.dylib
rename to android/tools/jdk-osx/jre/lib/libprism_common.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libprism_es2.dylib b/android/tools/jdk-osx/jre/lib/libprism_es2.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libprism_es2.dylib
rename to android/tools/jdk-osx/jre/lib/libprism_es2.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libprism_sw.dylib b/android/tools/jdk-osx/jre/lib/libprism_sw.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libprism_sw.dylib
rename to android/tools/jdk-osx/jre/lib/libprism_sw.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libresource.dylib b/android/tools/jdk-osx/jre/lib/libresource.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libresource.dylib
rename to android/tools/jdk-osx/jre/lib/libresource.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libsaproc.dylib b/android/tools/jdk-osx/jre/lib/libsaproc.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libsaproc.dylib
rename to android/tools/jdk-osx/jre/lib/libsaproc.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libsplashscreen.dylib b/android/tools/jdk-osx/jre/lib/libsplashscreen.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libsplashscreen.dylib
rename to android/tools/jdk-osx/jre/lib/libsplashscreen.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libsunec.dylib b/android/tools/jdk-osx/jre/lib/libsunec.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libsunec.dylib
rename to android/tools/jdk-osx/jre/lib/libsunec.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libt2k.dylib b/android/tools/jdk-osx/jre/lib/libt2k.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libt2k.dylib
rename to android/tools/jdk-osx/jre/lib/libt2k.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libunpack.dylib b/android/tools/jdk-osx/jre/lib/libunpack.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libunpack.dylib
rename to android/tools/jdk-osx/jre/lib/libunpack.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libverify.dylib b/android/tools/jdk-osx/jre/lib/libverify.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libverify.dylib
rename to android/tools/jdk-osx/jre/lib/libverify.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libzip.dylib b/android/tools/jdk-osx/jre/lib/libzip.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/libzip.dylib
rename to android/tools/jdk-osx/jre/lib/libzip.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/logging.properties b/android/tools/jdk-osx/jre/lib/logging.properties
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/logging.properties
rename to android/tools/jdk-osx/jre/lib/logging.properties
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/management-agent.jar b/android/tools/jdk-osx/jre/lib/management-agent.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/management-agent.jar
rename to android/tools/jdk-osx/jre/lib/management-agent.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/management/jmxremote.access b/android/tools/jdk-osx/jre/lib/management/jmxremote.access
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/management/jmxremote.access
rename to android/tools/jdk-osx/jre/lib/management/jmxremote.access
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/management/jmxremote.password.template b/android/tools/jdk-osx/jre/lib/management/jmxremote.password.template
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/management/jmxremote.password.template
rename to android/tools/jdk-osx/jre/lib/management/jmxremote.password.template
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/management/management.properties b/android/tools/jdk-osx/jre/lib/management/management.properties
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/management/management.properties
rename to android/tools/jdk-osx/jre/lib/management/management.properties
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/management/snmp.acl.template b/android/tools/jdk-osx/jre/lib/management/snmp.acl.template
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/management/snmp.acl.template
rename to android/tools/jdk-osx/jre/lib/management/snmp.acl.template
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/meta-index b/android/tools/jdk-osx/jre/lib/meta-index
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/meta-index
rename to android/tools/jdk-osx/jre/lib/meta-index
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/net.properties b/android/tools/jdk-osx/jre/lib/net.properties
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/net.properties
rename to android/tools/jdk-osx/jre/lib/net.properties
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/plugin.jar b/android/tools/jdk-osx/jre/lib/plugin.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/plugin.jar
rename to android/tools/jdk-osx/jre/lib/plugin.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/psfont.properties.ja b/android/tools/jdk-osx/jre/lib/psfont.properties.ja
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/psfont.properties.ja
rename to android/tools/jdk-osx/jre/lib/psfont.properties.ja
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/psfontj2d.properties b/android/tools/jdk-osx/jre/lib/psfontj2d.properties
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/psfontj2d.properties
rename to android/tools/jdk-osx/jre/lib/psfontj2d.properties
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/resources.jar b/android/tools/jdk-osx/jre/lib/resources.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/resources.jar
rename to android/tools/jdk-osx/jre/lib/resources.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/rt.jar b/android/tools/jdk-osx/jre/lib/rt.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/rt.jar
rename to android/tools/jdk-osx/jre/lib/rt.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/security/US_export_policy.jar b/android/tools/jdk-osx/jre/lib/security/US_export_policy.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/security/US_export_policy.jar
rename to android/tools/jdk-osx/jre/lib/security/US_export_policy.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/security/blacklist b/android/tools/jdk-osx/jre/lib/security/blacklist
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/security/blacklist
rename to android/tools/jdk-osx/jre/lib/security/blacklist
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/security/blacklisted.certs b/android/tools/jdk-osx/jre/lib/security/blacklisted.certs
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/security/blacklisted.certs
rename to android/tools/jdk-osx/jre/lib/security/blacklisted.certs
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/security/cacerts b/android/tools/jdk-osx/jre/lib/security/cacerts
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/security/cacerts
rename to android/tools/jdk-osx/jre/lib/security/cacerts
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/security/java.policy b/android/tools/jdk-osx/jre/lib/security/java.policy
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/security/java.policy
rename to android/tools/jdk-osx/jre/lib/security/java.policy
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/security/java.security b/android/tools/jdk-osx/jre/lib/security/java.security
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/security/java.security
rename to android/tools/jdk-osx/jre/lib/security/java.security
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/security/local_policy.jar b/android/tools/jdk-osx/jre/lib/security/local_policy.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/security/local_policy.jar
rename to android/tools/jdk-osx/jre/lib/security/local_policy.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/security/trusted.libraries b/android/tools/jdk-osx/jre/lib/security/trusted.libraries
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/security/trusted.libraries
rename to android/tools/jdk-osx/jre/lib/security/trusted.libraries
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/server/Xusage.txt b/android/tools/jdk-osx/jre/lib/server/Xusage.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/server/Xusage.txt
rename to android/tools/jdk-osx/jre/lib/server/Xusage.txt
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/server/libjsig.dylib b/android/tools/jdk-osx/jre/lib/server/libjsig.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/server/libjsig.dylib
rename to android/tools/jdk-osx/jre/lib/server/libjsig.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/server/libjvm.dylib b/android/tools/jdk-osx/jre/lib/server/libjvm.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/server/libjvm.dylib
rename to android/tools/jdk-osx/jre/lib/server/libjvm.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/sound.properties b/android/tools/jdk-osx/jre/lib/sound.properties
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/sound.properties
rename to android/tools/jdk-osx/jre/lib/sound.properties
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/testlibjfxwebkit.dylib b/android/tools/jdk-osx/jre/lib/testlibjfxwebkit.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/testlibjfxwebkit.dylib
rename to android/tools/jdk-osx/jre/lib/testlibjfxwebkit.dylib
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/jre/lib/tzdb.dat b/android/tools/jdk-osx/jre/lib/tzdb.dat
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/jre/lib/tzdb.dat
rename to android/tools/jdk-osx/jre/lib/tzdb.dat
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/lib/ant-javafx.jar b/android/tools/jdk-osx/lib/ant-javafx.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/lib/ant-javafx.jar
rename to android/tools/jdk-osx/lib/ant-javafx.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/lib/ct.sym b/android/tools/jdk-osx/lib/ct.sym
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/lib/ct.sym
rename to android/tools/jdk-osx/lib/ct.sym
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/lib/dt.jar b/android/tools/jdk-osx/lib/dt.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/lib/dt.jar
rename to android/tools/jdk-osx/lib/dt.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/lib/ir.idl b/android/tools/jdk-osx/lib/ir.idl
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/lib/ir.idl
rename to android/tools/jdk-osx/lib/ir.idl
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/lib/javafx-mx.jar b/android/tools/jdk-osx/lib/javafx-mx.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/lib/javafx-mx.jar
rename to android/tools/jdk-osx/lib/javafx-mx.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/lib/jconsole.jar b/android/tools/jdk-osx/lib/jconsole.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/lib/jconsole.jar
rename to android/tools/jdk-osx/lib/jconsole.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/lib/orb.idl b/android/tools/jdk-osx/lib/orb.idl
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/lib/orb.idl
rename to android/tools/jdk-osx/lib/orb.idl
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/lib/packager.jar b/android/tools/jdk-osx/lib/packager.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/lib/packager.jar
rename to android/tools/jdk-osx/lib/packager.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/lib/sa-jdi.jar b/android/tools/jdk-osx/lib/sa-jdi.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/lib/sa-jdi.jar
rename to android/tools/jdk-osx/lib/sa-jdi.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/lib/tools.jar b/android/tools/jdk-osx/lib/tools.jar
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/lib/tools.jar
rename to android/tools/jdk-osx/lib/tools.jar
diff --git a/StartGamedev-160604-osx/tools/jdk-osx/release b/android/tools/jdk-osx/release
similarity index 100%
rename from StartGamedev-160604-osx/tools/jdk-osx/release
rename to android/tools/jdk-osx/release
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/.classpath b/android/tools/love-android-sdl2/.classpath
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/.classpath
rename to android/tools/love-android-sdl2/.classpath
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/.project b/android/tools/love-android-sdl2/.project
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/.project
rename to android/tools/love-android-sdl2/.project
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/AndroidManifest.xml b/android/tools/love-android-sdl2/AndroidManifest.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/AndroidManifest.xml
rename to android/tools/love-android-sdl2/AndroidManifest.xml
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/README.md b/android/tools/love-android-sdl2/README.md
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/README.md
rename to android/tools/love-android-sdl2/README.md
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/ant.properties b/android/tools/love-android-sdl2/ant.properties
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/ant.properties
rename to android/tools/love-android-sdl2/ant.properties
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/assets/game.love b/android/tools/love-android-sdl2/assets/game.love
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/assets/game.love
rename to android/tools/love-android-sdl2/assets/game.love
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/AndroidManifest.xml b/android/tools/love-android-sdl2/bin/AndroidManifest.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/AndroidManifest.xml
rename to android/tools/love-android-sdl2/bin/AndroidManifest.xml
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/AndroidManifest.xml.d b/android/tools/love-android-sdl2/bin/AndroidManifest.xml.d
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/AndroidManifest.xml.d
rename to android/tools/love-android-sdl2/bin/AndroidManifest.xml.d
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/build.prop b/android/tools/love-android-sdl2/bin/build.prop
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/build.prop
rename to android/tools/love-android-sdl2/bin/build.prop
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes.dex b/android/tools/love-android-sdl2/bin/classes.dex
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes.dex
rename to android/tools/love-android-sdl2/bin/classes.dex
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes.dex.d b/android/tools/love-android-sdl2/bin/classes.dex.d
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes.dex.d
rename to android/tools/love-android-sdl2/bin/classes.dex.d
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104181206/BuildConfig.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1104181206/BuildConfig.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104181206/BuildConfig.class
rename to android/tools/love-android-sdl2/bin/classes/love/to/android1104181206/BuildConfig.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104181206/LtaActivity.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1104181206/LtaActivity.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104181206/LtaActivity.class
rename to android/tools/love-android-sdl2/bin/classes/love/to/android1104181206/LtaActivity.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104181206/R$attr.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1104181206/R$attr.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104181206/R$attr.class
rename to android/tools/love-android-sdl2/bin/classes/love/to/android1104181206/R$attr.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104181206/R$drawable.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1104181206/R$drawable.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104181206/R$drawable.class
rename to android/tools/love-android-sdl2/bin/classes/love/to/android1104181206/R$drawable.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104181206/R.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1104181206/R.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104181206/R.class
rename to android/tools/love-android-sdl2/bin/classes/love/to/android1104181206/R.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/DummyEdit.class b/android/tools/love-android-sdl2/bin/classes/org/libsdl/app/DummyEdit.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/DummyEdit.class
rename to android/tools/love-android-sdl2/bin/classes/org/libsdl/app/DummyEdit.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$1.class b/android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$1.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$1.class
rename to android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$1.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$2.class b/android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$2.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$2.class
rename to android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$2.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$3.class b/android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$3.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$3.class
rename to android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$3.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$4.class b/android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$4.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$4.class
rename to android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$4.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$5.class b/android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$5.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$5.class
rename to android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$5.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$6.class b/android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$6.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$6.class
rename to android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$6.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$SDLCommandHandler.class b/android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$SDLCommandHandler.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$SDLCommandHandler.class
rename to android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$SDLCommandHandler.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$ShowTextInputTask.class b/android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$ShowTextInputTask.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$ShowTextInputTask.class
rename to android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$ShowTextInputTask.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity.class b/android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity.class
rename to android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLGenericMotionListener_API12.class b/android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLGenericMotionListener_API12.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLGenericMotionListener_API12.class
rename to android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLGenericMotionListener_API12.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLInputConnection.class b/android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLInputConnection.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLInputConnection.class
rename to android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLInputConnection.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLJoystickHandler.class b/android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLJoystickHandler.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLJoystickHandler.class
rename to android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLJoystickHandler.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLJoystickHandler_API12$RangeComparator.class b/android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLJoystickHandler_API12$RangeComparator.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLJoystickHandler_API12$RangeComparator.class
rename to android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLJoystickHandler_API12$RangeComparator.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLJoystickHandler_API12$SDLJoystick.class b/android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLJoystickHandler_API12$SDLJoystick.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLJoystickHandler_API12$SDLJoystick.class
rename to android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLJoystickHandler_API12$SDLJoystick.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLJoystickHandler_API12.class b/android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLJoystickHandler_API12.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLJoystickHandler_API12.class
rename to android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLJoystickHandler_API12.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLMain.class b/android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLMain.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLMain.class
rename to android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLMain.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLSurface$1.class b/android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLSurface$1.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLSurface$1.class
rename to android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLSurface$1.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLSurface.class b/android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLSurface.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLSurface.class
rename to android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLSurface.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/love2d/android/DownloadActivity.class b/android/tools/love-android-sdl2/bin/classes/org/love2d/android/DownloadActivity.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/love2d/android/DownloadActivity.class
rename to android/tools/love-android-sdl2/bin/classes/org/love2d/android/DownloadActivity.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/love2d/android/DownloadRequestSettings_API11.class b/android/tools/love-android-sdl2/bin/classes/org/love2d/android/DownloadRequestSettings_API11.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/love2d/android/DownloadRequestSettings_API11.class
rename to android/tools/love-android-sdl2/bin/classes/org/love2d/android/DownloadRequestSettings_API11.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/love2d/android/DownloadService$1.class b/android/tools/love-android-sdl2/bin/classes/org/love2d/android/DownloadService$1.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/love2d/android/DownloadService$1.class
rename to android/tools/love-android-sdl2/bin/classes/org/love2d/android/DownloadService$1.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/love2d/android/DownloadService.class b/android/tools/love-android-sdl2/bin/classes/org/love2d/android/DownloadService.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/love2d/android/DownloadService.class
rename to android/tools/love-android-sdl2/bin/classes/org/love2d/android/DownloadService.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/love2d/android/GameActivity$1.class b/android/tools/love-android-sdl2/bin/classes/org/love2d/android/GameActivity$1.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/love2d/android/GameActivity$1.class
rename to android/tools/love-android-sdl2/bin/classes/org/love2d/android/GameActivity$1.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/love2d/android/GameActivity.class b/android/tools/love-android-sdl2/bin/classes/org/love2d/android/GameActivity.class
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/love2d/android/GameActivity.class
rename to android/tools/love-android-sdl2/bin/classes/org/love2d/android/GameActivity.class
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/love_android_sdl2-debug-unaligned.apk b/android/tools/love-android-sdl2/bin/love_android_sdl2-debug-unaligned.apk
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/love_android_sdl2-debug-unaligned.apk
rename to android/tools/love-android-sdl2/bin/love_android_sdl2-debug-unaligned.apk
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/love_android_sdl2-debug-unaligned.apk.d b/android/tools/love-android-sdl2/bin/love_android_sdl2-debug-unaligned.apk.d
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/love_android_sdl2-debug-unaligned.apk.d
rename to android/tools/love-android-sdl2/bin/love_android_sdl2-debug-unaligned.apk.d
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/love_android_sdl2-debug.apk b/android/tools/love-android-sdl2/bin/love_android_sdl2-debug.apk
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/love_android_sdl2-debug.apk
rename to android/tools/love-android-sdl2/bin/love_android_sdl2-debug.apk
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/love_android_sdl2.ap_ b/android/tools/love-android-sdl2/bin/love_android_sdl2.ap_
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/love_android_sdl2.ap_
rename to android/tools/love-android-sdl2/bin/love_android_sdl2.ap_
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/love_android_sdl2.ap_.d b/android/tools/love-android-sdl2/bin/love_android_sdl2.ap_.d
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/love_android_sdl2.ap_.d
rename to android/tools/love-android-sdl2/bin/love_android_sdl2.ap_.d
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/proguard.txt b/android/tools/love-android-sdl2/bin/proguard.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/proguard.txt
rename to android/tools/love-android-sdl2/bin/proguard.txt
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/res/drawable-xxhdpi/ic_launcher.png b/android/tools/love-android-sdl2/bin/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/res/drawable-xxhdpi/ic_launcher.png
rename to android/tools/love-android-sdl2/bin/res/drawable-xxhdpi/ic_launcher.png
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/build.properties b/android/tools/love-android-sdl2/build.properties
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/build.properties
rename to android/tools/love-android-sdl2/build.properties
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/build.xml b/android/tools/love-android-sdl2/build.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/build.xml
rename to android/tools/love-android-sdl2/build.xml
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/default.properties b/android/tools/love-android-sdl2/default.properties
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/default.properties
rename to android/tools/love-android-sdl2/default.properties
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/gen/R.java.d b/android/tools/love-android-sdl2/gen/R.java.d
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/gen/R.java.d
rename to android/tools/love-android-sdl2/gen/R.java.d
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1104181206/BuildConfig.java b/android/tools/love-android-sdl2/gen/love/to/android1104181206/BuildConfig.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1104181206/BuildConfig.java
rename to android/tools/love-android-sdl2/gen/love/to/android1104181206/BuildConfig.java
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1104181206/R.java b/android/tools/love-android-sdl2/gen/love/to/android1104181206/R.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1104181206/R.java
rename to android/tools/love-android-sdl2/gen/love/to/android1104181206/R.java
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/libs/armeabi-v7a/libgnustl_shared.so b/android/tools/love-android-sdl2/libs/armeabi-v7a/libgnustl_shared.so
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/libs/armeabi-v7a/libgnustl_shared.so
rename to android/tools/love-android-sdl2/libs/armeabi-v7a/libgnustl_shared.so
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/libs/armeabi-v7a/liblove.so b/android/tools/love-android-sdl2/libs/armeabi-v7a/liblove.so
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/libs/armeabi-v7a/liblove.so
rename to android/tools/love-android-sdl2/libs/armeabi-v7a/liblove.so
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/libs/armeabi-v7a/libmpg123.so b/android/tools/love-android-sdl2/libs/armeabi-v7a/libmpg123.so
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/libs/armeabi-v7a/libmpg123.so
rename to android/tools/love-android-sdl2/libs/armeabi-v7a/libmpg123.so
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/libs/armeabi-v7a/libopenal.so b/android/tools/love-android-sdl2/libs/armeabi-v7a/libopenal.so
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/libs/armeabi-v7a/libopenal.so
rename to android/tools/love-android-sdl2/libs/armeabi-v7a/libopenal.so
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/libs/armeabi/libgnustl_shared.so b/android/tools/love-android-sdl2/libs/armeabi/libgnustl_shared.so
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/libs/armeabi/libgnustl_shared.so
rename to android/tools/love-android-sdl2/libs/armeabi/libgnustl_shared.so
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/libs/armeabi/liblove.so b/android/tools/love-android-sdl2/libs/armeabi/liblove.so
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/libs/armeabi/liblove.so
rename to android/tools/love-android-sdl2/libs/armeabi/liblove.so
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/libs/armeabi/libmpg123.so b/android/tools/love-android-sdl2/libs/armeabi/libmpg123.so
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/libs/armeabi/libmpg123.so
rename to android/tools/love-android-sdl2/libs/armeabi/libmpg123.so
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/libs/armeabi/libopenal.so b/android/tools/love-android-sdl2/libs/armeabi/libopenal.so
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/libs/armeabi/libopenal.so
rename to android/tools/love-android-sdl2/libs/armeabi/libopenal.so
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/original/AndroidManifest.xml b/android/tools/love-android-sdl2/original/AndroidManifest.xml
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/original/AndroidManifest.xml
rename to android/tools/love-android-sdl2/original/AndroidManifest.xml
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/original/love/to/android/LtaActivity.java b/android/tools/love-android-sdl2/original/love/to/android/LtaActivity.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/original/love/to/android/LtaActivity.java
rename to android/tools/love-android-sdl2/original/love/to/android/LtaActivity.java
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/project.properties b/android/tools/love-android-sdl2/project.properties
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/project.properties
rename to android/tools/love-android-sdl2/project.properties
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/res/drawable-xxhdpi/ic_launcher.png b/android/tools/love-android-sdl2/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/res/drawable-xxhdpi/ic_launcher.png
rename to android/tools/love-android-sdl2/res/drawable-xxhdpi/ic_launcher.png
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/src/love/to/android1104181206/LtaActivity.java b/android/tools/love-android-sdl2/src/love/to/android1104181206/LtaActivity.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/src/love/to/android1104181206/LtaActivity.java
rename to android/tools/love-android-sdl2/src/love/to/android1104181206/LtaActivity.java
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/src/org/libsdl/app/SDLActivity.java b/android/tools/love-android-sdl2/src/org/libsdl/app/SDLActivity.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/src/org/libsdl/app/SDLActivity.java
rename to android/tools/love-android-sdl2/src/org/libsdl/app/SDLActivity.java
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/src/org/love2d/android/DownloadActivity.java b/android/tools/love-android-sdl2/src/org/love2d/android/DownloadActivity.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/src/org/love2d/android/DownloadActivity.java
rename to android/tools/love-android-sdl2/src/org/love2d/android/DownloadActivity.java
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/src/org/love2d/android/DownloadService.java b/android/tools/love-android-sdl2/src/org/love2d/android/DownloadService.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/src/org/love2d/android/DownloadService.java
rename to android/tools/love-android-sdl2/src/org/love2d/android/DownloadService.java
diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/src/org/love2d/android/GameActivity.java b/android/tools/love-android-sdl2/src/org/love2d/android/GameActivity.java
similarity index 100%
rename from StartGamedev-160604-osx/tools/love-android-sdl2/src/org/love2d/android/GameActivity.java
rename to android/tools/love-android-sdl2/src/org/love2d/android/GameActivity.java
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/FreeType b/android/tools/love.app/Contents/Frameworks/FreeType.framework/FreeType
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/FreeType
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/FreeType
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/config/ftconfig.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/config/ftconfig.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/config/ftconfig.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/config/ftconfig.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/config/ftheader.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/config/ftheader.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/config/ftheader.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/config/ftheader.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/config/ftmodule.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/config/ftmodule.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/config/ftmodule.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/config/ftmodule.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/config/ftoption.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/config/ftoption.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/config/ftoption.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/config/ftoption.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/config/ftstdlib.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/config/ftstdlib.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/config/ftstdlib.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/config/ftstdlib.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/freetype.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/freetype.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/freetype.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/freetype.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ft2build.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ft2build.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ft2build.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ft2build.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftadvanc.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftadvanc.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftadvanc.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftadvanc.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftautoh.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftautoh.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftautoh.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftautoh.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftbbox.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftbbox.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftbbox.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftbbox.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftbdf.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftbdf.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftbdf.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftbdf.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftbitmap.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftbitmap.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftbitmap.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftbitmap.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftbzip2.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftbzip2.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftbzip2.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftbzip2.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftcache.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftcache.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftcache.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftcache.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftcffdrv.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftcffdrv.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftcffdrv.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftcffdrv.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftchapters.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftchapters.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftchapters.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftchapters.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftcid.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftcid.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftcid.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftcid.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/fterrdef.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/fterrdef.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/fterrdef.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/fterrdef.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/fterrors.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/fterrors.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/fterrors.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/fterrors.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftfntfmt.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftfntfmt.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftfntfmt.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftfntfmt.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftgasp.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftgasp.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftgasp.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftgasp.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftglyph.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftglyph.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftglyph.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftglyph.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftgxval.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftgxval.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftgxval.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftgxval.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftgzip.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftgzip.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftgzip.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftgzip.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftimage.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftimage.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftimage.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftimage.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftincrem.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftincrem.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftincrem.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftincrem.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftlcdfil.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftlcdfil.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftlcdfil.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftlcdfil.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftlist.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftlist.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftlist.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftlist.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftlzw.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftlzw.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftlzw.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftlzw.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftmac.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftmac.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftmac.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftmac.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftmm.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftmm.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftmm.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftmm.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftmodapi.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftmodapi.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftmodapi.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftmodapi.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftmoderr.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftmoderr.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftmoderr.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftmoderr.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftotval.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftotval.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftotval.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftotval.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftoutln.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftoutln.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftoutln.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftoutln.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftpfr.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftpfr.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftpfr.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftpfr.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftrender.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftrender.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftrender.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftrender.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftsizes.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftsizes.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftsizes.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftsizes.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftsnames.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftsnames.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftsnames.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftsnames.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftstroke.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftstroke.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftstroke.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftstroke.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftsynth.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftsynth.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftsynth.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftsynth.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftsystem.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftsystem.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftsystem.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftsystem.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/fttrigon.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/fttrigon.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/fttrigon.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/fttrigon.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftttdrv.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftttdrv.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftttdrv.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftttdrv.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/fttypes.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/fttypes.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/fttypes.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/fttypes.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftwinfnt.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftwinfnt.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftwinfnt.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ftwinfnt.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/t1tables.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/t1tables.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/t1tables.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/t1tables.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ttnameid.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ttnameid.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ttnameid.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ttnameid.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/tttables.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/tttables.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/tttables.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/tttables.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/tttags.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/tttags.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/tttags.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/tttags.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ttunpat.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ttunpat.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ttunpat.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Headers/ttunpat.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/FreeType b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/FreeType
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/FreeType
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/FreeType
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/config/ftconfig.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/config/ftconfig.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/config/ftconfig.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/config/ftconfig.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/config/ftheader.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/config/ftheader.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/config/ftheader.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/config/ftheader.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/config/ftmodule.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/config/ftmodule.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/config/ftmodule.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/config/ftmodule.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/config/ftoption.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/config/ftoption.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/config/ftoption.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/config/ftoption.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/config/ftstdlib.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/config/ftstdlib.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/config/ftstdlib.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/config/ftstdlib.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/freetype.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/freetype.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/freetype.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/freetype.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ft2build.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ft2build.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ft2build.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ft2build.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftadvanc.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftadvanc.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftadvanc.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftadvanc.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftautoh.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftautoh.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftautoh.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftautoh.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftbbox.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftbbox.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftbbox.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftbbox.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftbdf.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftbdf.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftbdf.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftbdf.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftbitmap.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftbitmap.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftbitmap.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftbitmap.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftbzip2.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftbzip2.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftbzip2.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftbzip2.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftcache.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftcache.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftcache.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftcache.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftcffdrv.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftcffdrv.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftcffdrv.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftcffdrv.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftchapters.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftchapters.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftchapters.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftchapters.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftcid.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftcid.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftcid.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftcid.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/fterrdef.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/fterrdef.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/fterrdef.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/fterrdef.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/fterrors.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/fterrors.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/fterrors.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/fterrors.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftfntfmt.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftfntfmt.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftfntfmt.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftfntfmt.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftgasp.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftgasp.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftgasp.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftgasp.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftglyph.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftglyph.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftglyph.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftglyph.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftgxval.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftgxval.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftgxval.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftgxval.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftgzip.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftgzip.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftgzip.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftgzip.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftimage.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftimage.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftimage.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftimage.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftincrem.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftincrem.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftincrem.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftincrem.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftlcdfil.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftlcdfil.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftlcdfil.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftlcdfil.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftlist.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftlist.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftlist.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftlist.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftlzw.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftlzw.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftlzw.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftlzw.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftmac.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftmac.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftmac.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftmac.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftmm.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftmm.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftmm.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftmm.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftmodapi.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftmodapi.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftmodapi.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftmodapi.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftmoderr.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftmoderr.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftmoderr.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftmoderr.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftotval.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftotval.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftotval.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftotval.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftoutln.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftoutln.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftoutln.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftoutln.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftpfr.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftpfr.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftpfr.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftpfr.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftrender.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftrender.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftrender.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftrender.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftsizes.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftsizes.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftsizes.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftsizes.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftsnames.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftsnames.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftsnames.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftsnames.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftstroke.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftstroke.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftstroke.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftstroke.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftsynth.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftsynth.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftsynth.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftsynth.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftsystem.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftsystem.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftsystem.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftsystem.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/fttrigon.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/fttrigon.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/fttrigon.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/fttrigon.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftttdrv.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftttdrv.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftttdrv.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftttdrv.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/fttypes.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/fttypes.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/fttypes.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/fttypes.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftwinfnt.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftwinfnt.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftwinfnt.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ftwinfnt.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/t1tables.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/t1tables.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/t1tables.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/t1tables.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ttnameid.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ttnameid.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ttnameid.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ttnameid.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/tttables.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/tttables.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/tttables.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/tttables.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/tttags.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/tttags.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/tttags.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/tttags.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ttunpat.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ttunpat.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ttunpat.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Headers/ttunpat.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/A/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/FreeType b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/FreeType
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/FreeType
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/FreeType
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/config/ftconfig.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/config/ftconfig.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/config/ftconfig.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/config/ftconfig.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/config/ftheader.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/config/ftheader.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/config/ftheader.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/config/ftheader.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/config/ftmodule.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/config/ftmodule.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/config/ftmodule.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/config/ftmodule.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/config/ftoption.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/config/ftoption.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/config/ftoption.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/config/ftoption.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/config/ftstdlib.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/config/ftstdlib.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/config/ftstdlib.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/config/ftstdlib.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/freetype.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/freetype.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/freetype.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/freetype.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ft2build.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ft2build.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ft2build.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ft2build.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftadvanc.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftadvanc.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftadvanc.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftadvanc.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftautoh.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftautoh.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftautoh.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftautoh.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftbbox.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftbbox.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftbbox.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftbbox.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftbdf.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftbdf.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftbdf.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftbdf.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftbitmap.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftbitmap.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftbitmap.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftbitmap.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftbzip2.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftbzip2.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftbzip2.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftbzip2.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftcache.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftcache.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftcache.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftcache.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftcffdrv.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftcffdrv.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftcffdrv.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftcffdrv.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftchapters.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftchapters.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftchapters.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftchapters.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftcid.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftcid.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftcid.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftcid.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/fterrdef.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/fterrdef.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/fterrdef.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/fterrdef.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/fterrors.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/fterrors.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/fterrors.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/fterrors.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftfntfmt.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftfntfmt.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftfntfmt.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftfntfmt.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftgasp.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftgasp.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftgasp.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftgasp.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftglyph.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftglyph.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftglyph.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftglyph.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftgxval.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftgxval.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftgxval.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftgxval.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftgzip.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftgzip.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftgzip.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftgzip.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftimage.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftimage.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftimage.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftimage.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftincrem.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftincrem.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftincrem.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftincrem.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftlcdfil.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftlcdfil.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftlcdfil.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftlcdfil.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftlist.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftlist.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftlist.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftlist.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftlzw.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftlzw.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftlzw.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftlzw.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftmac.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftmac.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftmac.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftmac.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftmm.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftmm.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftmm.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftmm.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftmodapi.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftmodapi.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftmodapi.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftmodapi.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftmoderr.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftmoderr.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftmoderr.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftmoderr.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftotval.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftotval.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftotval.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftotval.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftoutln.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftoutln.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftoutln.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftoutln.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftpfr.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftpfr.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftpfr.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftpfr.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftrender.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftrender.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftrender.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftrender.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftsizes.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftsizes.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftsizes.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftsizes.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftsnames.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftsnames.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftsnames.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftsnames.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftstroke.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftstroke.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftstroke.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftstroke.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftsynth.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftsynth.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftsynth.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftsynth.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftsystem.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftsystem.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftsystem.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftsystem.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/fttrigon.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/fttrigon.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/fttrigon.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/fttrigon.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftttdrv.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftttdrv.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftttdrv.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftttdrv.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/fttypes.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/fttypes.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/fttypes.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/fttypes.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftwinfnt.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftwinfnt.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftwinfnt.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ftwinfnt.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/t1tables.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/t1tables.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/t1tables.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/t1tables.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ttnameid.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ttnameid.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ttnameid.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ttnameid.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/tttables.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/tttables.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/tttables.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/tttables.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/tttags.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/tttags.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/tttags.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/tttags.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ttunpat.h b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ttunpat.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ttunpat.h
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Headers/ttunpat.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/FreeType.framework/Versions/Current/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Headers/lauxlib.h b/android/tools/love.app/Contents/Frameworks/Lua.framework/Headers/lauxlib.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Headers/lauxlib.h
rename to android/tools/love.app/Contents/Frameworks/Lua.framework/Headers/lauxlib.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Headers/lua.h b/android/tools/love.app/Contents/Frameworks/Lua.framework/Headers/lua.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Headers/lua.h
rename to android/tools/love.app/Contents/Frameworks/Lua.framework/Headers/lua.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Headers/lua.hpp b/android/tools/love.app/Contents/Frameworks/Lua.framework/Headers/lua.hpp
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Headers/lua.hpp
rename to android/tools/love.app/Contents/Frameworks/Lua.framework/Headers/lua.hpp
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Headers/luaconf.h b/android/tools/love.app/Contents/Frameworks/Lua.framework/Headers/luaconf.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Headers/luaconf.h
rename to android/tools/love.app/Contents/Frameworks/Lua.framework/Headers/luaconf.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Headers/luajit.h b/android/tools/love.app/Contents/Frameworks/Lua.framework/Headers/luajit.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Headers/luajit.h
rename to android/tools/love.app/Contents/Frameworks/Lua.framework/Headers/luajit.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Headers/lualib.h b/android/tools/love.app/Contents/Frameworks/Lua.framework/Headers/lualib.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Headers/lualib.h
rename to android/tools/love.app/Contents/Frameworks/Lua.framework/Headers/lualib.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Lua b/android/tools/love.app/Contents/Frameworks/Lua.framework/Lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Lua
rename to android/tools/love.app/Contents/Frameworks/Lua.framework/Lua
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/Lua.framework/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/Lua.framework/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Resources/en.lproj/InfoPlist.strings b/android/tools/love.app/Contents/Frameworks/Lua.framework/Resources/en.lproj/InfoPlist.strings
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Resources/en.lproj/InfoPlist.strings
rename to android/tools/love.app/Contents/Frameworks/Lua.framework/Resources/en.lproj/InfoPlist.strings
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Headers/lauxlib.h b/android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Headers/lauxlib.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Headers/lauxlib.h
rename to android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Headers/lauxlib.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Headers/lua.h b/android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Headers/lua.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Headers/lua.h
rename to android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Headers/lua.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Headers/lua.hpp b/android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Headers/lua.hpp
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Headers/lua.hpp
rename to android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Headers/lua.hpp
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Headers/luaconf.h b/android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Headers/luaconf.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Headers/luaconf.h
rename to android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Headers/luaconf.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Headers/luajit.h b/android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Headers/luajit.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Headers/luajit.h
rename to android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Headers/luajit.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Headers/lualib.h b/android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Headers/lualib.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Headers/lualib.h
rename to android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Headers/lualib.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Lua b/android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Lua
rename to android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Lua
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Resources/en.lproj/InfoPlist.strings b/android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Resources/en.lproj/InfoPlist.strings
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Resources/en.lproj/InfoPlist.strings
rename to android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/A/Resources/en.lproj/InfoPlist.strings
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Headers/lauxlib.h b/android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Headers/lauxlib.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Headers/lauxlib.h
rename to android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Headers/lauxlib.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Headers/lua.h b/android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Headers/lua.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Headers/lua.h
rename to android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Headers/lua.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Headers/lua.hpp b/android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Headers/lua.hpp
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Headers/lua.hpp
rename to android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Headers/lua.hpp
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Headers/luaconf.h b/android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Headers/luaconf.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Headers/luaconf.h
rename to android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Headers/luaconf.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Headers/luajit.h b/android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Headers/luajit.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Headers/luajit.h
rename to android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Headers/luajit.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Headers/lualib.h b/android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Headers/lualib.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Headers/lualib.h
rename to android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Headers/lualib.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Lua b/android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Lua
rename to android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Lua
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Resources/en.lproj/InfoPlist.strings b/android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Resources/en.lproj/InfoPlist.strings
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Resources/en.lproj/InfoPlist.strings
rename to android/tools/love.app/Contents/Frameworks/Lua.framework/Versions/Current/Resources/en.lproj/InfoPlist.strings
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Headers/ogg.h b/android/tools/love.app/Contents/Frameworks/Ogg.framework/Headers/ogg.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Headers/ogg.h
rename to android/tools/love.app/Contents/Frameworks/Ogg.framework/Headers/ogg.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Headers/os_types.h b/android/tools/love.app/Contents/Frameworks/Ogg.framework/Headers/os_types.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Headers/os_types.h
rename to android/tools/love.app/Contents/Frameworks/Ogg.framework/Headers/os_types.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Ogg b/android/tools/love.app/Contents/Frameworks/Ogg.framework/Ogg
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Ogg
rename to android/tools/love.app/Contents/Frameworks/Ogg.framework/Ogg
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Resources/English.lproj/InfoPlist.strings b/android/tools/love.app/Contents/Frameworks/Ogg.framework/Resources/English.lproj/InfoPlist.strings
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Resources/English.lproj/InfoPlist.strings
rename to android/tools/love.app/Contents/Frameworks/Ogg.framework/Resources/English.lproj/InfoPlist.strings
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/Ogg.framework/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/Ogg.framework/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/A/Headers/ogg.h b/android/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/A/Headers/ogg.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/A/Headers/ogg.h
rename to android/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/A/Headers/ogg.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/A/Headers/os_types.h b/android/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/A/Headers/os_types.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/A/Headers/os_types.h
rename to android/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/A/Headers/os_types.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/A/Ogg b/android/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/A/Ogg
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/A/Ogg
rename to android/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/A/Ogg
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/A/Resources/English.lproj/InfoPlist.strings b/android/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/A/Resources/English.lproj/InfoPlist.strings
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/A/Resources/English.lproj/InfoPlist.strings
rename to android/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/A/Resources/English.lproj/InfoPlist.strings
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/A/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/A/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/A/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/A/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/Current/Headers/ogg.h b/android/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/Current/Headers/ogg.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/Current/Headers/ogg.h
rename to android/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/Current/Headers/ogg.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/Current/Headers/os_types.h b/android/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/Current/Headers/os_types.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/Current/Headers/os_types.h
rename to android/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/Current/Headers/os_types.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/Current/Ogg b/android/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/Current/Ogg
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/Current/Ogg
rename to android/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/Current/Ogg
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/Current/Resources/English.lproj/InfoPlist.strings b/android/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/Current/Resources/English.lproj/InfoPlist.strings
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/Current/Resources/English.lproj/InfoPlist.strings
rename to android/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/Current/Resources/English.lproj/InfoPlist.strings
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/Current/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/Current/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/Current/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/Ogg.framework/Versions/Current/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Headers/al.h b/android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Headers/al.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Headers/al.h
rename to android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Headers/al.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Headers/alc.h b/android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Headers/alc.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Headers/alc.h
rename to android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Headers/alc.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Headers/alext.h b/android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Headers/alext.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Headers/alext.h
rename to android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Headers/alext.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Headers/efx-creative.h b/android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Headers/efx-creative.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Headers/efx-creative.h
rename to android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Headers/efx-creative.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Headers/efx-presets.h b/android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Headers/efx-presets.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Headers/efx-presets.h
rename to android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Headers/efx-presets.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Headers/efx.h b/android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Headers/efx.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Headers/efx.h
rename to android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Headers/efx.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/OpenAL-Soft b/android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/OpenAL-Soft
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/OpenAL-Soft
rename to android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/OpenAL-Soft
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Resources/en.lproj/InfoPlist.strings b/android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Resources/en.lproj/InfoPlist.strings
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Resources/en.lproj/InfoPlist.strings
rename to android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Resources/en.lproj/InfoPlist.strings
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Headers/al.h b/android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Headers/al.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Headers/al.h
rename to android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Headers/al.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Headers/alc.h b/android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Headers/alc.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Headers/alc.h
rename to android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Headers/alc.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Headers/alext.h b/android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Headers/alext.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Headers/alext.h
rename to android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Headers/alext.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Headers/efx-creative.h b/android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Headers/efx-creative.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Headers/efx-creative.h
rename to android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Headers/efx-creative.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Headers/efx-presets.h b/android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Headers/efx-presets.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Headers/efx-presets.h
rename to android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Headers/efx-presets.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Headers/efx.h b/android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Headers/efx.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Headers/efx.h
rename to android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Headers/efx.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/OpenAL-Soft b/android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/OpenAL-Soft
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/OpenAL-Soft
rename to android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/OpenAL-Soft
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Resources/en.lproj/InfoPlist.strings b/android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Resources/en.lproj/InfoPlist.strings
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Resources/en.lproj/InfoPlist.strings
rename to android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/A/Resources/en.lproj/InfoPlist.strings
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Headers/al.h b/android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Headers/al.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Headers/al.h
rename to android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Headers/al.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Headers/alc.h b/android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Headers/alc.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Headers/alc.h
rename to android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Headers/alc.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Headers/alext.h b/android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Headers/alext.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Headers/alext.h
rename to android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Headers/alext.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Headers/efx-creative.h b/android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Headers/efx-creative.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Headers/efx-creative.h
rename to android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Headers/efx-creative.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Headers/efx-presets.h b/android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Headers/efx-presets.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Headers/efx-presets.h
rename to android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Headers/efx-presets.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Headers/efx.h b/android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Headers/efx.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Headers/efx.h
rename to android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Headers/efx.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/OpenAL-Soft b/android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/OpenAL-Soft
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/OpenAL-Soft
rename to android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/OpenAL-Soft
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Resources/en.lproj/InfoPlist.strings b/android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Resources/en.lproj/InfoPlist.strings
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Resources/en.lproj/InfoPlist.strings
rename to android/tools/love.app/Contents/Frameworks/OpenAL-Soft.framework/Versions/Current/Resources/en.lproj/InfoPlist.strings
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_assert.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_assert.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_assert.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_assert.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_atomic.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_atomic.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_atomic.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_atomic.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_audio.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_audio.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_audio.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_audio.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_bits.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_bits.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_bits.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_bits.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_blendmode.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_blendmode.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_blendmode.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_blendmode.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_clipboard.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_clipboard.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_clipboard.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_clipboard.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_config.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_config.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_config.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_config.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_config_macosx.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_config_macosx.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_config_macosx.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_config_macosx.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_copying.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_copying.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_copying.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_copying.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_cpuinfo.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_cpuinfo.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_cpuinfo.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_cpuinfo.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_endian.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_endian.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_endian.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_endian.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_error.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_error.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_error.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_error.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_events.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_events.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_events.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_events.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_filesystem.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_filesystem.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_filesystem.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_filesystem.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_gamecontroller.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_gamecontroller.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_gamecontroller.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_gamecontroller.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_gesture.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_gesture.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_gesture.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_gesture.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_haptic.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_haptic.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_haptic.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_haptic.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_hints.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_hints.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_hints.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_hints.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_joystick.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_joystick.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_joystick.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_joystick.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_keyboard.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_keyboard.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_keyboard.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_keyboard.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_keycode.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_keycode.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_keycode.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_keycode.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_loadso.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_loadso.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_loadso.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_loadso.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_log.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_log.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_log.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_log.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_main.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_main.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_main.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_main.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_messagebox.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_messagebox.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_messagebox.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_messagebox.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_mouse.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_mouse.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_mouse.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_mouse.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_mutex.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_mutex.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_mutex.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_mutex.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_name.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_name.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_name.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_name.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengl.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengl.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengl.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengl.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengl_glext.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengl_glext.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengl_glext.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengl_glext.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengles.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengles.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengles.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengles.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengles2.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengles2.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengles2.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengles2.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengles2_gl2.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengles2_gl2.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengles2_gl2.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengles2_gl2.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengles2_gl2ext.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengles2_gl2ext.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengles2_gl2ext.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengles2_gl2ext.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengles2_gl2platform.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengles2_gl2platform.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengles2_gl2platform.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengles2_gl2platform.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengles2_khrplatform.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengles2_khrplatform.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengles2_khrplatform.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_opengles2_khrplatform.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_pixels.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_pixels.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_pixels.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_pixels.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_platform.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_platform.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_platform.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_platform.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_power.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_power.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_power.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_power.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_quit.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_quit.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_quit.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_quit.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_rect.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_rect.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_rect.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_rect.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_render.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_render.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_render.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_render.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_revision.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_revision.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_revision.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_revision.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_rwops.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_rwops.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_rwops.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_rwops.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_scancode.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_scancode.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_scancode.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_scancode.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_shape.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_shape.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_shape.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_shape.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_stdinc.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_stdinc.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_stdinc.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_stdinc.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_surface.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_surface.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_surface.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_surface.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_system.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_system.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_system.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_system.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_syswm.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_syswm.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_syswm.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_syswm.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_thread.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_thread.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_thread.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_thread.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_timer.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_timer.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_timer.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_timer.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_touch.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_touch.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_touch.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_touch.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_types.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_types.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_types.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_types.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_version.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_version.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_version.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_version.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_video.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_video.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_video.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/SDL_video.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/begin_code.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/begin_code.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/begin_code.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/begin_code.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/close_code.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/close_code.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/close_code.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Headers/close_code.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/SDL2 b/android/tools/love.app/Contents/Frameworks/SDL2.framework/SDL2
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/SDL2
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/SDL2
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_assert.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_assert.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_assert.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_assert.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_atomic.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_atomic.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_atomic.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_atomic.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_audio.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_audio.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_audio.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_audio.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_bits.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_bits.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_bits.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_bits.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_blendmode.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_blendmode.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_blendmode.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_blendmode.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_clipboard.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_clipboard.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_clipboard.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_clipboard.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_copying.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_copying.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_copying.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_copying.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_endian.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_endian.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_endian.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_endian.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_error.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_error.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_error.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_error.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_events.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_events.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_events.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_events.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_filesystem.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_filesystem.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_filesystem.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_filesystem.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gesture.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gesture.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gesture.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gesture.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_haptic.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_haptic.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_haptic.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_haptic.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_hints.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_hints.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_hints.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_hints.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_joystick.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_joystick.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_joystick.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_joystick.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keyboard.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keyboard.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keyboard.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keyboard.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keycode.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keycode.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keycode.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keycode.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_loadso.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_loadso.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_loadso.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_loadso.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_log.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_log.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_log.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_log.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_main.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_main.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_main.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_main.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_messagebox.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_messagebox.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_messagebox.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_messagebox.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mouse.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mouse.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mouse.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mouse.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mutex.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mutex.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mutex.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mutex.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_name.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_name.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_name.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_name.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengl.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengl.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengl.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengl.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengl_glext.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengl_glext.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengl_glext.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengl_glext.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2ext.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2ext.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2ext.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2ext.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2platform.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2platform.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2platform.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2platform.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_khrplatform.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_khrplatform.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_khrplatform.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_khrplatform.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_pixels.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_pixels.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_pixels.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_pixels.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_platform.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_platform.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_platform.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_platform.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_power.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_power.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_power.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_power.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_quit.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_quit.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_quit.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_quit.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rect.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rect.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rect.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rect.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_render.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_render.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_render.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_render.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_revision.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_revision.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_revision.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_revision.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rwops.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rwops.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rwops.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rwops.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_scancode.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_scancode.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_scancode.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_scancode.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_shape.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_shape.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_shape.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_shape.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_stdinc.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_stdinc.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_stdinc.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_stdinc.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_surface.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_surface.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_surface.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_surface.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_system.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_system.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_system.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_system.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_syswm.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_syswm.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_syswm.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_syswm.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_thread.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_thread.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_thread.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_thread.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_timer.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_timer.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_timer.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_timer.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_touch.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_touch.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_touch.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_touch.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_types.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_types.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_types.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_types.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_version.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_version.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_version.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_version.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_video.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_video.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_video.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_video.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/begin_code.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/begin_code.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/begin_code.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/begin_code.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/close_code.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/close_code.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/close_code.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/close_code.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/SDL2 b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/SDL2
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/SDL2
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/A/SDL2
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_assert.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_assert.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_assert.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_assert.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_atomic.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_atomic.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_atomic.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_atomic.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_audio.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_audio.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_audio.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_audio.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_bits.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_bits.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_bits.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_bits.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_blendmode.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_blendmode.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_blendmode.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_blendmode.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_clipboard.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_clipboard.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_clipboard.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_clipboard.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_config.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_config.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_config.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_config.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_config_macosx.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_config_macosx.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_config_macosx.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_config_macosx.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_copying.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_copying.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_copying.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_copying.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_cpuinfo.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_cpuinfo.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_cpuinfo.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_cpuinfo.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_endian.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_endian.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_endian.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_endian.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_error.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_error.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_error.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_error.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_events.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_events.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_events.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_events.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_filesystem.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_filesystem.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_filesystem.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_filesystem.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_gamecontroller.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_gamecontroller.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_gamecontroller.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_gamecontroller.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_gesture.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_gesture.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_gesture.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_gesture.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_haptic.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_haptic.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_haptic.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_haptic.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_hints.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_hints.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_hints.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_hints.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_joystick.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_joystick.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_joystick.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_joystick.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_keyboard.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_keyboard.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_keyboard.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_keyboard.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_keycode.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_keycode.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_keycode.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_keycode.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_loadso.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_loadso.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_loadso.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_loadso.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_log.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_log.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_log.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_log.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_main.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_main.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_main.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_main.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_messagebox.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_messagebox.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_messagebox.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_messagebox.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_mouse.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_mouse.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_mouse.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_mouse.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_mutex.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_mutex.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_mutex.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_mutex.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_name.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_name.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_name.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_name.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengl.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengl.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengl.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengl.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengl_glext.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengl_glext.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengl_glext.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengl_glext.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengles.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengles.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengles.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengles.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengles2.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengles2.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengles2.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengles2.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengles2_gl2.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengles2_gl2.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengles2_gl2.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengles2_gl2.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengles2_gl2ext.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengles2_gl2ext.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengles2_gl2ext.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengles2_gl2ext.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengles2_gl2platform.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengles2_gl2platform.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengles2_gl2platform.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengles2_gl2platform.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengles2_khrplatform.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengles2_khrplatform.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengles2_khrplatform.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_opengles2_khrplatform.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_pixels.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_pixels.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_pixels.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_pixels.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_platform.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_platform.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_platform.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_platform.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_power.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_power.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_power.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_power.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_quit.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_quit.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_quit.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_quit.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_rect.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_rect.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_rect.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_rect.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_render.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_render.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_render.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_render.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_revision.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_revision.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_revision.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_revision.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_rwops.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_rwops.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_rwops.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_rwops.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_scancode.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_scancode.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_scancode.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_scancode.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_shape.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_shape.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_shape.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_shape.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_stdinc.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_stdinc.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_stdinc.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_stdinc.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_surface.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_surface.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_surface.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_surface.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_system.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_system.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_system.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_system.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_syswm.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_syswm.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_syswm.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_syswm.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_thread.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_thread.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_thread.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_thread.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_timer.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_timer.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_timer.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_timer.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_touch.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_touch.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_touch.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_touch.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_types.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_types.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_types.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_types.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_version.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_version.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_version.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_version.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_video.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_video.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_video.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_video.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/begin_code.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/begin_code.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/begin_code.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/begin_code.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/close_code.h b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/close_code.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/close_code.h
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/close_code.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/SDL2 b/android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/SDL2
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/SDL2
rename to android/tools/love.app/Contents/Frameworks/SDL2.framework/Versions/Current/SDL2
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Headers/codec.h b/android/tools/love.app/Contents/Frameworks/Theora.framework/Headers/codec.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Headers/codec.h
rename to android/tools/love.app/Contents/Frameworks/Theora.framework/Headers/codec.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Headers/theora.h b/android/tools/love.app/Contents/Frameworks/Theora.framework/Headers/theora.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Headers/theora.h
rename to android/tools/love.app/Contents/Frameworks/Theora.framework/Headers/theora.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Headers/theoradec.h b/android/tools/love.app/Contents/Frameworks/Theora.framework/Headers/theoradec.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Headers/theoradec.h
rename to android/tools/love.app/Contents/Frameworks/Theora.framework/Headers/theoradec.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Headers/theoraenc.h b/android/tools/love.app/Contents/Frameworks/Theora.framework/Headers/theoraenc.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Headers/theoraenc.h
rename to android/tools/love.app/Contents/Frameworks/Theora.framework/Headers/theoraenc.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Resources/English.lproj/InfoPlist.strings b/android/tools/love.app/Contents/Frameworks/Theora.framework/Resources/English.lproj/InfoPlist.strings
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Resources/English.lproj/InfoPlist.strings
rename to android/tools/love.app/Contents/Frameworks/Theora.framework/Resources/English.lproj/InfoPlist.strings
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/Theora.framework/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/Theora.framework/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Theora b/android/tools/love.app/Contents/Frameworks/Theora.framework/Theora
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Theora
rename to android/tools/love.app/Contents/Frameworks/Theora.framework/Theora
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Headers/codec.h b/android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Headers/codec.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Headers/codec.h
rename to android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Headers/codec.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Headers/theora.h b/android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Headers/theora.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Headers/theora.h
rename to android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Headers/theora.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Headers/theoradec.h b/android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Headers/theoradec.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Headers/theoradec.h
rename to android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Headers/theoradec.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Headers/theoraenc.h b/android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Headers/theoraenc.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Headers/theoraenc.h
rename to android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Headers/theoraenc.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Resources/English.lproj/InfoPlist.strings b/android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Resources/English.lproj/InfoPlist.strings
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Resources/English.lproj/InfoPlist.strings
rename to android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Resources/English.lproj/InfoPlist.strings
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Theora b/android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Theora
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Theora
rename to android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/A/Theora
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Headers/codec.h b/android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Headers/codec.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Headers/codec.h
rename to android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Headers/codec.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Headers/theora.h b/android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Headers/theora.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Headers/theora.h
rename to android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Headers/theora.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Headers/theoradec.h b/android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Headers/theoradec.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Headers/theoradec.h
rename to android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Headers/theoradec.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Headers/theoraenc.h b/android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Headers/theoraenc.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Headers/theoraenc.h
rename to android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Headers/theoraenc.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Resources/English.lproj/InfoPlist.strings b/android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Resources/English.lproj/InfoPlist.strings
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Resources/English.lproj/InfoPlist.strings
rename to android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Resources/English.lproj/InfoPlist.strings
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Theora b/android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Theora
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Theora
rename to android/tools/love.app/Contents/Frameworks/Theora.framework/Versions/Current/Theora
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Headers/codec.h b/android/tools/love.app/Contents/Frameworks/Vorbis.framework/Headers/codec.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Headers/codec.h
rename to android/tools/love.app/Contents/Frameworks/Vorbis.framework/Headers/codec.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Headers/vorbisenc.h b/android/tools/love.app/Contents/Frameworks/Vorbis.framework/Headers/vorbisenc.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Headers/vorbisenc.h
rename to android/tools/love.app/Contents/Frameworks/Vorbis.framework/Headers/vorbisenc.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Headers/vorbisfile.h b/android/tools/love.app/Contents/Frameworks/Vorbis.framework/Headers/vorbisfile.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Headers/vorbisfile.h
rename to android/tools/love.app/Contents/Frameworks/Vorbis.framework/Headers/vorbisfile.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Resources/English.lproj/InfoPlist.strings b/android/tools/love.app/Contents/Frameworks/Vorbis.framework/Resources/English.lproj/InfoPlist.strings
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Resources/English.lproj/InfoPlist.strings
rename to android/tools/love.app/Contents/Frameworks/Vorbis.framework/Resources/English.lproj/InfoPlist.strings
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/Vorbis.framework/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/Vorbis.framework/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/A/Headers/codec.h b/android/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/A/Headers/codec.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/A/Headers/codec.h
rename to android/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/A/Headers/codec.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/A/Headers/vorbisenc.h b/android/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/A/Headers/vorbisenc.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/A/Headers/vorbisenc.h
rename to android/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/A/Headers/vorbisenc.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/A/Headers/vorbisfile.h b/android/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/A/Headers/vorbisfile.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/A/Headers/vorbisfile.h
rename to android/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/A/Headers/vorbisfile.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/A/Resources/English.lproj/InfoPlist.strings b/android/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/A/Resources/English.lproj/InfoPlist.strings
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/A/Resources/English.lproj/InfoPlist.strings
rename to android/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/A/Resources/English.lproj/InfoPlist.strings
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/A/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/A/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/A/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/A/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/A/Vorbis b/android/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/A/Vorbis
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/A/Vorbis
rename to android/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/A/Vorbis
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/Current/Headers/codec.h b/android/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/Current/Headers/codec.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/Current/Headers/codec.h
rename to android/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/Current/Headers/codec.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/Current/Headers/vorbisenc.h b/android/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/Current/Headers/vorbisenc.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/Current/Headers/vorbisenc.h
rename to android/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/Current/Headers/vorbisenc.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/Current/Headers/vorbisfile.h b/android/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/Current/Headers/vorbisfile.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/Current/Headers/vorbisfile.h
rename to android/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/Current/Headers/vorbisfile.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/Current/Resources/English.lproj/InfoPlist.strings b/android/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/Current/Resources/English.lproj/InfoPlist.strings
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/Current/Resources/English.lproj/InfoPlist.strings
rename to android/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/Current/Resources/English.lproj/InfoPlist.strings
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/Current/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/Current/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/Current/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/Current/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/Current/Vorbis b/android/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/Current/Vorbis
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/Current/Vorbis
rename to android/tools/love.app/Contents/Frameworks/Vorbis.framework/Versions/Current/Vorbis
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Vorbis b/android/tools/love.app/Contents/Frameworks/Vorbis.framework/Vorbis
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/Vorbis.framework/Vorbis
rename to android/tools/love.app/Contents/Frameworks/Vorbis.framework/Vorbis
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/libmodplug.framework/Headers/modplug.h b/android/tools/love.app/Contents/Frameworks/libmodplug.framework/Headers/modplug.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/libmodplug.framework/Headers/modplug.h
rename to android/tools/love.app/Contents/Frameworks/libmodplug.framework/Headers/modplug.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/libmodplug.framework/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/libmodplug.framework/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/libmodplug.framework/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/libmodplug.framework/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/libmodplug.framework/Versions/A/Headers/modplug.h b/android/tools/love.app/Contents/Frameworks/libmodplug.framework/Versions/A/Headers/modplug.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/libmodplug.framework/Versions/A/Headers/modplug.h
rename to android/tools/love.app/Contents/Frameworks/libmodplug.framework/Versions/A/Headers/modplug.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/libmodplug.framework/Versions/A/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/libmodplug.framework/Versions/A/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/libmodplug.framework/Versions/A/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/libmodplug.framework/Versions/A/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/libmodplug.framework/Versions/A/libmodplug b/android/tools/love.app/Contents/Frameworks/libmodplug.framework/Versions/A/libmodplug
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/libmodplug.framework/Versions/A/libmodplug
rename to android/tools/love.app/Contents/Frameworks/libmodplug.framework/Versions/A/libmodplug
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/libmodplug.framework/Versions/Current/Headers/modplug.h b/android/tools/love.app/Contents/Frameworks/libmodplug.framework/Versions/Current/Headers/modplug.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/libmodplug.framework/Versions/Current/Headers/modplug.h
rename to android/tools/love.app/Contents/Frameworks/libmodplug.framework/Versions/Current/Headers/modplug.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/libmodplug.framework/Versions/Current/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/libmodplug.framework/Versions/Current/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/libmodplug.framework/Versions/Current/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/libmodplug.framework/Versions/Current/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/libmodplug.framework/Versions/Current/libmodplug b/android/tools/love.app/Contents/Frameworks/libmodplug.framework/Versions/Current/libmodplug
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/libmodplug.framework/Versions/Current/libmodplug
rename to android/tools/love.app/Contents/Frameworks/libmodplug.framework/Versions/Current/libmodplug
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/libmodplug.framework/libmodplug b/android/tools/love.app/Contents/Frameworks/libmodplug.framework/libmodplug
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/libmodplug.framework/libmodplug
rename to android/tools/love.app/Contents/Frameworks/libmodplug.framework/libmodplug
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/love.framework/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/love.framework/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/love.framework/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/love.framework/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/love.framework/Versions/A/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/love.framework/Versions/A/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/love.framework/Versions/A/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/love.framework/Versions/A/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/love.framework/Versions/A/love b/android/tools/love.app/Contents/Frameworks/love.framework/Versions/A/love
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/love.framework/Versions/A/love
rename to android/tools/love.app/Contents/Frameworks/love.framework/Versions/A/love
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/love.framework/Versions/Current/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/love.framework/Versions/Current/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/love.framework/Versions/Current/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/love.framework/Versions/Current/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/love.framework/Versions/Current/love b/android/tools/love.app/Contents/Frameworks/love.framework/Versions/Current/love
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/love.framework/Versions/Current/love
rename to android/tools/love.app/Contents/Frameworks/love.framework/Versions/Current/love
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/love.framework/love b/android/tools/love.app/Contents/Frameworks/love.framework/love
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/love.framework/love
rename to android/tools/love.app/Contents/Frameworks/love.framework/love
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/mpg123.framework/Headers/mpg123.h b/android/tools/love.app/Contents/Frameworks/mpg123.framework/Headers/mpg123.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/mpg123.framework/Headers/mpg123.h
rename to android/tools/love.app/Contents/Frameworks/mpg123.framework/Headers/mpg123.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/mpg123.framework/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/mpg123.framework/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/mpg123.framework/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/mpg123.framework/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/mpg123.framework/Versions/A/Headers/mpg123.h b/android/tools/love.app/Contents/Frameworks/mpg123.framework/Versions/A/Headers/mpg123.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/mpg123.framework/Versions/A/Headers/mpg123.h
rename to android/tools/love.app/Contents/Frameworks/mpg123.framework/Versions/A/Headers/mpg123.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/mpg123.framework/Versions/A/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/mpg123.framework/Versions/A/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/mpg123.framework/Versions/A/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/mpg123.framework/Versions/A/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/mpg123.framework/Versions/A/mpg123 b/android/tools/love.app/Contents/Frameworks/mpg123.framework/Versions/A/mpg123
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/mpg123.framework/Versions/A/mpg123
rename to android/tools/love.app/Contents/Frameworks/mpg123.framework/Versions/A/mpg123
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/mpg123.framework/Versions/Current/Headers/mpg123.h b/android/tools/love.app/Contents/Frameworks/mpg123.framework/Versions/Current/Headers/mpg123.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/mpg123.framework/Versions/Current/Headers/mpg123.h
rename to android/tools/love.app/Contents/Frameworks/mpg123.framework/Versions/Current/Headers/mpg123.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/mpg123.framework/Versions/Current/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/mpg123.framework/Versions/Current/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/mpg123.framework/Versions/Current/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/mpg123.framework/Versions/Current/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/mpg123.framework/Versions/Current/mpg123 b/android/tools/love.app/Contents/Frameworks/mpg123.framework/Versions/Current/mpg123
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/mpg123.framework/Versions/Current/mpg123
rename to android/tools/love.app/Contents/Frameworks/mpg123.framework/Versions/Current/mpg123
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/mpg123.framework/mpg123 b/android/tools/love.app/Contents/Frameworks/mpg123.framework/mpg123
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/mpg123.framework/mpg123
rename to android/tools/love.app/Contents/Frameworks/mpg123.framework/mpg123
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/physfs.framework/Headers/physfs.h b/android/tools/love.app/Contents/Frameworks/physfs.framework/Headers/physfs.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/physfs.framework/Headers/physfs.h
rename to android/tools/love.app/Contents/Frameworks/physfs.framework/Headers/physfs.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/physfs.framework/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/physfs.framework/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/physfs.framework/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/physfs.framework/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/physfs.framework/Resources/en.lproj/InfoPlist.strings b/android/tools/love.app/Contents/Frameworks/physfs.framework/Resources/en.lproj/InfoPlist.strings
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/physfs.framework/Resources/en.lproj/InfoPlist.strings
rename to android/tools/love.app/Contents/Frameworks/physfs.framework/Resources/en.lproj/InfoPlist.strings
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/physfs.framework/Versions/A/Headers/physfs.h b/android/tools/love.app/Contents/Frameworks/physfs.framework/Versions/A/Headers/physfs.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/physfs.framework/Versions/A/Headers/physfs.h
rename to android/tools/love.app/Contents/Frameworks/physfs.framework/Versions/A/Headers/physfs.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/physfs.framework/Versions/A/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/physfs.framework/Versions/A/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/physfs.framework/Versions/A/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/physfs.framework/Versions/A/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/physfs.framework/Versions/A/Resources/en.lproj/InfoPlist.strings b/android/tools/love.app/Contents/Frameworks/physfs.framework/Versions/A/Resources/en.lproj/InfoPlist.strings
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/physfs.framework/Versions/A/Resources/en.lproj/InfoPlist.strings
rename to android/tools/love.app/Contents/Frameworks/physfs.framework/Versions/A/Resources/en.lproj/InfoPlist.strings
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/physfs.framework/Versions/A/physfs b/android/tools/love.app/Contents/Frameworks/physfs.framework/Versions/A/physfs
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/physfs.framework/Versions/A/physfs
rename to android/tools/love.app/Contents/Frameworks/physfs.framework/Versions/A/physfs
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/physfs.framework/Versions/Current/Headers/physfs.h b/android/tools/love.app/Contents/Frameworks/physfs.framework/Versions/Current/Headers/physfs.h
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/physfs.framework/Versions/Current/Headers/physfs.h
rename to android/tools/love.app/Contents/Frameworks/physfs.framework/Versions/Current/Headers/physfs.h
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/physfs.framework/Versions/Current/Resources/Info.plist b/android/tools/love.app/Contents/Frameworks/physfs.framework/Versions/Current/Resources/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/physfs.framework/Versions/Current/Resources/Info.plist
rename to android/tools/love.app/Contents/Frameworks/physfs.framework/Versions/Current/Resources/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/physfs.framework/Versions/Current/Resources/en.lproj/InfoPlist.strings b/android/tools/love.app/Contents/Frameworks/physfs.framework/Versions/Current/Resources/en.lproj/InfoPlist.strings
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/physfs.framework/Versions/Current/Resources/en.lproj/InfoPlist.strings
rename to android/tools/love.app/Contents/Frameworks/physfs.framework/Versions/Current/Resources/en.lproj/InfoPlist.strings
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/physfs.framework/Versions/Current/physfs b/android/tools/love.app/Contents/Frameworks/physfs.framework/Versions/Current/physfs
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/physfs.framework/Versions/Current/physfs
rename to android/tools/love.app/Contents/Frameworks/physfs.framework/Versions/Current/physfs
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/physfs.framework/physfs b/android/tools/love.app/Contents/Frameworks/physfs.framework/physfs
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Frameworks/physfs.framework/physfs
rename to android/tools/love.app/Contents/Frameworks/physfs.framework/physfs
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Info.plist b/android/tools/love.app/Contents/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Info.plist
rename to android/tools/love.app/Contents/Info.plist
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/MacOS/love b/android/tools/love.app/Contents/MacOS/love
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/MacOS/love
rename to android/tools/love.app/Contents/MacOS/love
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/PkgInfo b/android/tools/love.app/Contents/PkgInfo
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/PkgInfo
rename to android/tools/love.app/Contents/PkgInfo
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Resources/GameIcon.icns b/android/tools/love.app/Contents/Resources/GameIcon.icns
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Resources/GameIcon.icns
rename to android/tools/love.app/Contents/Resources/GameIcon.icns
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Resources/OS X AppIcon.icns b/android/tools/love.app/Contents/Resources/OS X AppIcon.icns
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Resources/OS X AppIcon.icns
rename to android/tools/love.app/Contents/Resources/OS X AppIcon.icns
diff --git a/StartGamedev-160604-osx/tools/love.app/Contents/Resources/license.txt b/android/tools/love.app/Contents/Resources/license.txt
similarity index 100%
rename from StartGamedev-160604-osx/tools/love.app/Contents/Resources/license.txt
rename to android/tools/love.app/Contents/Resources/license.txt
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/Info.plist b/android/tools/zbstudio.app/Contents/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/Info.plist
rename to android/tools/zbstudio.app/Contents/Info.plist
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/MacOS/ZeroBraneStudio b/android/tools/zbstudio.app/Contents/MacOS/ZeroBraneStudio
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/MacOS/ZeroBraneStudio
rename to android/tools/zbstudio.app/Contents/MacOS/ZeroBraneStudio
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/Resources/zbstudio.icns b/android/tools/zbstudio.app/Contents/Resources/zbstudio.icns
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/Resources/zbstudio.icns
rename to android/tools/zbstudio.app/Contents/Resources/zbstudio.icns
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/CHANGELOG.md b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/CHANGELOG.md
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/CHANGELOG.md
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/CHANGELOG.md
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/LICENSE b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/LICENSE
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/LICENSE
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/LICENSE
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/README.md b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/README.md
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/README.md
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/README.md
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/api/cg/stdlib.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/api/cg/stdlib.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/api/cg/stdlib.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/api/cg/stdlib.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/api/glsl/std.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/api/glsl/std.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/api/glsl/std.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/api/glsl/std.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/api/lua/baselib.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/api/lua/baselib.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/api/lua/baselib.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/api/lua/baselib.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/api/lua/love2d.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/api/lua/love2d.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/api/lua/love2d.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/api/lua/love2d.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/api/lua/luajit2.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/api/lua/luajit2.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/api/lua/luajit2.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/api/lua/luajit2.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/api/lua/wxwidgets.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/api/lua/wxwidgets.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/api/lua/wxwidgets.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/api/lua/wxwidgets.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/api/opencl/std.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/api/opencl/std.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/api/opencl/std.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/api/opencl/std.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs/git/core.dylib b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs/git/core.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs/git/core.dylib
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs/git/core.dylib
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs/lfs.dylib b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs/lfs.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs/lfs.dylib
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs/lfs.dylib
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs/mime/core.dylib b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs/mime/core.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs/mime/core.dylib
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs/mime/core.dylib
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs/socket/core.dylib b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs/socket/core.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs/socket/core.dylib
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs/socket/core.dylib
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs52/mime/core.dylib b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs52/mime/core.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs52/mime/core.dylib
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs52/mime/core.dylib
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs52/socket/core.dylib b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs52/socket/core.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs52/socket/core.dylib
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs52/socket/core.dylib
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs53/mime/core.dylib b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs53/mime/core.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs53/mime/core.dylib
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs53/mime/core.dylib
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs53/socket/core.dylib b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs53/socket/core.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs53/socket/core.dylib
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/clibs53/socket/core.dylib
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/liblua.dylib b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/liblua.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/liblua.dylib
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/liblua.dylib
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/liblua52.dylib b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/liblua52.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/liblua52.dylib
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/liblua52.dylib
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/liblua53.dylib b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/liblua53.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/liblua53.dylib
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/liblua53.dylib
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/libwx.dylib b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/libwx.dylib
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/libwx.dylib
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/libwx.dylib
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua.app/Contents/Info.plist b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua.app/Contents/Info.plist
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua.app/Contents/Info.plist
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua.app/Contents/Info.plist
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua.app/Contents/MacOS/lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua.app/Contents/MacOS/lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua.app/Contents/MacOS/lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua.app/Contents/MacOS/lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua.app/Contents/MacOS/lua52 b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua.app/Contents/MacOS/lua52
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua.app/Contents/MacOS/lua52
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua.app/Contents/MacOS/lua52
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua.app/Contents/MacOS/lua53 b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua.app/Contents/MacOS/lua53
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua.app/Contents/MacOS/lua53
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua.app/Contents/MacOS/lua53
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua52 b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua52
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua52
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua52
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua53 b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua53
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua53
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/bin/lua53
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/.user.lua.un~ b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/.user.lua.un~
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/.user.lua.un~
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/.user.lua.un~
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/estrela.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/estrela.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/estrela.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/estrela.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/i18n/de.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/i18n/de.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/i18n/de.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/i18n/de.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/i18n/en.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/i18n/en.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/i18n/en.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/i18n/en.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/scheme-picker.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/scheme-picker.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/scheme-picker.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/scheme-picker.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/tomorrow.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/tomorrow.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/tomorrow.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/tomorrow.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/user-sample.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/user-sample.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/user-sample.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/user-sample.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/user.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/user.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/user.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/user.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/xcode-keys.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/xcode-keys.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/xcode-keys.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/cfg/xcode-keys.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/interpreters/love2d.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/interpreters/love2d.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/interpreters/love2d.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/interpreters/love2d.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/interpreters/luabase.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/interpreters/luabase.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/interpreters/luabase.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/interpreters/luabase.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/interpreters/luadeb.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/interpreters/luadeb.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/interpreters/luadeb.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/interpreters/luadeb.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/interpreters/luadeb52.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/interpreters/luadeb52.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/interpreters/luadeb52.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/interpreters/luadeb52.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/interpreters/luadeb53.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/interpreters/luadeb53.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/interpreters/luadeb53.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/interpreters/luadeb53.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/copas/copas.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/copas/copas.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/copas/copas.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/copas/copas.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/coxpcall/coxpcall.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/coxpcall/coxpcall.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/coxpcall/coxpcall.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/coxpcall/coxpcall.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/config.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/config.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/config.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/config.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/constraints.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/constraints.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/constraints.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/constraints.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/depends.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/depends.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/depends.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/depends.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/git.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/git.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/git.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/git.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/init.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/init.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/init.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/init.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/logger.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/logger.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/logger.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/logger.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/manifest.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/manifest.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/manifest.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/manifest.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/package.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/package.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/package.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/package.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/sys.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/sys.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/sys.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/sys.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/utils.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/utils.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/utils.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/dist/utils.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/git.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/git.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/git.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/git.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/git/objects.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/git/objects.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/git/objects.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/git/objects.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/git/pack.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/git/pack.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/git/pack.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/git/pack.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/git/protocol.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/git/protocol.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/git/protocol.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/git/protocol.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/git/repo.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/git/repo.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/git/repo.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/git/repo.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/git/util.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/git/util.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/git/util.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/git/util.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/ltn12.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/ltn12.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/ltn12.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/ltn12.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/lua_lexer_loose.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/lua_lexer_loose.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/lua_lexer_loose.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/lua_lexer_loose.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/lua_parser_loose.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/lua_parser_loose.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/lua_parser_loose.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/lua_parser_loose.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luadist.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luadist.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luadist.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luadist.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/ast.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/ast.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/ast.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/ast.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/compat_env.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/compat_env.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/compat_env.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/compat_env.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/dump.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/dump.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/dump.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/dump.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/globals.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/globals.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/globals.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/globals.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/init.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/init.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/init.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/init.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/signatures.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/signatures.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/signatures.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/signatures.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/typecheck.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/typecheck.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/typecheck.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/typecheck.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/types.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/types.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/types.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/luainspect/types.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/annot/generator.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/annot/generator.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/annot/generator.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/annot/generator.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/annot/grammar.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/annot/grammar.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/annot/grammar.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/annot/grammar.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/common.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/common.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/common.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/common.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/expr.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/expr.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/expr.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/expr.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/ext.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/ext.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/ext.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/ext.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/lexer.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/lexer.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/lexer.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/lexer.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/meta.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/meta.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/meta.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/meta.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/misc.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/misc.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/misc.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/misc.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/stat.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/stat.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/stat.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/stat.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/table.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/table.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/table.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/compiler/parser/table.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/grammar/generator.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/grammar/generator.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/grammar/generator.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/grammar/generator.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/grammar/lexer.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/grammar/lexer.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/grammar/lexer.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/grammar/lexer.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/pprint.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/pprint.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/pprint.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/metalua/pprint.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/mime.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/mime.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/mime.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/mime.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/mobdebug/mobdebug.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/mobdebug/mobdebug.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/mobdebug/mobdebug.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/mobdebug/mobdebug.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/sha2.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/sha2.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/sha2.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/sha2.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket/ftp.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket/ftp.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket/ftp.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket/ftp.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket/headers.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket/headers.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket/headers.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket/headers.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket/http.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket/http.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket/http.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket/http.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket/smtp.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket/smtp.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket/smtp.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket/smtp.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket/tp.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket/tp.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket/tp.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket/tp.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket/url.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket/url.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket/url.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/socket/url.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/ssl.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/ssl.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/ssl.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/ssl.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/ssl/https.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/ssl/https.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/ssl/https.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/ssl/https.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/testwell.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/testwell.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/testwell.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/lualibs/testwell.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/packages/sample.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/packages/sample.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/packages/sample.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/packages/sample.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/spec/lua.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/spec/lua.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/spec/lua.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/spec/lua.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/spec/text.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/spec/text.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/spec/text.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/spec/text.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/defs.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/defs.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/defs.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/defs.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/.gui.lua.un~ b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/.gui.lua.un~
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/.gui.lua.un~
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/.gui.lua.un~
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/autocomplete.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/autocomplete.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/autocomplete.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/autocomplete.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/commandbar.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/commandbar.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/commandbar.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/commandbar.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/commands.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/commands.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/commands.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/commands.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/debugger.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/debugger.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/debugger.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/debugger.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/editor.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/editor.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/editor.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/editor.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/filetree.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/filetree.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/filetree.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/filetree.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/findreplace.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/findreplace.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/findreplace.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/findreplace.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/gui.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/gui.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/gui.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/gui.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/ids.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/ids.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/ids.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/ids.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/inspect.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/inspect.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/inspect.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/inspect.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/iofilters.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/iofilters.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/iofilters.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/iofilters.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/keymap.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/keymap.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/keymap.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/keymap.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/markers.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/markers.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/markers.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/markers.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/markup.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/markup.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/markup.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/markup.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_edit.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_edit.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_edit.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_edit.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_file.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_file.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_file.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_file.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_help.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_help.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_help.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_help.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_project.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_project.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_project.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_project.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_search.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_search.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_search.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_search.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_tools.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_tools.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_tools.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_tools.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_view.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_view.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_view.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/menu_view.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/outline.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/outline.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/outline.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/outline.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/output.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/output.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/output.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/output.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/package.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/package.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/package.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/package.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/print.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/print.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/print.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/print.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/proto.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/proto.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/proto.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/proto.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/settings.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/settings.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/settings.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/settings.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/shellbox.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/shellbox.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/shellbox.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/shellbox.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/singleinstance.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/singleinstance.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/singleinstance.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/singleinstance.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/style.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/style.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/style.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/style.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/toolbar.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/toolbar.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/toolbar.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/editor/toolbar.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/main.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/main.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/main.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/main.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/util.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/util.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/util.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/util.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/version.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/version.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/src/version.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/src/version.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/cg.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/cg.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/cg.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/cg.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/clcc.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/clcc.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/clcc.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/clcc.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/cstringify.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/cstringify.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/cstringify.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/cstringify.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/dx.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/dx.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/dx.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/dx.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/ffitoapi.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/ffitoapi.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/ffitoapi.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/ffitoapi.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/glslc.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/glslc.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/glslc.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/glslc.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/perforce_edit.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/perforce_edit.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/perforce_edit.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/perforce_edit.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/perforce_revert.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/perforce_revert.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/perforce_revert.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/tools/perforce_revert.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/app.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/app.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/app.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/app.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/config.lua b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/config.lua
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/config.lua
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/config.lua
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/BOOKMARK-TOGGLE.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/BOOKMARK-TOGGLE.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/BOOKMARK-TOGGLE.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/BOOKMARK-TOGGLE.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-BREAK.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-BREAK.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-BREAK.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-BREAK.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-BREAKPOINT-TOGGLE.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-BREAKPOINT-TOGGLE.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-BREAKPOINT-TOGGLE.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-BREAKPOINT-TOGGLE.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-CALLSTACK.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-CALLSTACK.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-CALLSTACK.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-CALLSTACK.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-DETACH.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-DETACH.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-DETACH.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-DETACH.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-RUN-TO.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-RUN-TO.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-RUN-TO.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-RUN-TO.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-START.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-START.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-START.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-START.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-STEP-INTO.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-STEP-INTO.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-STEP-INTO.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-STEP-INTO.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-STEP-OUT.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-STEP-OUT.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-STEP-OUT.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-STEP-OUT.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-STEP-OVER.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-STEP-OVER.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-STEP-OVER.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-STEP-OVER.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-STOP.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-STOP.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-STOP.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-STOP.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-WATCH.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-WATCH.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-WATCH.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DEBUG-WATCH.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DIR-SETUP-FILE.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DIR-SETUP-FILE.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DIR-SETUP-FILE.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DIR-SETUP-FILE.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DIR-SETUP.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DIR-SETUP.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DIR-SETUP.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/DIR-SETUP.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-KNOWN.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-KNOWN.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-KNOWN.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-KNOWN.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-NEW.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-NEW.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-NEW.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-NEW.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-NORMAL-START.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-NORMAL-START.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-NORMAL-START.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-NORMAL-START.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-NORMAL.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-NORMAL.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-NORMAL.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-NORMAL.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-OPEN.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-OPEN.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-OPEN.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-OPEN.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-SAVE-ALL.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-SAVE-ALL.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-SAVE-ALL.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-SAVE-ALL.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-SAVE.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-SAVE.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-SAVE.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FILE-SAVE.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-AND-REPLACE.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-AND-REPLACE.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-AND-REPLACE.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-AND-REPLACE.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-IN-FILES.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-IN-FILES.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-IN-FILES.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-IN-FILES.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-CASE-SENSITIVE.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-CASE-SENSITIVE.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-CASE-SENSITIVE.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-CASE-SENSITIVE.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-CONTEXT.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-CONTEXT.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-CONTEXT.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-CONTEXT.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-DOWN.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-DOWN.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-DOWN.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-DOWN.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-MULTI-RESULTS.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-MULTI-RESULTS.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-MULTI-RESULTS.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-MULTI-RESULTS.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-REGEX.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-REGEX.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-REGEX.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-REGEX.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-SELECTION.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-SELECTION.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-SELECTION.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-SELECTION.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-SETDIR.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-SETDIR.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-SETDIR.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-SETDIR.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-SUBDIR.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-SUBDIR.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-SUBDIR.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-SUBDIR.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-WORD.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-WORD.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-WORD.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-WORD.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-WRAP-AROUND.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-WRAP-AROUND.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-WRAP-AROUND.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-OPT-WRAP-AROUND.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-REPLACE-NEXT.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-REPLACE-NEXT.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-REPLACE-NEXT.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND-REPLACE-NEXT.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FIND.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FOLDER-MAPPED.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FOLDER-MAPPED.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FOLDER-MAPPED.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FOLDER-MAPPED.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FOLDER.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FOLDER.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FOLDER.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/FOLDER.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/LICENSE b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/LICENSE
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/LICENSE
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/LICENSE
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/RUN-NOW.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/RUN-NOW.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/RUN-NOW.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/RUN-NOW.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/RUN.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/RUN.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/RUN.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/RUN.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-ACALL.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-ACALL.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-ACALL.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-ACALL.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-CALL.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-CALL.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-CALL.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-CALL.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-GCALL.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-GCALL.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-GCALL.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-GCALL.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-LCALL.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-LCALL.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-LCALL.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-LCALL.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-LOCAL.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-LOCAL.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-LOCAL.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-LOCAL.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-SCALL.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-SCALL.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-SCALL.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-SCALL.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-UP.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-UP.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-UP.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/16/VALUE-UP.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/BOOKMARK-TOGGLE.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/BOOKMARK-TOGGLE.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/BOOKMARK-TOGGLE.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/BOOKMARK-TOGGLE.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-BREAK.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-BREAK.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-BREAK.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-BREAK.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-BREAKPOINT-TOGGLE.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-BREAKPOINT-TOGGLE.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-BREAKPOINT-TOGGLE.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-BREAKPOINT-TOGGLE.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-CALLSTACK.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-CALLSTACK.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-CALLSTACK.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-CALLSTACK.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-DETACH.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-DETACH.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-DETACH.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-DETACH.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-RUN-TO.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-RUN-TO.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-RUN-TO.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-RUN-TO.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-START.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-START.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-START.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-START.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-STEP-INTO.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-STEP-INTO.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-STEP-INTO.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-STEP-INTO.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-STEP-OUT.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-STEP-OUT.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-STEP-OUT.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-STEP-OUT.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-STEP-OVER.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-STEP-OVER.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-STEP-OVER.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-STEP-OVER.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-STOP.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-STOP.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-STOP.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-STOP.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-WATCH.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-WATCH.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-WATCH.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DEBUG-WATCH.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DIR-SETUP-FILE.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DIR-SETUP-FILE.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DIR-SETUP-FILE.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DIR-SETUP-FILE.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DIR-SETUP.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DIR-SETUP.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DIR-SETUP.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/DIR-SETUP.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FILE-NEW.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FILE-NEW.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FILE-NEW.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FILE-NEW.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FILE-OPEN.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FILE-OPEN.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FILE-OPEN.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FILE-OPEN.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FILE-SAVE-ALL.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FILE-SAVE-ALL.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FILE-SAVE-ALL.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FILE-SAVE-ALL.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FILE-SAVE.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FILE-SAVE.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FILE-SAVE.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FILE-SAVE.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FIND-AND-REPLACE.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FIND-AND-REPLACE.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FIND-AND-REPLACE.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FIND-AND-REPLACE.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FIND-IN-FILES.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FIND-IN-FILES.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FIND-IN-FILES.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FIND-IN-FILES.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FIND.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FIND.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FIND.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/FIND.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/LICENSE b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/LICENSE
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/LICENSE
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/LICENSE
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/RUN-NOW.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/RUN-NOW.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/RUN-NOW.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/RUN-NOW.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/RUN.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/RUN.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/RUN.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/24/RUN.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/estrela.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/estrela.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/estrela.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/estrela.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/zbstudio.ico b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/zbstudio.ico
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/zbstudio.ico
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/zbstudio.ico
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/zerobrane.png b/android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/zerobrane.png
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/zerobrane.png
rename to android/tools/zbstudio.app/Contents/ZeroBraneStudio/zbstudio/res/zerobrane.png
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/_CodeSignature/CodeDirectory b/android/tools/zbstudio.app/Contents/_CodeSignature/CodeDirectory
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/_CodeSignature/CodeDirectory
rename to android/tools/zbstudio.app/Contents/_CodeSignature/CodeDirectory
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/_CodeSignature/CodeRequirements b/android/tools/zbstudio.app/Contents/_CodeSignature/CodeRequirements
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/_CodeSignature/CodeRequirements
rename to android/tools/zbstudio.app/Contents/_CodeSignature/CodeRequirements
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/_CodeSignature/CodeResources b/android/tools/zbstudio.app/Contents/_CodeSignature/CodeResources
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/_CodeSignature/CodeResources
rename to android/tools/zbstudio.app/Contents/_CodeSignature/CodeResources
diff --git a/StartGamedev-160604-osx/tools/zbstudio.app/Contents/_CodeSignature/CodeSignature b/android/tools/zbstudio.app/Contents/_CodeSignature/CodeSignature
similarity index 100%
rename from StartGamedev-160604-osx/tools/zbstudio.app/Contents/_CodeSignature/CodeSignature
rename to android/tools/zbstudio.app/Contents/_CodeSignature/CodeSignature
diff --git a/assets/audio/sound/ambient_1.wav b/assets/audios/sound/ambient_1.wav
similarity index 100%
rename from assets/audio/sound/ambient_1.wav
rename to assets/audios/sound/ambient_1.wav
diff --git a/assets/audio/sound/complete.wav b/assets/audios/sound/complete.wav
similarity index 100%
rename from assets/audio/sound/complete.wav
rename to assets/audios/sound/complete.wav
diff --git a/assets/audio/sound/die.wav b/assets/audios/sound/die.wav
similarity index 100%
rename from assets/audio/sound/die.wav
rename to assets/audios/sound/die.wav
diff --git a/assets/audio/sound/explosion_bit.wav b/assets/audios/sound/explosion_bit.wav
similarity index 100%
rename from assets/audio/sound/explosion_bit.wav
rename to assets/audios/sound/explosion_bit.wav
diff --git a/assets/audio/sound/fire.wav b/assets/audios/sound/fire.wav
similarity index 100%
rename from assets/audio/sound/fire.wav
rename to assets/audios/sound/fire.wav
diff --git a/assets/font/logo.ttf b/assets/fonts/logo.ttf
similarity index 100%
rename from assets/font/logo.ttf
rename to assets/fonts/logo.ttf
diff --git a/assets/font/main.ttf b/assets/fonts/main.ttf
similarity index 100%
rename from assets/font/main.ttf
rename to assets/fonts/main.ttf
diff --git a/assets/img/background_start.png b/assets/img/background_start.png
deleted file mode 100644
index 6f59c11..0000000
Binary files a/assets/img/background_start.png and /dev/null differ
diff --git a/assets/img/asteroid1.png b/assets/sprites/asteroids/1.png
similarity index 100%
rename from assets/img/asteroid1.png
rename to assets/sprites/asteroids/1.png
diff --git a/assets/img/asteroid2.png b/assets/sprites/asteroids/2.png
similarity index 100%
rename from assets/img/asteroid2.png
rename to assets/sprites/asteroids/2.png
diff --git a/assets/img/asteroid3.png b/assets/sprites/asteroids/3.png
similarity index 100%
rename from assets/img/asteroid3.png
rename to assets/sprites/asteroids/3.png
diff --git a/assets/img/background.png b/assets/sprites/background/background.png
similarity index 100%
rename from assets/img/background.png
rename to assets/sprites/background/background.png
diff --git a/assets/sprite/button.png b/assets/sprites/hui/button.png
similarity index 100%
rename from assets/sprite/button.png
rename to assets/sprites/hui/button.png
diff --git a/assets/sprite/heart.png b/assets/sprites/hui/heart.png
similarity index 100%
rename from assets/sprite/heart.png
rename to assets/sprites/hui/heart.png
diff --git a/assets/img/ship.png b/assets/sprites/spaceship/body.png
similarity index 100%
rename from assets/img/ship.png
rename to assets/sprites/spaceship/body.png
diff --git a/assets/sprite/explosion.png b/assets/sprites/spaceship/explosion.png
similarity index 100%
rename from assets/sprite/explosion.png
rename to assets/sprites/spaceship/explosion.png
diff --git a/assets/sprite/fire.png b/assets/sprites/spaceship/fire.png
similarity index 100%
rename from assets/sprite/fire.png
rename to assets/sprites/spaceship/fire.png
diff --git a/assets_Sonia/font/space_age.ttf b/assets_Sonia/font/space_age.ttf
deleted file mode 100644
index 85a62a8..0000000
Binary files a/assets_Sonia/font/space_age.ttf and /dev/null differ
diff --git a/assets_Sonia/img/asteroid1.png b/assets_Sonia/img/asteroid1.png
deleted file mode 100644
index ec3a1f8..0000000
Binary files a/assets_Sonia/img/asteroid1.png and /dev/null differ
diff --git a/assets_Sonia/img/asteroid2.png b/assets_Sonia/img/asteroid2.png
deleted file mode 100644
index 77a22ac..0000000
Binary files a/assets_Sonia/img/asteroid2.png and /dev/null differ
diff --git a/assets_Sonia/img/background.jpg b/assets_Sonia/img/background.jpg
deleted file mode 100644
index 5c7d46f..0000000
Binary files a/assets_Sonia/img/background.jpg and /dev/null differ
diff --git a/assets_Sonia/img/ship.png b/assets_Sonia/img/ship.png
deleted file mode 100644
index e5fb7f7..0000000
Binary files a/assets_Sonia/img/ship.png and /dev/null differ
diff --git a/compilar_android b/compilar_android
index e598a83..70f987a 100755
--- a/compilar_android
+++ b/compilar_android
@@ -1,4 +1,4 @@
-rm StartGamedev-160604-osx/game.love
-zip -9 -r StartGamedev-160604-osx/game.love main.lua assets
-/Users/androsfenollosa/www/alunizaje/StartGamedev-160604-osx/make-apk.command
-adb install StartGamedev-160604-osx/game.apk
+rm android/game.love
+zip -9 -r android/game.love main.lua assets
+/Users/androsfenollosa/www/alunizaje/android/make-apk.command
+adb install android/game.apk
diff --git a/main.lua b/main.lua
index a985198..d7528fa 100644
--- a/main.lua
+++ b/main.lua
@@ -1,3 +1,4 @@
+local start_time = 0
 -- LOAD
 function love.load()
 	-- Configuration
@@ -6,7 +7,7 @@ function love.load()
 	window = { width = width , height = height }
 	fullscreen = false
 	love.window.setMode(window.width, window.height, {resizable=true})
-	font_main = love.graphics.newFont('assets/font/main.ttf', 80) -- Font
+	font_main = love.graphics.newFont('assets/fonts/main.ttf', 80) -- Font
 	love.graphics.setFont(font_main)
 	text_restart = { text = 'You die' }
 	text_restart.size = font_main:getWidth(text_restart.text)
@@ -19,16 +20,17 @@ function love.load()
 	level = { num = 1, x = 50, y = 50, max = 20 }
 	love.window.setFullscreen(fullscreen, 'exclusive')
 	love.window.setTitle('Alunizaje')
-	background = { x = 0, y = 0, img = love.graphics.newImage('assets/img/background.png') }
+	background = { x = 0, y = 0, img = love.graphics.newImage('assets/sprites/background/background.png') }
 	canvas = { width = width, height = 2880 }
-	gravity = 2
 	moon_margin = 100
 	-- Physics
-	love.physics.setMeter(64) -- Height earth in meters
-  	world = love.physics.newWorld(0, gravity * 64, true) -- Make earth
+	world_meter = 64
+	gravity = 2
+	love.physics.setMeter(world_meter) -- Height earth in meters
+  	world = love.physics.newWorld(0, gravity * world_meter, true) -- Make earth
   	-- Ship
   	ship = { x = canvas.width / 2, y = 0 , power = 1000 , size_collition = 28, polygons_collition = 8 }
-  	ship.img = love.graphics.newImage('assets/img/ship.png')
+  	ship.img = love.graphics.newImage('assets/sprites/spaceship/body.png')
   	ship.body = love.physics.newBody(world, (canvas.width / 2) - (ship.img:getWidth() / 2) , ship.y, 'dynamic')
   	ship.shape = love.physics.newCircleShape(20) 
   	ship.fixture = love.physics.newFixture(ship.body, ship.shape, 1)
@@ -37,7 +39,7 @@ function love.load()
   	start_time = 0	
   	-- Fire
   	fire = {}
-  	fire.img = love.graphics.newImage('assets/sprite/fire.png')
+  	fire.img = love.graphics.newImage('assets/sprites/spaceship/fire.png')
   	fire.num_frames = 4
   	fire.pos_frame = 0
   	fire.visible = false
@@ -51,7 +53,7 @@ function love.load()
              }
     -- Explosion
   	explosion = {}
-  	explosion.img = love.graphics.newImage('assets/sprite/explosion.png')
+  	explosion.img = love.graphics.newImage('assets/sprites/spaceship/explosion.png')
   	explosion.num_frames = 11 
   	explosion.pos_frame = 1
   	explosion.active = false
@@ -77,7 +79,7 @@ function love.load()
 	-- Button
 	control_up, control_right, control_left, control_quit = false, false, false, false
   	button = {}
-  	button.img = love.graphics.newImage('assets/sprite/button.png')
+  	button.img = love.graphics.newImage('assets/sprites/hui/button.png')
   	button.num_frames = 2
   	button.frame_width = button.img:getWidth() / button.num_frames
   	button.frame_height = button.img:getHeight()
@@ -99,17 +101,17 @@ function love.load()
 	asteroids_collision_polygon = 8
 	max_speed_asteroids = 5
 	img_asteroide = {
-		love.graphics.newImage('assets/img/asteroid1.png'), 
-		love.graphics.newImage('assets/img/asteroid2.png'),
-		love.graphics.newImage('assets/img/asteroid3.png')
+		love.graphics.newImage('assets/sprites/asteroids/1.png'), 
+		love.graphics.newImage('assets/sprites/asteroids/2.png'), 
+		love.graphics.newImage('assets/sprites/asteroids/3.png') 
 	}
 	-- Audios
 	sounds = {}
-	sounds.die = love.audio.newSource('assets/audio/sound/die.wav', 'static')	
-	sounds.explosion = love.audio.newSource('assets/audio/sound/explosion_bit.wav', 'static')	
-	sounds.ambient_1 = love.audio.newSource('assets/audio/sound/ambient_1.wav')	
-	sounds.complete = love.audio.newSource('assets/audio/sound/complete.wav')	
-	sounds.fire = love.audio.newSource('assets/audio/sound/fire.wav', 'static')	
+	sounds.die = love.audio.newSource('assets/audios/sound/die.wav', 'static')	
+	sounds.explosion = love.audio.newSource('assets/audios/sound/explosion_bit.wav', 'static')	
+	sounds.ambient_1 = love.audio.newSource('assets/audios/sound/ambient_1.wav')	
+	sounds.complete = love.audio.newSource('assets/audios/sound/complete.wav')	
+	sounds.fire = love.audio.newSource('assets/audios/sound/fire.wav', 'static')	
 	sounds.ambient_1:setLooping(true)
 	sounds.ambient_1:play()
 
@@ -118,6 +120,11 @@ end
 
 -- UPDATE
 function love.update(dt)
+	-- Fix position ship
+	if ship.y < 0 then
+		ship.y = 0
+	end
+	-- Count time
 	start_time = dt + start_time
 	-- Sprite
 	if not explosion.finish and explosion.active then -- Explosion
@@ -147,33 +154,31 @@ function love.update(dt)
 			fire.pos_frame = 1
 		end
 		-- Controls
-		if start_time > ship.time_start then
-			control_up, control_right, control_left, control_quit = false, false, false, false
-				-- Keyboard
-			if love.keyboard.isDown('escape') or love.keyboard.isDown('q') then
-				control_quit = true
+		control_up, control_right, control_left, control_quit = false, false, false, false
+			-- Keyboard
+		if love.keyboard.isDown('escape') or love.keyboard.isDown('q') then
+			control_quit = true
+		end
+		if love.keyboard.isDown('right') then 
+			control_right = true
+	    elseif love.keyboard.isDown('left') then 
+	    	control_left = true
+	    end
+	  	if love.keyboard.isDown('up') then 
+	  		control_up = true
+	    end
+	    	-- Mouse
+		if love.mouse.isDown(1) then
+			local x, y = love.mouse.getPosition()
+			-- Up
+			if x > button_up.x and x < button_up.x + button.img:getWidth() and y > button_up.y + camera.y and y < button_up.y + button.img:getHeight() + camera.y then
+	  			control_up = true
 			end
-			if love.keyboard.isDown('right') then 
-				control_right = true
-		    elseif love.keyboard.isDown('left') then 
-		    	control_left = true
-		    end
-		  	if love.keyboard.isDown('up') then 
-		  		control_up = true
-		    end
-		    	-- Mouse
-			if love.mouse.isDown(1) then
-				local x, y = love.mouse.getPosition()
-				-- Up
-				if x > button_up.x and x < button_up.x + button.img:getWidth() and y > button_up.y + camera.y and y < button_up.y + button.img:getHeight() + camera.y then
-		  			control_up = true
-				end
-				-- Right
-				if x > button_right.x and x < button_right.x + button.img:getWidth() and y > button_right.y + camera.y and y < button_right.y + button.img:getHeight() + camera.y then
-		  			control_right = true
-		  		elseif x > button_left.x and x < button_left.x + button.img:getWidth() and y > button_left.y + camera.y and y < button_left.y + button.img:getHeight() + camera.y then
-		  			control_left = true
-				end
+			-- Right
+			if x > button_right.x and x < button_right.x + button.img:getWidth() and y > button_right.y + camera.y and y < button_right.y + button.img:getHeight() + camera.y then
+	  			control_right = true
+	  		elseif x > button_left.x and x < button_left.x + button.img:getWidth() and y > button_left.y + camera.y and y < button_left.y + button.img:getHeight() + camera.y then
+	  			control_left = true
 			end
 		end
 		-- Ship move
@@ -296,37 +301,35 @@ function love.draw()
 		love.graphics.draw(explosion.img, explosion.frames[explosion.pos_frame], ship.body:getX(), ship.body:getY() + ship.img:getHeight() / 2)
 	end
 	-- Controls
-	if start_time > ship.time_start then
-			-- Up
-	    button_up.y = level.y + (camera.height / 4) + -camera.y
-		local button_frame_up = button.frames[1]
-		if control_up then
-			button_frame_up = button.frames[2]
-		end
-		love.graphics.draw(button.img, button_frame_up, button_up.x, button_up.y)
-		if debug then
-			love.graphics.rectangle('fill', button_up.x, button_up.y, button.img:getWidth(),  button.img:getHeight())
-		end
-			-- Right
-	    button_right.y = button_up.y + (button.img:getHeight() + (button.img:getHeight() / 3))
-	    local button_frame_right = button.frames[1]
-		if control_right then
-			button_frame_right = button.frames[2]
-		end
-		love.graphics.draw(button.img, button_frame_right, button_right.x + (button.img:getWidth() / (2 * button.num_frames)), button_right.y + button.img:getHeight(), 90 * math.pi / 180, 1, 1, button.img:getWidth() / 2, button.img:getHeight() / 2)
-		if debug then
-			love.graphics.rectangle('fill', button_right.x, button_right.y, button.img:getWidth(),  button.img:getHeight())
-		end
-			-- Left
-		button_left.y = button_right.y
-		local button_frame_left = button.frames[1]
-		if control_left then
-			button_frame_left = button.frames[2]
-		end
-		love.graphics.draw(button.img, button_frame_left, button_left.x + (button.img:getWidth() / (2 * button.num_frames)), button_left.y, 270 * math.pi / 180, 1, 1, button.img:getWidth() / 2, button.img:getHeight() / 2)
-		if debug then
-			love.graphics.rectangle('fill', button_left.x, button_left.y, button.img:getWidth(),  button.img:getHeight())
-		end
+		-- Up
+    button_up.y = level.y + (camera.height / 4) + -camera.y
+	local button_frame_up = button.frames[1]
+	if control_up then
+		button_frame_up = button.frames[2]
+	end
+	love.graphics.draw(button.img, button_frame_up, button_up.x, button_up.y)
+	if debug then
+		love.graphics.rectangle('fill', button_up.x, button_up.y, button.img:getWidth(),  button.img:getHeight())
+	end
+		-- Right
+    button_right.y = button_up.y + (button.img:getHeight() + (button.img:getHeight() / 3))
+    local button_frame_right = button.frames[1]
+	if control_right then
+		button_frame_right = button.frames[2]
+	end
+	love.graphics.draw(button.img, button_frame_right, button_right.x + (button.img:getWidth() / (2 * button.num_frames)), button_right.y + button.img:getHeight(), 90 * math.pi / 180, 1, 1, button.img:getWidth() / 2, button.img:getHeight() / 2)
+	if debug then
+		love.graphics.rectangle('fill', button_right.x, button_right.y, button.img:getWidth(),  button.img:getHeight())
+	end
+		-- Left
+	button_left.y = button_right.y
+	local button_frame_left = button.frames[1]
+	if control_left then
+		button_frame_left = button.frames[2]
+	end
+	love.graphics.draw(button.img, button_frame_left, button_left.x + (button.img:getWidth() / (2 * button.num_frames)), button_left.y, 270 * math.pi / 180, 1, 1, button.img:getWidth() / 2, button.img:getHeight() / 2)
+	if debug then
+		love.graphics.rectangle('fill', button_left.x, button_left.y, button.img:getWidth(),  button.img:getHeight())
 	end
 	-- Texts
 	if not play and not win then -- Game over
@@ -359,7 +362,10 @@ function checkCircleCollision(circle1, circle2)
 	return distance <= circle1.radius + circle2.radius
 end
 
+-- Restart level
 function restart(level_arg)
+	sounds.fire:stop()
+  	ship.body = love.physics.newBody(world, (canvas.width / 2) - (ship.img:getWidth() / 2) , ship.img:getHeight(), 'dynamic')
 	num_asteroids = level_arg * 5
 	explosion.pos_frame = 1
 	explosion.active = false
@@ -376,7 +382,6 @@ function restart(level_arg)
 		}
 	end
 	-- Set ship position
-  	ship.body = love.physics.newBody(world, (canvas.width / 2) - (ship.img:getWidth() / 2) , ship.y, 'dynamic')
 	win = false
 	play = true
 	start_time = 0
@@ -389,4 +394,4 @@ end
 
 function love.mousereleased(key)
 	sounds.fire:stop()
-end
\ No newline at end of file
+end,
\ No newline at end of file