diff --git a/java/java-impl/java-impl.iml b/java/java-impl/java-impl.iml
index 54da7ac1d6cc..72169b16647d 100644
--- a/java/java-impl/java-impl.iml
+++ b/java/java-impl/java-impl.iml
@@ -26,6 +26,7 @@
     <orderEntry type="module" module-name="vcs-impl" />
     <orderEntry type="module" module-name="icons" />
     <orderEntry type="library" name="jcip" level="project" />
+    <orderEntry type="library" name="Groovy" level="project" />
   </component>
   <component name="copyright">
     <Base>
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/macro/GroovyScriptMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/GroovyScriptMacro.java
similarity index 100%
rename from platform/lang-impl/src/com/intellij/codeInsight/template/macro/GroovyScriptMacro.java
rename to java/java-impl/src/com/intellij/codeInsight/template/macro/GroovyScriptMacro.java
diff --git a/platform/lang-impl/lang-impl.iml b/platform/lang-impl/lang-impl.iml
index 8826fbdf2382..4d0dc179b794 100644
--- a/platform/lang-impl/lang-impl.iml
+++ b/platform/lang-impl/lang-impl.iml
@@ -18,7 +18,6 @@
     <orderEntry type="module" module-name="vcs-impl" />
     <orderEntry type="module" module-name="platform-impl" exported="" />
     <orderEntry type="module" module-name="usageView" exported="" />
-    <orderEntry type="library" name="Groovy" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
   </component>
 </module>