diff --git a/cs_codegen.patch b/compiler/cs_codegen.patch
similarity index 100%
rename from cs_codegen.patch
rename to compiler/cs_codegen.patch
diff --git a/java_array_encode.patch b/compiler/java_array_encode.patch
similarity index 100%
rename from java_array_encode.patch
rename to compiler/java_array_encode.patch
diff --git a/test/run b/test/run
index 07c4a0cdfcea7948ba2c0dde931e169dd3a7a213..c0fff50c96c9e38dcd9a9a0cbb1e9aba166ad3bc 100755
--- a/test/run
+++ b/test/run
@@ -19,7 +19,7 @@ def run_labcomm(base):
     if not os.path.exists("gen/python"):
         os.makedirs("gen/python")
     cmd = " ".join([
-        "java -jar ../labComm.jar",
+        "java -jar ../compiler/labComm.jar",
         "--c=gen/c/%s.c" % base,
         "--h=gen/c/%s.h" % base,
         "--cs=gen/csharp/%s.cs" % base,
diff --git a/test/run.py b/test/run.py
index 927e1a8870a4723da5620465eb913ce2ffef3f7a..6793aacdac5b8d45bcf012840ef7fbacba662923 100755
--- a/test/run.py
+++ b/test/run.py
@@ -11,7 +11,7 @@ def run_labcomm(base):
     if not os.path.exists("gen/java/%s" % base):
         os.makedirs("gen/java/%s" % base)
     cmd = " ".join([
-        "java -jar ../labComm.jar",
+        "java -jar ../compiler/labComm.jar",
         "--c=gen/%s.c" % base,
         "--h=gen/%s.h" % base,
         "--python=gen/%s.py" % base,