diff --git a/xml/xml-psi-impl/gen/com/intellij/lexer/_DtdLexer.java b/xml/xml-parser/gen/com/intellij/lexer/_DtdLexer.java
similarity index 100%
rename from xml/xml-psi-impl/gen/com/intellij/lexer/_DtdLexer.java
rename to xml/xml-parser/gen/com/intellij/lexer/_DtdLexer.java
diff --git a/xml/xml-psi-impl/gen/com/intellij/lexer/_HtmlLexer.java b/xml/xml-parser/gen/com/intellij/lexer/_HtmlLexer.java
similarity index 100%
rename from xml/xml-psi-impl/gen/com/intellij/lexer/_HtmlLexer.java
rename to xml/xml-parser/gen/com/intellij/lexer/_HtmlLexer.java
diff --git a/xml/xml-psi-impl/gen/com/intellij/lexer/_HtmlRawTextLexer.java b/xml/xml-parser/gen/com/intellij/lexer/_HtmlRawTextLexer.java
similarity index 100%
rename from xml/xml-psi-impl/gen/com/intellij/lexer/_HtmlRawTextLexer.java
rename to xml/xml-parser/gen/com/intellij/lexer/_HtmlRawTextLexer.java
diff --git a/xml/xml-psi-impl/gen/com/intellij/lexer/_XmlLexer.java b/xml/xml-parser/gen/com/intellij/lexer/_XmlLexer.java
similarity index 100%
rename from xml/xml-psi-impl/gen/com/intellij/lexer/_XmlLexer.java
rename to xml/xml-parser/gen/com/intellij/lexer/_XmlLexer.java
diff --git a/xml/xml-psi-impl/gen/com/intellij/lexer/__XmlLexer.java b/xml/xml-parser/gen/com/intellij/lexer/__XmlLexer.java
similarity index 100%
rename from xml/xml-psi-impl/gen/com/intellij/lexer/__XmlLexer.java
rename to xml/xml-parser/gen/com/intellij/lexer/__XmlLexer.java
diff --git a/xml/xml-parser/intellij.xml.parser.iml b/xml/xml-parser/intellij.xml.parser.iml
index b373407f5c69..05f70a7e7cbf 100644
--- a/xml/xml-parser/intellij.xml.parser.iml
+++ b/xml/xml-parser/intellij.xml.parser.iml
@@ -5,11 +5,13 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
   </component>
diff --git a/xml/xml-psi-impl/src/com/intellij/lexer/_DtdLexer.flex b/xml/xml-parser/src/com/intellij/lexer/_DtdLexer.flex
similarity index 100%
rename from xml/xml-psi-impl/src/com/intellij/lexer/_DtdLexer.flex
rename to xml/xml-parser/src/com/intellij/lexer/_DtdLexer.flex
diff --git a/xml/xml-psi-impl/src/com/intellij/lexer/_HtmlLexer.flex b/xml/xml-parser/src/com/intellij/lexer/_HtmlLexer.flex
similarity index 100%
rename from xml/xml-psi-impl/src/com/intellij/lexer/_HtmlLexer.flex
rename to xml/xml-parser/src/com/intellij/lexer/_HtmlLexer.flex
diff --git a/xml/xml-psi-impl/src/com/intellij/lexer/_HtmlRawTextLexer.flex b/xml/xml-parser/src/com/intellij/lexer/_HtmlRawTextLexer.flex
similarity index 100%
rename from xml/xml-psi-impl/src/com/intellij/lexer/_HtmlRawTextLexer.flex
rename to xml/xml-parser/src/com/intellij/lexer/_HtmlRawTextLexer.flex
diff --git a/xml/xml-psi-impl/src/com/intellij/lexer/_XmlLexer.flex b/xml/xml-parser/src/com/intellij/lexer/_XmlLexer.flex
similarity index 100%
rename from xml/xml-psi-impl/src/com/intellij/lexer/_XmlLexer.flex
rename to xml/xml-parser/src/com/intellij/lexer/_XmlLexer.flex