diff --git a/app/build.xml b/app/build.xml
index b6499e565..012d1ff52 100644
--- a/app/build.xml
+++ b/app/build.xml
@@ -1,20 +1,25 @@
 <?xml version="1.0"?>
 <project name="Processing PDE" default="build">
 
-  <property name="generated" value="${basedir}/generated/processing/app/antlr" />
-  <property name="grammars" value="${basedir}/grammars" />
-  <property name="antlrjar" value="${basedir}/lib/antlr.jar" />
+  <property name="generated" 
+	    value="${basedir}/generated/processing/mode/java/preproc" />
+
+  <property name="grammars" 
+	    value="${basedir}/src/processing/mode/java/preproc" />
+
+  <property name="antlrjar" 
+	    value="${basedir}/lib/antlr.jar" />
 
   <classloader taskname="antlr">
     <classpath path="lib/antlr.jar" />
   </classloader>
 
   <target name="clean" description="Clean the build directories">
-
     <!-- THIS SECTION SHOULD BE REMOVED AFTER A MONTH OR TWO -->
     <!-- jdf sez: clean up after old layout of generated resources -->
+<!--
     <delete failonerror="false">
-      <fileset dir="${basedir}/src/antlr/java">
+      <fileset dir="${basedir}/src/antlr">
 	<include name="*.java" />
 	<include name="*.tokens" />
 	<include name="*.txt" />
@@ -23,7 +28,9 @@
       </fileset>
     </delete>
     <delete failonerror="false">
+-->
       <!-- jdf sez: don't name anything FooRecognizer or FooLexer in this package -->
+<!--
       <fileset dir="${basedir}/src/processing/app/preproc">
 	<include name="*Recognizer.java" />
 	<include name="*Lexer.java" />
@@ -33,6 +40,7 @@
 	<include name="*.smap" />
       </fileset>
     </delete>
+-->
     <!-- END SECTION TO CLEAN UP AFTER OLD PROJECT LAYOUT -->
 
     <delete dir="bin" />
@@ -53,7 +61,9 @@
     <antlr target="${grammars}/java15.g" outputdirectory="${generated}">
       <classpath path="${antlrjar}" />
     </antlr>
-    <antlr target="${grammars}/pde.g" outputdirectory="${generated}" glib="${grammars}/java15.g">
+    <antlr target="${grammars}/pde.g" 
+	   outputdirectory="${generated}" 
+	   glib="${grammars}/java15.g">
       <classpath path="${antlrjar}" />
     </antlr>
   </target>
diff --git a/app/src/processing/mode/java/preproc/PdeEmitter.java b/app/src/processing/mode/java/preproc/PdeEmitter.java
index d45475e41..58b022971 100644
--- a/app/src/processing/mode/java/preproc/PdeEmitter.java
+++ b/app/src/processing/mode/java/preproc/PdeEmitter.java
@@ -8,7 +8,7 @@ import java.util.BitSet;
 import java.util.Stack;
 import processing.app.Preferences;
 import processing.app.SketchException;
-import processing.mode.java.preproc.antlr.PdeTokenTypes;
+import processing.mode.java.preproc.PdeTokenTypes;
 import antlr.CommonASTWithHiddenTokens;
 import antlr.CommonHiddenStreamToken;
 import antlr.collections.AST;
diff --git a/app/src/processing/mode/java/preproc/PdePreprocessor.java b/app/src/processing/mode/java/preproc/PdePreprocessor.java
index 3701c4c99..2b2e75fe7 100644
--- a/app/src/processing/mode/java/preproc/PdePreprocessor.java
+++ b/app/src/processing/mode/java/preproc/PdePreprocessor.java
@@ -33,9 +33,9 @@ import java.util.regex.Pattern;
 import processing.app.Preferences;
 import processing.app.SketchException;
 import processing.core.PApplet;
-import processing.mode.java.preproc.antlr.PdeLexer;
-import processing.mode.java.preproc.antlr.PdeRecognizer;
-import processing.mode.java.preproc.antlr.PdeTokenTypes;
+import processing.mode.java.preproc.PdeLexer;
+import processing.mode.java.preproc.PdeRecognizer;
+import processing.mode.java.preproc.PdeTokenTypes;
 import antlr.*;
 import antlr.collections.AST;
 
diff --git a/app/src/processing/mode/java/preproc/TokenUtil.java b/app/src/processing/mode/java/preproc/TokenUtil.java
index b20bf3fb4..e6c4721ea 100644
--- a/app/src/processing/mode/java/preproc/TokenUtil.java
+++ b/app/src/processing/mode/java/preproc/TokenUtil.java
@@ -2,7 +2,7 @@ package processing.mode.java.preproc;
 
 import java.lang.reflect.Field;
 import antlr.collections.AST;
-import processing.mode.java.preproc.antlr.PdeTokenTypes;
+import processing.mode.java.preproc.PdeTokenTypes;
 
 /**
  *