diff --git a/java/java-impl/java-impl.iml b/java/java-impl/java-impl.iml
index 10212457d67c..37a1d87438d6 100644
--- a/java/java-impl/java-impl.iml
+++ b/java/java-impl/java-impl.iml
@@ -22,6 +22,7 @@
     <orderEntry type="module" module-name="execution-openapi" />
     <orderEntry type="module" module-name="boot" />
     <orderEntry type="library" name="asm" level="project" />
+    <orderEntry type="module" module-name="dom-openapi" />
   </component>
   <component name="copyright">
     <Base>
diff --git a/source/com/intellij/util/xml/CanonicalPsiTypeConverterImpl.java b/java/java-impl/src/com/intellij/util/xml/CanonicalPsiTypeConverterImpl.java
similarity index 100%
rename from source/com/intellij/util/xml/CanonicalPsiTypeConverterImpl.java
rename to java/java-impl/src/com/intellij/util/xml/CanonicalPsiTypeConverterImpl.java
diff --git a/source/com/intellij/util/xml/JvmPsiTypeConverterImpl.java b/java/java-impl/src/com/intellij/util/xml/JvmPsiTypeConverterImpl.java
similarity index 100%
rename from source/com/intellij/util/xml/JvmPsiTypeConverterImpl.java
rename to java/java-impl/src/com/intellij/util/xml/JvmPsiTypeConverterImpl.java
diff --git a/source/com/intellij/util/xml/PsiClassConverter.java b/java/java-impl/src/com/intellij/util/xml/PsiClassConverter.java
similarity index 100%
rename from source/com/intellij/util/xml/PsiClassConverter.java
rename to java/java-impl/src/com/intellij/util/xml/PsiClassConverter.java
diff --git a/source/com/intellij/util/xml/converters/ClassArrayConverterImpl.java b/java/java-impl/src/com/intellij/util/xml/converters/ClassArrayConverterImpl.java
similarity index 100%
rename from source/com/intellij/util/xml/converters/ClassArrayConverterImpl.java
rename to java/java-impl/src/com/intellij/util/xml/converters/ClassArrayConverterImpl.java
diff --git a/source/com/intellij/util/xml/converters/ClassValueConverterImpl.java b/java/java-impl/src/com/intellij/util/xml/converters/ClassValueConverterImpl.java
similarity index 100%
rename from source/com/intellij/util/xml/converters/ClassValueConverterImpl.java
rename to java/java-impl/src/com/intellij/util/xml/converters/ClassValueConverterImpl.java
diff --git a/source/com/intellij/util/xml/impl/ExtendsClassChecker.java b/java/java-impl/src/com/intellij/util/xml/impl/ExtendsClassChecker.java
similarity index 100%
rename from source/com/intellij/util/xml/impl/ExtendsClassChecker.java
rename to java/java-impl/src/com/intellij/util/xml/impl/ExtendsClassChecker.java
diff --git a/source/com/intellij/util/xml/impl/JavaDomApplicationComponent.java b/java/java-impl/src/com/intellij/util/xml/impl/JavaDomApplicationComponent.java
similarity index 100%
rename from source/com/intellij/util/xml/impl/JavaDomApplicationComponent.java
rename to java/java-impl/src/com/intellij/util/xml/impl/JavaDomApplicationComponent.java
diff --git a/source/com/intellij/util/xml/ui/PsiClassControl.java b/java/java-impl/src/com/intellij/util/xml/ui/PsiClassControl.java
similarity index 100%
rename from source/com/intellij/util/xml/ui/PsiClassControl.java
rename to java/java-impl/src/com/intellij/util/xml/ui/PsiClassControl.java
diff --git a/source/com/intellij/util/xml/ui/PsiClassTableCellEditor.java b/java/java-impl/src/com/intellij/util/xml/ui/PsiClassTableCellEditor.java
similarity index 100%
rename from source/com/intellij/util/xml/ui/PsiClassTableCellEditor.java
rename to java/java-impl/src/com/intellij/util/xml/ui/PsiClassTableCellEditor.java
diff --git a/source/com/intellij/util/xml/ui/PsiTypeControl.java b/java/java-impl/src/com/intellij/util/xml/ui/PsiTypeControl.java
similarity index 100%
rename from source/com/intellij/util/xml/ui/PsiTypeControl.java
rename to java/java-impl/src/com/intellij/util/xml/ui/PsiTypeControl.java