diff --git a/java/java-impl/java-impl.iml b/java/java-impl/java-impl.iml
index 37a1d87438d6..22a15cc6f93d 100644
--- a/java/java-impl/java-impl.iml
+++ b/java/java-impl/java-impl.iml
@@ -23,6 +23,7 @@
     <orderEntry type="module" module-name="boot" />
     <orderEntry type="library" name="asm" level="project" />
     <orderEntry type="module" module-name="dom-openapi" />
+    <orderEntry type="module" module-name="dom-impl" />
   </component>
   <component name="copyright">
     <Base>
diff --git a/source/com/intellij/ide/JavaDataAccessors.java b/java/java-impl/src/com/intellij/ide/JavaDataAccessors.java
similarity index 100%
rename from source/com/intellij/ide/JavaDataAccessors.java
rename to java/java-impl/src/com/intellij/ide/JavaDataAccessors.java
diff --git a/source/com/intellij/ide/macro/ClasspathEntryMacro.java b/java/java-impl/src/com/intellij/ide/macro/ClasspathEntryMacro.java
similarity index 100%
rename from source/com/intellij/ide/macro/ClasspathEntryMacro.java
rename to java/java-impl/src/com/intellij/ide/macro/ClasspathEntryMacro.java
diff --git a/source/com/intellij/ide/macro/ClasspathMacro.java b/java/java-impl/src/com/intellij/ide/macro/ClasspathMacro.java
similarity index 99%
rename from source/com/intellij/ide/macro/ClasspathMacro.java
rename to java/java-impl/src/com/intellij/ide/macro/ClasspathMacro.java
index 85ab1f52a007..10a8879f8c93 100644
--- a/source/com/intellij/ide/macro/ClasspathMacro.java
+++ b/java/java-impl/src/com/intellij/ide/macro/ClasspathMacro.java
@@ -1,4 +1,3 @@
-
 package com.intellij.ide.macro;
 
 import com.intellij.ide.IdeBundle;
diff --git a/source/com/intellij/ide/macro/FileClassMacro.java b/java/java-impl/src/com/intellij/ide/macro/FileClassMacro.java
similarity index 99%
rename from source/com/intellij/ide/macro/FileClassMacro.java
rename to java/java-impl/src/com/intellij/ide/macro/FileClassMacro.java
index def83cd8605a..093615963209 100644
--- a/source/com/intellij/ide/macro/FileClassMacro.java
+++ b/java/java-impl/src/com/intellij/ide/macro/FileClassMacro.java
@@ -1,4 +1,3 @@
-
 package com.intellij.ide.macro;
 
 import com.intellij.openapi.actionSystem.DataContext;
diff --git a/source/com/intellij/ide/macro/FileFQPackage.java b/java/java-impl/src/com/intellij/ide/macro/FileFQPackage.java
similarity index 100%
rename from source/com/intellij/ide/macro/FileFQPackage.java
rename to java/java-impl/src/com/intellij/ide/macro/FileFQPackage.java
diff --git a/source/com/intellij/ide/macro/FilePackageMacro.java b/java/java-impl/src/com/intellij/ide/macro/FilePackageMacro.java
similarity index 99%
rename from source/com/intellij/ide/macro/FilePackageMacro.java
rename to java/java-impl/src/com/intellij/ide/macro/FilePackageMacro.java
index a5a0081e2985..7bd47976a61c 100644
--- a/source/com/intellij/ide/macro/FilePackageMacro.java
+++ b/java/java-impl/src/com/intellij/ide/macro/FilePackageMacro.java
@@ -1,4 +1,3 @@
-
 package com.intellij.ide.macro;
 
 import com.intellij.openapi.actionSystem.DataContext;
diff --git a/source/com/intellij/ide/macro/JavaDocPathMacro.java b/java/java-impl/src/com/intellij/ide/macro/JavaDocPathMacro.java
similarity index 100%
rename from source/com/intellij/ide/macro/JavaDocPathMacro.java
rename to java/java-impl/src/com/intellij/ide/macro/JavaDocPathMacro.java
diff --git a/source/com/intellij/ide/macro/OutputPathMacro.java b/java/java-impl/src/com/intellij/ide/macro/OutputPathMacro.java
similarity index 100%
rename from source/com/intellij/ide/macro/OutputPathMacro.java
rename to java/java-impl/src/com/intellij/ide/macro/OutputPathMacro.java