diff --git a/.gitignore b/.gitignore
index a49e8c8c0..0d3f04cd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
 # Quiz output
 quiz/src/symbols.c
 
-build
+# Ignore SDL files
+ion/src/sdl/android/build
+ion/src/sdl/android/libs
+ion/src/sdl/android/src/java/org
diff --git a/build/targets.sdl.android.mak b/build/targets.sdl.android.mak
index a702ef525..8c865bb27 100644
--- a/build/targets.sdl.android.mak
+++ b/build/targets.sdl.android.mak
@@ -2,32 +2,32 @@
 # cannot use standard Make dependencies
 .PHONY: dependencies
 dependencies:
-	rm -rf ion/src/sdl/android/com.numworks.calculator/app/libs
+	rm -rf ion/src/sdl/android/libs
 	# First, build libsdl
 	cd $(SDL_PATH) && build-scripts/androidbuildlibs.sh
-	cp -r $(SDL_PATH)/build/android/lib ion/src/sdl/android/com.numworks.calculator/app/libs
+	cp -r $(SDL_PATH)/build/android/lib ion/src/sdl/android/libs
 	# Then build epsilon for armv7
-	rm -f ion/src/sdl/android/com.numworks.calculator/app/libs/armeabi-v7a/libepsilon.so
-	$(MAKE) ion/src/sdl/android/com.numworks.calculator/app/libs/armeabi-v7a/libepsilon.so
+	rm -f ion/src/sdl/android/libs/armeabi-v7a/libepsilon.so
+	$(MAKE) ion/src/sdl/android/libs/armeabi-v7a/libepsilon.so
 	# Then for arm64
-	rm -f ion/src/sdl/android/com.numworks.calculator/app/libs/arm64-v8a/libepsilon.so
-	$(MAKE) ion/src/sdl/android/com.numworks.calculator/app/libs/arm64-v8a/libepsilon.so
+	rm -f ion/src/sdl/android/libs/arm64-v8a/libepsilon.so
+	$(MAKE) ion/src/sdl/android/libs/arm64-v8a/libepsilon.so
 	# Then for x86
-	rm -f ion/src/sdl/android/com.numworks.calculator/app/libs/x86/libepsilon.so
-	$(MAKE) ion/src/sdl/android/com.numworks.calculator/app/libs/x86/libepsilon.so
+	rm -f ion/src/sdl/android/libs/x86/libepsilon.so
+	$(MAKE) ion/src/sdl/android/libs/x86/libepsilon.so
 	# And eventually for x86_64
-	rm -f ion/src/sdl/android/com.numworks.calculator/app/libs/x86_64/libepsilon.so
-	$(MAKE) ion/src/sdl/android/com.numworks.calculator/app/libs/x86_64/libepsilon.so
+	rm -f ion/src/sdl/android/libs/x86_64/libepsilon.so
+	$(MAKE) ion/src/sdl/android/libs/x86_64/libepsilon.so
 	# Last but not least, copy the sources from SDL
-	cp -r $(SDL_PATH)/android-project/app/src/main/java/org ion/src/sdl/android/com.numworks.calculator/app/src/main/java
+	cp -r $(SDL_PATH)/android-project/app/src/main/java/org ion/src/sdl/android/src/java
 
 epsilon.apk:
 	#rm ion/src/sdl/android/com.numworks.calculator/app/libs/arm64-v8a/libepsilon.so
 	#$(MAKE) ion/src/sdl/android/com.numworks.calculator/app/libs/arm64-v8a/libepsilon.so
-	cd ion/src/sdl/android/com.numworks.calculator ; ANDROID_HOME=/usr/local/android ./gradlew assembleRelease
-	cp ion/src/sdl/android/com.numworks.calculator/app/build/outputs/apk/release/app-release-unsigned.apk epsilon.apk
+	cd ion/src/sdl/android ; ANDROID_HOME=/usr/local/android gradle assembleRelease
+	cp ion/src/sdl/android/build/outputs/apk/release/app-release-unsigned.apk epsilon.apk
 
 epsilon_run:
 	#rm ion/src/sdl/android/com.numworks.calculator/app/libs/arm64-v8a/libepsilon.so
 	#$(MAKE) ion/src/sdl/android/com.numworks.calculator/app/libs/arm64-v8a/libepsilon.so
-	cd ion/src/sdl/android/com.numworks.calculator ; ANDROID_HOME=/usr/local/android ./gradlew installDebug
+	cd ion/src/sdl/android ; ANDROID_HOME=/usr/local/android gradle installDebug
diff --git a/ion/src/sdl/android/Makefile b/ion/src/sdl/android/Makefile
index 8c140d7eb..d67008e42 100644
--- a/ion/src/sdl/android/Makefile
+++ b/ion/src/sdl/android/Makefile
@@ -1,11 +1,11 @@
-objs += $(addprefix ion/src/sdl/android/, \
+objs += $(addprefix ion/src/sdl/android/src/cpp/, \
   images.o \
 )
 
-ANDROID_LIB_PATH = ion/src/sdl/android/com.numworks.calculator/app/libs
+ANDROID_LIB_PATH = ion/src/sdl/android/libs
 
 $(ANDROID_LIB_PATH)/%/libepsilon.so:
-ion/src/sdl/android/com.numworks.calculator/app/libs/%/libepsilon.so:
+ion/src/sdl/android/libs/%/libepsilon.so:
 	$(Q) $(MAKE) MODEL=android NDK_ABI=$* clean
 	$(Q) $(MAKE) MODEL=android NDK_ABI=$* epsilon.so
 	$(Q) mv epsilon.so $@
diff --git a/ion/src/sdl/android/build.gradle b/ion/src/sdl/android/build.gradle
index 6b99d09cf..302d69cfb 100644
--- a/ion/src/sdl/android/build.gradle
+++ b/ion/src/sdl/android/build.gradle
@@ -40,7 +40,7 @@ android {
       res.srcDir 'src/res'
       java.srcDir 'src'
       jniLibs.srcDir 'libs'
-      assets.srcDir '../../../assets'
+      assets.srcDir '../assets'
     }
   }