diff --git a/test/Makefile b/test/Basic/Makefile
similarity index 86%
rename from test/Makefile
rename to test/Basic/Makefile
index a75ffeb..9ee2ee8 100644
--- a/test/Makefile
+++ b/test/Basic/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.conf
+include ../../Makefile.conf
 
 $(info If on Mac, make sure to disable SIP, or copy the libpEpEngine.dylib into here)
 
@@ -14,8 +14,8 @@ ifdef ENGINE_LIB_PATH
 	endif
 endif
 
-CLASSPATH=.:../src
-VM=java -Xcheck:jni -Djava.library.path=../src
+CLASSPATH=.:../../src
+VM=java -Xcheck:jni -Djava.library.path=../../src
 #VM=lldb java -- -Xcheck:jni -Djava.library.path=../src
 
 .PHONY: test clean
@@ -23,7 +23,7 @@ VM=java -Xcheck:jni -Djava.library.path=../src
 test: Testing.class SyncCallbacks.class
 	HOME=$(PWD) CLASSPATH=$(CLASSPATH) time $(VM) Testing
 
-test-JNI-85: 
+test-JNI-85:
 	$(MAKE) -C JNI_85
 
 %.class: %.java
diff --git a/test/SyncCallbacks.java b/test/Basic/SyncCallbacks.java
similarity index 100%
rename from test/SyncCallbacks.java
rename to test/Basic/SyncCallbacks.java
diff --git a/test/Testing.java b/test/Basic/Testing.java
similarity index 100%
rename from test/Testing.java
rename to test/Basic/Testing.java
diff --git a/test/test_keys/pub/pep-test-alice-0x6FF00E97_pub.asc b/test/Basic/test_keys/pub/pep-test-alice-0x6FF00E97_pub.asc
similarity index 100%
rename from test/test_keys/pub/pep-test-alice-0x6FF00E97_pub.asc
rename to test/Basic/test_keys/pub/pep-test-alice-0x6FF00E97_pub.asc