diff --git a/plugins/groovy/groovypp/groovypp.iml b/plugins/groovy/groovypp/groovypp.iml
deleted file mode 100644
index c80576200148..000000000000
--- a/plugins/groovy/groovypp/groovypp.iml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="jetgroovy" />
-    <orderEntry type="module" module-name="lang-api" />
-    <orderEntry type="module" module-name="idea-ui" />
-    <orderEntry type="module" module-name="openapi" />
-    <orderEntry type="module" module-name="java-impl" />
-  </component>
-</module>
-
diff --git a/plugins/groovy/groovypp/src/META-INF/plugin.xml b/plugins/groovy/groovypp/src/META-INF/plugin.xml
deleted file mode 100644
index 4c451bf64765..000000000000
--- a/plugins/groovy/groovypp/src/META-INF/plugin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<idea-plugin url="http://www.jetbrains.net/confluence/display/GRVY/Groovy+Home">
-  <id>org.intellij.groovy.gpp</id>
-  <name>Groovy++ Support</name>
-  <description>Adds code assistance for the Groovy++ features</description>
-  <version>0.1</version>
-  <idea-version since-build="95.90" until-build="96.239"/>
-  <vendor logo="/org/jetbrains/plugins/groovy/images/groovy_16x16.png" url="http://www.jetbrains.com">JetBrains Inc.</vendor>
-  <depends>org.intellij.groovy</depends>
-
-  <extensions defaultExtensionNs="org.intellij.groovy">
-    <libraryManager implementation="org.jetbrains.plugins.groovy.gpp.GppLibraryManager" order="first"/>
-    <typeConverter implementation="org.jetbrains.plugins.groovy.gpp.GppTypeConverter"/>
-    <expectedTypesContributor implementation="org.jetbrains.plugins.groovy.gpp.GppExpectedTypesContributor"/>
-    <variableEnhancer implementation="org.jetbrains.plugins.groovy.gpp.GppClosureParameterTypeProvider"/>
-    <classSubstitutor implementation="org.jetbrains.plugins.groovy.gpp.GppClassSubstitutor"/>
-    <nonCodeProcessor implementation="org.jetbrains.plugins.groovy.gpp.GppStdLibSupport"/>
-    <positionManagerDelegate implementation="org.jetbrains.plugins.groovy.gpp.GppPositionManager"/>
-  </extensions>
-
-  <extensions defaultExtensionNs="com.intellij">
-    <psi.referenceContributor implementation="org.jetbrains.plugins.groovy.gpp.GppReferenceContributor"/>
-  </extensions>
-
-
-</idea-plugin>
diff --git a/plugins/groovy/jetgroovy-tests.iml b/plugins/groovy/jetgroovy-tests.iml
index da38fa97ebb1..404e0345c714 100644
--- a/plugins/groovy/jetgroovy-tests.iml
+++ b/plugins/groovy/jetgroovy-tests.iml
@@ -25,7 +25,6 @@
     <orderEntry type="module" module-name="java-impl" />
     <orderEntry type="module" module-name="IntelliLang-java" />
     <orderEntry type="module" module-name="IntelliLang-xml" />
-    <orderEntry type="module" module-name="groovypp" />
   </component>
 </module>
 
diff --git a/plugins/groovy/src/META-INF/plugin.xml b/plugins/groovy/src/META-INF/plugin.xml
index 40278978db90..e82237be9222 100644
--- a/plugins/groovy/src/META-INF/plugin.xml
+++ b/plugins/groovy/src/META-INF/plugin.xml
@@ -72,7 +72,16 @@
 
     <membersContributor implementation="org.jetbrains.plugins.groovy.gant.GantMemberContributor"/>
 
-    <typeConverter implementation="org.jetbrains.plugins.groovy.lang.psi.impl.GrContainerTypeConverter"/> 
+    <typeConverter implementation="org.jetbrains.plugins.groovy.lang.psi.impl.GrContainerTypeConverter"/>
+
+    <libraryManager implementation="org.jetbrains.plugins.groovy.gpp.GppLibraryManager" order="first"/>
+    <typeConverter implementation="org.jetbrains.plugins.groovy.gpp.GppTypeConverter"/>
+    <expectedTypesContributor implementation="org.jetbrains.plugins.groovy.gpp.GppExpectedTypesContributor"/>
+    <variableEnhancer implementation="org.jetbrains.plugins.groovy.gpp.GppClosureParameterTypeProvider"/>
+    <classSubstitutor implementation="org.jetbrains.plugins.groovy.gpp.GppClassSubstitutor"/>
+    <nonCodeProcessor implementation="org.jetbrains.plugins.groovy.gpp.GppStdLibSupport"/>
+    <positionManagerDelegate implementation="org.jetbrains.plugins.groovy.gpp.GppPositionManager"/>
+    
   </extensions>
 
   <extensions defaultExtensionNs="com.intellij">
@@ -449,6 +458,7 @@
                     serviceImplementation="org.jetbrains.plugins.groovy.annotator.intentions.dynamic.DynamicToolWindowWrapper"/>
 
     <java.programPatcher implementation="org.jetbrains.plugins.groovy.debugger.GroovyHotSwapper"/>
+    <psi.referenceContributor implementation="org.jetbrains.plugins.groovy.gpp.GppReferenceContributor"/>
   </extensions>
 
   <extensions defaultExtensionNs="com.intellij.debugger">
diff --git a/plugins/groovy/groovypp/src/org/jetbrains/plugins/groovy/gpp/GppClassSubstitutor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gpp/GppClassSubstitutor.java
similarity index 100%
rename from plugins/groovy/groovypp/src/org/jetbrains/plugins/groovy/gpp/GppClassSubstitutor.java
rename to plugins/groovy/src/org/jetbrains/plugins/groovy/gpp/GppClassSubstitutor.java
diff --git a/plugins/groovy/groovypp/src/org/jetbrains/plugins/groovy/gpp/GppClosureParameterTypeProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gpp/GppClosureParameterTypeProvider.java
similarity index 100%
rename from plugins/groovy/groovypp/src/org/jetbrains/plugins/groovy/gpp/GppClosureParameterTypeProvider.java
rename to plugins/groovy/src/org/jetbrains/plugins/groovy/gpp/GppClosureParameterTypeProvider.java
diff --git a/plugins/groovy/groovypp/src/org/jetbrains/plugins/groovy/gpp/GppExpectedTypesContributor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gpp/GppExpectedTypesContributor.java
similarity index 100%
rename from plugins/groovy/groovypp/src/org/jetbrains/plugins/groovy/gpp/GppExpectedTypesContributor.java
rename to plugins/groovy/src/org/jetbrains/plugins/groovy/gpp/GppExpectedTypesContributor.java
diff --git a/plugins/groovy/groovypp/src/org/jetbrains/plugins/groovy/gpp/GppLibraryManager.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gpp/GppLibraryManager.java
similarity index 100%
rename from plugins/groovy/groovypp/src/org/jetbrains/plugins/groovy/gpp/GppLibraryManager.java
rename to plugins/groovy/src/org/jetbrains/plugins/groovy/gpp/GppLibraryManager.java
diff --git a/plugins/groovy/groovypp/src/org/jetbrains/plugins/groovy/gpp/GppPositionManager.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gpp/GppPositionManager.java
similarity index 100%
rename from plugins/groovy/groovypp/src/org/jetbrains/plugins/groovy/gpp/GppPositionManager.java
rename to plugins/groovy/src/org/jetbrains/plugins/groovy/gpp/GppPositionManager.java
diff --git a/plugins/groovy/groovypp/src/org/jetbrains/plugins/groovy/gpp/GppReferenceContributor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gpp/GppReferenceContributor.java
similarity index 100%
rename from plugins/groovy/groovypp/src/org/jetbrains/plugins/groovy/gpp/GppReferenceContributor.java
rename to plugins/groovy/src/org/jetbrains/plugins/groovy/gpp/GppReferenceContributor.java
diff --git a/plugins/groovy/groovypp/src/org/jetbrains/plugins/groovy/gpp/GppStdLibSupport.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gpp/GppStdLibSupport.java
similarity index 100%
rename from plugins/groovy/groovypp/src/org/jetbrains/plugins/groovy/gpp/GppStdLibSupport.java
rename to plugins/groovy/src/org/jetbrains/plugins/groovy/gpp/GppStdLibSupport.java
diff --git a/plugins/groovy/groovypp/src/org/jetbrains/plugins/groovy/gpp/GppTypeConverter.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gpp/GppTypeConverter.java
similarity index 100%
rename from plugins/groovy/groovypp/src/org/jetbrains/plugins/groovy/gpp/GppTypeConverter.java
rename to plugins/groovy/src/org/jetbrains/plugins/groovy/gpp/GppTypeConverter.java