diff --git a/org.eclipse.jdt.core.compiler.batch/build.properties b/org.eclipse.jdt.core.compiler.batch/build.properties
index 526c08d7605..a57901fef7e 100644
--- a/org.eclipse.jdt.core.compiler.batch/build.properties
+++ b/org.eclipse.jdt.core.compiler.batch/build.properties
@@ -19,5 +19,6 @@ bin.includes = META-INF/,\
                about.html
 src.includes = about.html,\
                META-INF/services/,\
-               META-INF/eclipse.inf
+               META-INF/eclipse.inf,\
+               grammar/
 jars.extra.classpath = lib/javax18api.jar,platform:/plugin/org.apache.ant/lib/ant.jar
diff --git a/org.eclipse.jdt.core/grammar/java.g b/org.eclipse.jdt.core.compiler.batch/grammar/java.g
similarity index 100%
rename from org.eclipse.jdt.core/grammar/java.g
rename to org.eclipse.jdt.core.compiler.batch/grammar/java.g
diff --git a/org.eclipse.jdt.core/scripts/GenerateParserScript.java b/org.eclipse.jdt.core.compiler.batch/scripts/GenerateParserScript.java
similarity index 98%
rename from org.eclipse.jdt.core/scripts/GenerateParserScript.java
rename to org.eclipse.jdt.core.compiler.batch/scripts/GenerateParserScript.java
index 8089bf894a7..d510395c5bf 100644
--- a/org.eclipse.jdt.core/scripts/GenerateParserScript.java
+++ b/org.eclipse.jdt.core.compiler.batch/scripts/GenerateParserScript.java
@@ -23,7 +23,7 @@ public class GenerateParserScript {
 
 	public static void main(String[] args) throws IOException, InterruptedException {
 		File grammarDir = new File("../grammar");
-		File parserDir = new File("../compiler/org/eclipse/jdt/internal/compiler/parser");
+		File parserDir = new File("../src/org/eclipse/jdt/internal/compiler/parser");
 		String jikespg = System.getProperty("JIKESPG");
 		assertTrue(jikespg != null);
 
diff --git a/org.eclipse.jdt.core/scripts/build-parser.launch b/org.eclipse.jdt.core.compiler.batch/scripts/build-parser.launch
similarity index 83%
rename from org.eclipse.jdt.core/scripts/build-parser.launch
rename to org.eclipse.jdt.core.compiler.batch/scripts/build-parser.launch
index 55abf6b92c1..4896c047574 100644
--- a/org.eclipse.jdt.core/scripts/build-parser.launch
+++ b/org.eclipse.jdt.core.compiler.batch/scripts/build-parser.launch
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
     <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-    <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
+    <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-        <listEntry value="/eclipse.jdt.core/org.eclipse.jdt.core/scripts/build-parser.xml"/>
+        <listEntry value="/eclipse.jdt.core/org.eclipse.jdt.core.compiler.batch/scripts/build-parser.xml"/>
     </listAttribute>
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
         <listEntry value="1"/>
@@ -12,9 +12,9 @@
     <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
     <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jdt.core"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jdt.core.compiler.batch"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.jdt.core/scripts/build-parser.xml}"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.jdt.core.compiler.batch/scripts/build-parser.xml}"/>
     <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-DJIKESPG=${JIKESPG}"/>
     <stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
 </launchConfiguration>
diff --git a/org.eclipse.jdt.core/scripts/build-parser.xml b/org.eclipse.jdt.core.compiler.batch/scripts/build-parser.xml
similarity index 100%
rename from org.eclipse.jdt.core/scripts/build-parser.xml
rename to org.eclipse.jdt.core.compiler.batch/scripts/build-parser.xml