diff --git a/java/test/processing/mode/java/pdex/util/CachedRuntimePathFactoryTest.java b/java/test/processing/mode/java/CachedRuntimePathFactoryTest.java
similarity index 94%
rename from java/test/processing/mode/java/pdex/util/CachedRuntimePathFactoryTest.java
rename to java/test/processing/mode/java/CachedRuntimePathFactoryTest.java
index 7508c539d6..fdf42e5419 100644
--- a/java/test/processing/mode/java/pdex/util/CachedRuntimePathFactoryTest.java
+++ b/java/test/processing/mode/java/CachedRuntimePathFactoryTest.java
@@ -18,15 +18,12 @@
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-package processing.mode.java.pdex.util;
+package processing.mode.java;
 
 import org.junit.Before;
 import org.junit.Test;
 import processing.app.Sketch;
-import processing.mode.java.JavaMode;
-import processing.mode.java.pdex.ImportStatement;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/java/test/processing/mode/java/pdex/util/CodeFolderRuntimePathFactoryTest.java b/java/test/processing/mode/java/CodeFolderRuntimePathFactoryTest.java
similarity index 90%
rename from java/test/processing/mode/java/pdex/util/CodeFolderRuntimePathFactoryTest.java
rename to java/test/processing/mode/java/CodeFolderRuntimePathFactoryTest.java
index 679357553e..95b0c90f42 100644
--- a/java/test/processing/mode/java/pdex/util/CodeFolderRuntimePathFactoryTest.java
+++ b/java/test/processing/mode/java/CodeFolderRuntimePathFactoryTest.java
@@ -18,14 +18,11 @@
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-package processing.mode.java.pdex.util;
+package processing.mode.java;
 
 import org.junit.Before;
 import org.junit.Test;
 import processing.app.Sketch;
-import processing.mode.java.JavaMode;
-import processing.mode.java.pdex.ImportStatement;
-import processing.mode.java.pdex.util.RuntimePathFactoryTestUtil;
 
 import java.io.File;
 import java.util.List;
diff --git a/java/test/processing/mode/java/pdex/util/CoreLibraryRuntimePathFactoryTest.java b/java/test/processing/mode/java/CoreLibraryRuntimePathFactoryTest.java
similarity index 90%
rename from java/test/processing/mode/java/pdex/util/CoreLibraryRuntimePathFactoryTest.java
rename to java/test/processing/mode/java/CoreLibraryRuntimePathFactoryTest.java
index bddb4a5af6..9f9b608e3d 100644
--- a/java/test/processing/mode/java/pdex/util/CoreLibraryRuntimePathFactoryTest.java
+++ b/java/test/processing/mode/java/CoreLibraryRuntimePathFactoryTest.java
@@ -18,14 +18,11 @@
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-package processing.mode.java.pdex.util;
+package processing.mode.java;
 
 import org.junit.Before;
 import org.junit.Test;
 import processing.app.Sketch;
-import processing.mode.java.JavaMode;
-import processing.mode.java.pdex.ImportStatement;
-import processing.mode.java.pdex.util.RuntimePathFactoryTestUtil;
 
 import java.util.List;
 
diff --git a/java/test/processing/mode/java/pdex/ImportStatementTest.java b/java/test/processing/mode/java/ImportStatementTest.java
similarity index 99%
rename from java/test/processing/mode/java/pdex/ImportStatementTest.java
rename to java/test/processing/mode/java/ImportStatementTest.java
index e64274ff82..a4a3dd97ff 100644
--- a/java/test/processing/mode/java/pdex/ImportStatementTest.java
+++ b/java/test/processing/mode/java/ImportStatementTest.java
@@ -1,4 +1,4 @@
-package processing.mode.java.pdex;
+package processing.mode.java;
 
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/java/test/processing/mode/java/pdex/util/JavaFxRuntimePathFactoryTest.java b/java/test/processing/mode/java/JavaFxRuntimePathFactoryTest.java
similarity index 94%
rename from java/test/processing/mode/java/pdex/util/JavaFxRuntimePathFactoryTest.java
rename to java/test/processing/mode/java/JavaFxRuntimePathFactoryTest.java
index 1afe124dae..b61889cd66 100644
--- a/java/test/processing/mode/java/pdex/util/JavaFxRuntimePathFactoryTest.java
+++ b/java/test/processing/mode/java/JavaFxRuntimePathFactoryTest.java
@@ -18,13 +18,11 @@
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-package processing.mode.java.pdex.util;
+package processing.mode.java;
 
 import org.junit.Before;
 import org.junit.Test;
 import processing.app.Sketch;
-import processing.mode.java.JavaMode;
-import processing.mode.java.pdex.ImportStatement;
 
 import java.util.List;
 
diff --git a/java/test/processing/mode/java/pdex/util/JavaRuntimePathFactoryTest.java b/java/test/processing/mode/java/JavaRuntimePathFactoryTest.java
similarity index 94%
rename from java/test/processing/mode/java/pdex/util/JavaRuntimePathFactoryTest.java
rename to java/test/processing/mode/java/JavaRuntimePathFactoryTest.java
index 2357fcb619..ae67422278 100644
--- a/java/test/processing/mode/java/pdex/util/JavaRuntimePathFactoryTest.java
+++ b/java/test/processing/mode/java/JavaRuntimePathFactoryTest.java
@@ -18,13 +18,11 @@
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-package processing.mode.java.pdex.util;
+package processing.mode.java;
 
 import org.junit.Before;
 import org.junit.Test;
 import processing.app.Sketch;
-import processing.mode.java.JavaMode;
-import processing.mode.java.pdex.ImportStatement;
 
 import java.util.List;
 
diff --git a/java/test/processing/mode/java/pdex/util/LibrarySearchRuntimePathFactoryTest.java b/java/test/processing/mode/java/LibrarySearchRuntimePathFactoryTest.java
similarity index 93%
rename from java/test/processing/mode/java/pdex/util/LibrarySearchRuntimePathFactoryTest.java
rename to java/test/processing/mode/java/LibrarySearchRuntimePathFactoryTest.java
index 6d87c7a84e..ed7210fd47 100644
--- a/java/test/processing/mode/java/pdex/util/LibrarySearchRuntimePathFactoryTest.java
+++ b/java/test/processing/mode/java/LibrarySearchRuntimePathFactoryTest.java
@@ -18,13 +18,11 @@
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-package processing.mode.java.pdex.util;
+package processing.mode.java;
 
 import org.junit.Before;
 import org.junit.Test;
 import processing.app.Sketch;
-import processing.mode.java.JavaMode;
-import processing.mode.java.pdex.ImportStatement;
 
 import java.util.List;
 
diff --git a/java/test/processing/mode/java/pdex/util/LibrarySketchRuntimePathFactoryTest.java b/java/test/processing/mode/java/LibrarySketchRuntimePathFactoryTest.java
similarity index 93%
rename from java/test/processing/mode/java/pdex/util/LibrarySketchRuntimePathFactoryTest.java
rename to java/test/processing/mode/java/LibrarySketchRuntimePathFactoryTest.java
index a40f576496..c9df2b28cd 100644
--- a/java/test/processing/mode/java/pdex/util/LibrarySketchRuntimePathFactoryTest.java
+++ b/java/test/processing/mode/java/LibrarySketchRuntimePathFactoryTest.java
@@ -18,13 +18,11 @@
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-package processing.mode.java.pdex.util;
+package processing.mode.java;
 
 import org.junit.Before;
 import org.junit.Test;
 import processing.app.Sketch;
-import processing.mode.java.JavaMode;
-import processing.mode.java.pdex.ImportStatement;
 
 import java.util.List;
 
diff --git a/java/test/processing/mode/java/pdex/util/ModeSearchRuntimePathFactoryTest.java b/java/test/processing/mode/java/ModeSearchRuntimePathFactoryTest.java
similarity index 93%
rename from java/test/processing/mode/java/pdex/util/ModeSearchRuntimePathFactoryTest.java
rename to java/test/processing/mode/java/ModeSearchRuntimePathFactoryTest.java
index 46bdb54fc4..16ff85b858 100644
--- a/java/test/processing/mode/java/pdex/util/ModeSearchRuntimePathFactoryTest.java
+++ b/java/test/processing/mode/java/ModeSearchRuntimePathFactoryTest.java
@@ -18,13 +18,11 @@
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-package processing.mode.java.pdex.util;
+package processing.mode.java;
 
 import org.junit.Before;
 import org.junit.Test;
 import processing.app.Sketch;
-import processing.mode.java.JavaMode;
-import processing.mode.java.pdex.ImportStatement;
 
 import java.util.List;
 
diff --git a/java/test/processing/mode/java/pdex/util/ModeSketchRuntimePathFactoryTest.java b/java/test/processing/mode/java/ModeSketchRuntimePathFactoryTest.java
similarity index 93%
rename from java/test/processing/mode/java/pdex/util/ModeSketchRuntimePathFactoryTest.java
rename to java/test/processing/mode/java/ModeSketchRuntimePathFactoryTest.java
index a24f63f48e..5081311bfd 100644
--- a/java/test/processing/mode/java/pdex/util/ModeSketchRuntimePathFactoryTest.java
+++ b/java/test/processing/mode/java/ModeSketchRuntimePathFactoryTest.java
@@ -18,13 +18,11 @@
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-package processing.mode.java.pdex.util;
+package processing.mode.java;
 
 import org.junit.Before;
 import org.junit.Test;
 import processing.app.Sketch;
-import processing.mode.java.JavaMode;
-import processing.mode.java.pdex.ImportStatement;
 
 import java.util.List;
 
diff --git a/java/test/processing/mode/java/ParserTests.java b/java/test/processing/mode/java/ParserTests.java
index e540253980..922b5bdeef 100644
--- a/java/test/processing/mode/java/ParserTests.java
+++ b/java/test/processing/mode/java/ParserTests.java
@@ -19,7 +19,6 @@
 import org.junit.Test;
 
 import processing.app.SketchException;
-import processing.mode.java.pdex.JdtCompilerUtil;
 import processing.mode.java.preproc.PreprocessorResult;
 import processing.mode.java.preproc.issue.PdePreprocessIssueException;
 
@@ -68,21 +67,6 @@ static void expectRunnerException(final String id,
     }
   }
 
-  static void expectCompilerException(final String id) {
-    try {
-      final String program = preprocess(id, res(id + ".pde"));
-      boolean succeeded = compile(id, program);
-      if (succeeded) {
-        fail("Expected to fail.");
-      }
-    } catch (Exception e) {
-      if (!e.equals(e.getCause()) && e.getCause() != null)
-        fail(e.getCause().toString());
-      else
-        fail(e.toString());
-    }
-  }
-
   static void expectGood(final String id) {
     expectGood(id, true);
   }
@@ -94,13 +78,6 @@ static void expectGood(final String id, boolean ignoreWhitespace) {
   static void expectGood(final String id, boolean ignoreWhitespace, Optional<String> packageName) {
     try {
       final String program = preprocess(id, res(id + ".pde"), packageName);
-      boolean successful = compile(id, program);
-      if (!successful) {
-        System.err.println("----------------------------");
-        System.err.println(program);
-        System.err.println("----------------------------");
-        fail("Compilation failed.");
-      }
 
       final File expectedFile = res(id + ".expected");
       if (expectedFile.exists()) {
@@ -218,11 +195,6 @@ public void bug1064() {
     expectGood("bug1064");
   }
 
-  @Test
-  public void bug1145() {
-    expectCompilerException("bug1145");
-  }
-
   @Test
   public void bug1362() {
     expectGood("bug1362");
@@ -393,31 +365,4 @@ public void testPdfWrite() {
     expectGood("pdfwrite");
   }
 
-  private static boolean compile(String id, String program) {
-    // Create compilable AST to get syntax problems
-    CompilationUnit compilableCU = JdtCompilerUtil.makeAST(
-        ASTParser.newParser(AST.JLS11),
-        program.toCharArray(),
-        JdtCompilerUtil.COMPILER_OPTIONS
-    );
-
-    // Get syntax problems from compilable AST
-    Optional<IProblem> problem = Arrays.stream(compilableCU.getProblems())
-        .filter(IProblem::isError)
-        .findFirst();
-
-    if (problem.isPresent()) {
-      IProblem problemFound = problem.get();
-
-      System.err.println("Compilation issue: "
-          + problemFound.getMessage()
-          + "(" + problemFound.getSourceLineNumber() + ")"
-      );
-
-      return false;
-    } else {
-      return true;
-    }
-  }
-
 }
diff --git a/java/test/processing/mode/java/pdex/util/ProblemFactoryTest.java b/java/test/processing/mode/java/ProblemFactoryTest.java
similarity index 98%
rename from java/test/processing/mode/java/pdex/util/ProblemFactoryTest.java
rename to java/test/processing/mode/java/ProblemFactoryTest.java
index 890e5309b2..7090590302 100644
--- a/java/test/processing/mode/java/pdex/util/ProblemFactoryTest.java
+++ b/java/test/processing/mode/java/ProblemFactoryTest.java
@@ -1,4 +1,4 @@
-package processing.mode.java.pdex.util;
+package processing.mode.java;
 
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/java/test/processing/mode/java/pdex/util/RuntimePathBuilderTest.java b/java/test/processing/mode/java/RuntimePathBuilderTest.java
similarity index 92%
rename from java/test/processing/mode/java/pdex/util/RuntimePathBuilderTest.java
rename to java/test/processing/mode/java/RuntimePathBuilderTest.java
index 19fc76b807..96063a1878 100644
--- a/java/test/processing/mode/java/pdex/util/RuntimePathBuilderTest.java
+++ b/java/test/processing/mode/java/RuntimePathBuilderTest.java
@@ -18,15 +18,11 @@
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-package processing.mode.java.pdex.util;
+package processing.mode.java;
 
 import org.junit.Before;
 import org.junit.Test;
 import processing.app.Sketch;
-import processing.mode.java.JavaMode;
-import processing.mode.java.pdex.ImportStatement;
-import processing.mode.java.pdex.PreprocessedSketch;
-import processing.mode.java.pdex.util.RuntimePathFactoryTestUtil;
 
 import java.io.File;
 import java.util.Arrays;
@@ -42,7 +38,7 @@ public class RuntimePathBuilderTest {
   private JavaMode testMode;
   private List<ImportStatement> testImports;
   private Sketch testSketch;
-  private PreprocessedSketch.Builder result;
+  private PreprocSketch.Builder result;
 
   @Before
   public void setUp() throws Exception {
@@ -51,7 +47,7 @@ public void setUp() throws Exception {
     testImports = RuntimePathFactoryTestUtil.createTestImports();
     testSketch = RuntimePathFactoryTestUtil.createTestSketch();
 
-    result = new PreprocessedSketch.Builder();
+    result = new PreprocSketch.Builder();
     result.programImports.addAll(testImports);
     result.sketch = testSketch;
 
diff --git a/java/test/processing/mode/java/pdex/util/RuntimePathFactoryTestUtil.java b/java/test/processing/mode/java/RuntimePathFactoryTestUtil.java
similarity index 97%
rename from java/test/processing/mode/java/pdex/util/RuntimePathFactoryTestUtil.java
rename to java/test/processing/mode/java/RuntimePathFactoryTestUtil.java
index f2ad94d666..1303a02a3b 100644
--- a/java/test/processing/mode/java/pdex/util/RuntimePathFactoryTestUtil.java
+++ b/java/test/processing/mode/java/RuntimePathFactoryTestUtil.java
@@ -18,14 +18,12 @@
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-package processing.mode.java.pdex.util;
+package processing.mode.java;
 
 import org.mockito.Mockito;
 import processing.app.Library;
 import processing.app.Sketch;
 import processing.app.SketchException;
-import processing.mode.java.JavaMode;
-import processing.mode.java.pdex.ImportStatement;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/java/test/processing/mode/java/preproc/util/SyntaxUtilTest.java b/java/test/processing/mode/java/SourceUtilTest.java
similarity index 53%
rename from java/test/processing/mode/java/preproc/util/SyntaxUtilTest.java
rename to java/test/processing/mode/java/SourceUtilTest.java
index cbbf30abd5..53a57de1f5 100644
--- a/java/test/processing/mode/java/preproc/util/SyntaxUtilTest.java
+++ b/java/test/processing/mode/java/SourceUtilTest.java
@@ -1,23 +1,22 @@
-package processing.mode.java.preproc.util;
+package processing.mode.java;
 
 import org.junit.Assert;
 import org.junit.Test;
-import processing.mode.java.preproc.code.SyntaxUtil;
 
 
-public class SyntaxUtilTest {
+public class SourceUtilTest {
 
   @Test
   public void getCountPresent() {
     String input = "test1,test2\n,test3";
-    int count = processing.mode.java.preproc.code.SyntaxUtil.getCount(input, ",");
+    int count = SourceUtil.getCount(input, ",");
     Assert.assertEquals(2, count);
   }
 
   @Test
   public void getCountNotPresent() {
     String input = "test1 test2 test3";
-    int count = SyntaxUtil.getCount(input, ",");
+    int count = SourceUtil.getCount(input, ",");
     Assert.assertEquals(0, count);
   }
 
diff --git a/java/test/processing/mode/java/preproc/code/PrintWriterWithEditGenTest.java b/java/test/processing/mode/java/preproc/PrintWriterWithEditGenTest.java
similarity index 95%
rename from java/test/processing/mode/java/preproc/code/PrintWriterWithEditGenTest.java
rename to java/test/processing/mode/java/preproc/PrintWriterWithEditGenTest.java
index f7fb89eae4..c29e6b6065 100644
--- a/java/test/processing/mode/java/preproc/code/PrintWriterWithEditGenTest.java
+++ b/java/test/processing/mode/java/preproc/PrintWriterWithEditGenTest.java
@@ -1,12 +1,11 @@
-package processing.mode.java.preproc.code;
+package processing.mode.java.preproc;
 
 import org.antlr.v4.runtime.TokenStreamRewriter;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import processing.mode.java.pdex.TextTransform;
-import processing.mode.java.preproc.PdeParseTreeListener;
+import processing.mode.java.TextTransform;
 
 import java.util.List;