[GitHub] geertjanw closed pull request #725: [NETBEANS-1152] Moving modules from groovy cluster into a subdirectory

[GitBox <gi...@apache.org>]

geertjanw closed pull request #725: [NETBEANS-1152] Moving modules from groovy cluster into a subdirectory
URL: https://github.com/apache/incubator-netbeans/pull/725
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/groovy.antproject/build.xml b/groovy/groovy.antproject/build.xml
similarity index 88%
rename from groovy.antproject/build.xml
rename to groovy/groovy.antproject/build.xml
index d233922569..7111ae307e 100644
--- a/groovy.antproject/build.xml
+++ b/groovy/groovy.antproject/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="netbeans" name="groovy.antproject">
+<project basedir="." default="build" name="groovy/groovy.antproject">
     <description>Builds, tests, and runs the project org.netbeans.modules.groovy.antproject</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/groovy.antproject/manifest.mf b/groovy/groovy.antproject/manifest.mf
similarity index 100%
rename from groovy.antproject/manifest.mf
rename to groovy/groovy.antproject/manifest.mf
diff --git a/groovy.antproject/nbproject/project.properties b/groovy/groovy.antproject/nbproject/project.properties
similarity index 100%
rename from groovy.antproject/nbproject/project.properties
rename to groovy/groovy.antproject/nbproject/project.properties
diff --git a/groovy.antproject/nbproject/project.xml b/groovy/groovy.antproject/nbproject/project.xml
similarity index 100%
rename from groovy.antproject/nbproject/project.xml
rename to groovy/groovy.antproject/nbproject/project.xml
diff --git a/groovy.antproject/src/org/netbeans/modules/groovy/antproject/Bundle.properties b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/Bundle.properties
similarity index 100%
rename from groovy.antproject/src/org/netbeans/modules/groovy/antproject/Bundle.properties
rename to groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/Bundle.properties
diff --git a/groovy.antproject/src/org/netbeans/modules/groovy/antproject/base/AbstractGroovyActionProvider.java b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/base/AbstractGroovyActionProvider.java
similarity index 100%
rename from groovy.antproject/src/org/netbeans/modules/groovy/antproject/base/AbstractGroovyActionProvider.java
rename to groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/base/AbstractGroovyActionProvider.java
diff --git a/groovy.antproject/src/org/netbeans/modules/groovy/antproject/base/AbstractGroovyExtender.java b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/base/AbstractGroovyExtender.java
similarity index 100%
rename from groovy.antproject/src/org/netbeans/modules/groovy/antproject/base/AbstractGroovyExtender.java
rename to groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/base/AbstractGroovyExtender.java
diff --git a/groovy.antproject/src/org/netbeans/modules/groovy/antproject/base/Bundle.properties b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/base/Bundle.properties
similarity index 100%
rename from groovy.antproject/src/org/netbeans/modules/groovy/antproject/base/Bundle.properties
rename to groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/base/Bundle.properties
diff --git a/groovy.antproject/src/org/netbeans/modules/groovy/antproject/common/BuildScriptHelper.java b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/common/BuildScriptHelper.java
similarity index 100%
rename from groovy.antproject/src/org/netbeans/modules/groovy/antproject/common/BuildScriptHelper.java
rename to groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/common/BuildScriptHelper.java
diff --git a/groovy.antproject/src/org/netbeans/modules/groovy/antproject/common/BuildScriptType.java b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/common/BuildScriptType.java
similarity index 100%
rename from groovy.antproject/src/org/netbeans/modules/groovy/antproject/common/BuildScriptType.java
rename to groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/common/BuildScriptType.java
diff --git a/groovy.antproject/src/org/netbeans/modules/groovy/antproject/ejb/EjbGroovyActionProvider.java b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/ejb/EjbGroovyActionProvider.java
similarity index 100%
rename from groovy.antproject/src/org/netbeans/modules/groovy/antproject/ejb/EjbGroovyActionProvider.java
rename to groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/ejb/EjbGroovyActionProvider.java
diff --git a/groovy.antproject/src/org/netbeans/modules/groovy/antproject/ejb/EjbGroovyExtender.java b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/ejb/EjbGroovyExtender.java
similarity index 100%
rename from groovy.antproject/src/org/netbeans/modules/groovy/antproject/ejb/EjbGroovyExtender.java
rename to groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/ejb/EjbGroovyExtender.java
diff --git a/groovy.antproject/src/org/netbeans/modules/groovy/antproject/ejb/EjbGroovyProjectOpenedHook.java b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/ejb/EjbGroovyProjectOpenedHook.java
similarity index 100%
rename from groovy.antproject/src/org/netbeans/modules/groovy/antproject/ejb/EjbGroovyProjectOpenedHook.java
rename to groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/ejb/EjbGroovyProjectOpenedHook.java
diff --git a/groovy.antproject/src/org/netbeans/modules/groovy/antproject/ejb/EjbGroovyXmlSavedHook.java b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/ejb/EjbGroovyXmlSavedHook.java
similarity index 100%
rename from groovy.antproject/src/org/netbeans/modules/groovy/antproject/ejb/EjbGroovyXmlSavedHook.java
rename to groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/ejb/EjbGroovyXmlSavedHook.java
diff --git a/groovy.antproject/src/org/netbeans/modules/groovy/antproject/j2se/JavaSEGroovyActionProvider.java b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/j2se/JavaSEGroovyActionProvider.java
similarity index 100%
rename from groovy.antproject/src/org/netbeans/modules/groovy/antproject/j2se/JavaSEGroovyActionProvider.java
rename to groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/j2se/JavaSEGroovyActionProvider.java
diff --git a/groovy.antproject/src/org/netbeans/modules/groovy/antproject/j2se/JavaSEGroovyExtender.java b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/j2se/JavaSEGroovyExtender.java
similarity index 100%
rename from groovy.antproject/src/org/netbeans/modules/groovy/antproject/j2se/JavaSEGroovyExtender.java
rename to groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/j2se/JavaSEGroovyExtender.java
diff --git a/groovy.antproject/src/org/netbeans/modules/groovy/antproject/j2se/JavaSEGroovyProjectOpenedHook.java b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/j2se/JavaSEGroovyProjectOpenedHook.java
similarity index 100%
rename from groovy.antproject/src/org/netbeans/modules/groovy/antproject/j2se/JavaSEGroovyProjectOpenedHook.java
rename to groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/j2se/JavaSEGroovyProjectOpenedHook.java
diff --git a/groovy.antproject/src/org/netbeans/modules/groovy/antproject/j2se/JavaSEGroovyXmlSavedHook.java b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/j2se/JavaSEGroovyXmlSavedHook.java
similarity index 100%
rename from groovy.antproject/src/org/netbeans/modules/groovy/antproject/j2se/JavaSEGroovyXmlSavedHook.java
rename to groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/j2se/JavaSEGroovyXmlSavedHook.java
diff --git a/groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-65.xml b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-65.xml
similarity index 100%
rename from groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-65.xml
rename to groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-65.xml
diff --git a/groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-ejb.xsl b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-ejb.xsl
similarity index 100%
rename from groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-ejb.xsl
rename to groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-ejb.xsl
diff --git a/groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-j2se.xsl b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-j2se.xsl
similarity index 100%
rename from groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-j2se.xsl
rename to groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-j2se.xsl
diff --git a/groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-sample-65.xml b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-sample-65.xml
similarity index 100%
rename from groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-sample-65.xml
rename to groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-sample-65.xml
diff --git a/groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-web.xsl b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-web.xsl
similarity index 100%
rename from groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-web.xsl
rename to groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-web.xsl
diff --git a/groovy.antproject/src/org/netbeans/modules/groovy/antproject/web/WebGroovyActionProvider.java b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/web/WebGroovyActionProvider.java
similarity index 100%
rename from groovy.antproject/src/org/netbeans/modules/groovy/antproject/web/WebGroovyActionProvider.java
rename to groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/web/WebGroovyActionProvider.java
diff --git a/groovy.antproject/src/org/netbeans/modules/groovy/antproject/web/WebGroovyExtender.java b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/web/WebGroovyExtender.java
similarity index 100%
rename from groovy.antproject/src/org/netbeans/modules/groovy/antproject/web/WebGroovyExtender.java
rename to groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/web/WebGroovyExtender.java
diff --git a/groovy.antproject/src/org/netbeans/modules/groovy/antproject/web/WebGroovyProjectOpenedHook.java b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/web/WebGroovyProjectOpenedHook.java
similarity index 100%
rename from groovy.antproject/src/org/netbeans/modules/groovy/antproject/web/WebGroovyProjectOpenedHook.java
rename to groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/web/WebGroovyProjectOpenedHook.java
diff --git a/groovy.antproject/src/org/netbeans/modules/groovy/antproject/web/WebGroovyXmlSavedHook.java b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/web/WebGroovyXmlSavedHook.java
similarity index 100%
rename from groovy.antproject/src/org/netbeans/modules/groovy/antproject/web/WebGroovyXmlSavedHook.java
rename to groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/web/WebGroovyXmlSavedHook.java
diff --git a/groovy.editor/build.xml b/groovy/groovy.editor/build.xml
similarity index 90%
rename from groovy.editor/build.xml
rename to groovy/groovy.editor/build.xml
index f4f0198e62..0900455ce9 100644
--- a/groovy.editor/build.xml
+++ b/groovy/groovy.editor/build.xml
@@ -22,7 +22,7 @@
 <!-- You may freely edit this file. See harness/README in the NetBeans platform -->
 <!-- for some information on what you could do (e.g. targets to override). -->
 <!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="groovy.editor" default="netbeans" basedir=".">
+<project name="groovy/groovy.editor" default="build" basedir=".">
     <description>Builds, tests, and runs the project org.netbeans.modules.groovy.editor</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/groovy.editor/licenseinfo.xml b/groovy/groovy.editor/licenseinfo.xml
similarity index 100%
rename from groovy.editor/licenseinfo.xml
rename to groovy/groovy.editor/licenseinfo.xml
diff --git a/groovy.editor/manifest.mf b/groovy/groovy.editor/manifest.mf
similarity index 100%
rename from groovy.editor/manifest.mf
rename to groovy/groovy.editor/manifest.mf
diff --git a/groovy.editor/nbproject/project.properties b/groovy/groovy.editor/nbproject/project.properties
similarity index 100%
rename from groovy.editor/nbproject/project.properties
rename to groovy/groovy.editor/nbproject/project.properties
diff --git a/groovy.editor/nbproject/project.xml b/groovy/groovy.editor/nbproject/project.xml
similarity index 100%
rename from groovy.editor/nbproject/project.xml
rename to groovy/groovy.editor/nbproject/project.xml
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/Bundle.properties b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/Bundle.properties
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/Bundle.properties
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/Bundle.properties
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/actions/Bundle.properties b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/actions/Bundle.properties
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/actions/Bundle.properties
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/actions/Bundle.properties
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/actions/FixImportsAction.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/actions/FixImportsAction.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/actions/FixImportsAction.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/actions/FixImportsAction.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/ASTUtils.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/ASTUtils.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/ASTUtils.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/ASTUtils.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/AstPath.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/AstPath.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/AstPath.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/AstPath.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/ElementUtils.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/ElementUtils.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/ElementUtils.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/ElementUtils.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/FindTypeUtils.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/FindTypeUtils.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/FindTypeUtils.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/FindTypeUtils.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/GroovyIndex.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/GroovyIndex.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/GroovyIndex.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/GroovyIndex.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/GroovyIndexer.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/GroovyIndexer.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/GroovyIndexer.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/GroovyIndexer.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/Methods.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/Methods.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/Methods.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/Methods.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/PathFinderVisitor.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/PathFinderVisitor.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/PathFinderVisitor.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/PathFinderVisitor.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/StructureAnalyzer.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/StructureAnalyzer.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/StructureAnalyzer.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/StructureAnalyzer.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/Bundle.properties b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/Bundle.properties
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/Bundle.properties
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/Bundle.properties
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/CaretLocation.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/CaretLocation.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/CaretLocation.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/CaretLocation.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/CompletionHandler.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/CompletionHandler.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/CompletionHandler.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/CompletionHandler.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/CompletionItem.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/CompletionItem.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/CompletionItem.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/CompletionItem.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/FieldSignature.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/FieldSignature.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/FieldSignature.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/FieldSignature.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/GroovyCompletionResult.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/GroovyCompletionResult.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/GroovyCompletionResult.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/GroovyCompletionResult.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/GroovyKeyword.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/GroovyKeyword.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/GroovyKeyword.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/GroovyKeyword.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/HTMLJavadocParser.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/HTMLJavadocParser.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/HTMLJavadocParser.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/HTMLJavadocParser.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/KeywordCategory.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/KeywordCategory.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/KeywordCategory.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/KeywordCategory.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/MethodSignature.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/MethodSignature.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/MethodSignature.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/MethodSignature.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/util/CompletionContext.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/util/CompletionContext.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/util/CompletionContext.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/util/CompletionContext.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/util/CompletionSurrounding.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/util/CompletionSurrounding.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/util/CompletionSurrounding.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/util/CompletionSurrounding.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/util/ContextHelper.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/util/ContextHelper.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/util/ContextHelper.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/util/ContextHelper.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/util/DotCompletionContext.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/util/DotCompletionContext.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/util/DotCompletionContext.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/util/DotCompletionContext.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/CommentElement.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/CommentElement.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/CommentElement.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/CommentElement.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/ElementHandleSupport.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/ElementHandleSupport.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/ElementHandleSupport.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/ElementHandleSupport.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/GroovyElement.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/GroovyElement.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/GroovyElement.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/GroovyElement.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/KeywordElement.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/KeywordElement.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/KeywordElement.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/KeywordElement.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/ast/ASTClass.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/ast/ASTClass.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/ast/ASTClass.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/ast/ASTClass.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/ast/ASTElement.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/ast/ASTElement.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/ast/ASTElement.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/ast/ASTElement.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/ast/ASTField.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/ast/ASTField.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/ast/ASTField.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/ast/ASTField.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/ast/ASTMethod.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/ast/ASTMethod.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/ast/ASTMethod.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/ast/ASTMethod.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/ast/ASTRoot.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/ast/ASTRoot.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/ast/ASTRoot.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/ast/ASTRoot.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/common/ClassElement.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/common/ClassElement.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/common/ClassElement.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/common/ClassElement.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/common/MethodElement.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/common/MethodElement.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/common/MethodElement.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/common/MethodElement.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/index/IndexedClass.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/index/IndexedClass.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/index/IndexedClass.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/index/IndexedClass.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/index/IndexedElement.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/index/IndexedElement.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/index/IndexedElement.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/index/IndexedElement.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/index/IndexedField.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/index/IndexedField.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/index/IndexedField.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/index/IndexedField.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/index/IndexedMethod.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/index/IndexedMethod.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/index/IndexedMethod.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/elements/index/IndexedMethod.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/lexer/Call.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/lexer/Call.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/lexer/Call.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/lexer/Call.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/lexer/GroovyLexer.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/lexer/GroovyLexer.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/lexer/GroovyLexer.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/lexer/GroovyLexer.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/lexer/GroovyTokenId.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/lexer/GroovyTokenId.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/lexer/GroovyTokenId.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/lexer/GroovyTokenId.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/lexer/LexUtilities.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/lexer/LexUtilities.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/lexer/LexUtilities.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/lexer/LexUtilities.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/Bundle.properties b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/Bundle.properties
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/Bundle.properties
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/Bundle.properties
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyLanguage.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyLanguage.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyLanguage.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyLanguage.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyOccurrencesFinder.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyOccurrencesFinder.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyOccurrencesFinder.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyOccurrencesFinder.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyParser.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyParser.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyParser.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyParser.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyParserResult.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyParserResult.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyParserResult.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyParserResult.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyVirtualSourceProvider.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyVirtualSourceProvider.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyVirtualSourceProvider.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyVirtualSourceProvider.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/compiler/ClassNodeCache.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/compiler/ClassNodeCache.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/compiler/ClassNodeCache.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/compiler/ClassNodeCache.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/compiler/CompilationUnit.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/compiler/CompilationUnit.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/compiler/CompilationUnit.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/compiler/CompilationUnit.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/compiler/error/CompilerErrorID.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/compiler/error/CompilerErrorID.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/compiler/error/CompilerErrorID.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/compiler/error/CompilerErrorID.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/compiler/error/CompilerErrorResolver.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/compiler/error/CompilerErrorResolver.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/compiler/error/CompilerErrorResolver.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/compiler/error/CompilerErrorResolver.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/compiler/error/GroovyError.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/compiler/error/GroovyError.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/compiler/error/GroovyError.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/compiler/error/GroovyError.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/AccessLevel.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/AccessLevel.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/completion/AccessLevel.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/AccessLevel.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/BaseCompletion.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/BaseCompletion.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/completion/BaseCompletion.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/BaseCompletion.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/ConstructorGenerationCompletion.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/ConstructorGenerationCompletion.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/completion/ConstructorGenerationCompletion.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/ConstructorGenerationCompletion.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/FieldCompletion.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/FieldCompletion.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/completion/FieldCompletion.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/FieldCompletion.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/KeywordCompletion.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/KeywordCompletion.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/completion/KeywordCompletion.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/KeywordCompletion.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/LocalVarCompletion.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/LocalVarCompletion.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/completion/LocalVarCompletion.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/LocalVarCompletion.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/MethodCompletion.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/MethodCompletion.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/completion/MethodCompletion.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/MethodCompletion.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/NamedParamsCompletion.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/NamedParamsCompletion.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/completion/NamedParamsCompletion.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/NamedParamsCompletion.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/NewVarCompletion.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/NewVarCompletion.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/completion/NewVarCompletion.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/NewVarCompletion.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/PackageCompletion.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/PackageCompletion.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/completion/PackageCompletion.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/PackageCompletion.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/ProposalsCollector.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/ProposalsCollector.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/completion/ProposalsCollector.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/ProposalsCollector.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/TypesCompletion.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/TypesCompletion.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/completion/TypesCompletion.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/TypesCompletion.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/inference/GroovyTypeAnalyzer.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/inference/GroovyTypeAnalyzer.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/completion/inference/GroovyTypeAnalyzer.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/inference/GroovyTypeAnalyzer.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/inference/MethodInference.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/inference/MethodInference.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/completion/inference/MethodInference.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/inference/MethodInference.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/inference/TypeInferenceVisitor.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/inference/TypeInferenceVisitor.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/completion/inference/TypeInferenceVisitor.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/inference/TypeInferenceVisitor.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/inference/VariableFinderVisitor.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/inference/VariableFinderVisitor.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/completion/inference/VariableFinderVisitor.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/inference/VariableFinderVisitor.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/provider/CompleteElementHandler.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/provider/CompleteElementHandler.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/completion/provider/CompleteElementHandler.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/provider/CompleteElementHandler.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/provider/CompletionProviderHandler.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/provider/CompletionProviderHandler.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/completion/provider/CompletionProviderHandler.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/provider/CompletionProviderHandler.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/provider/GroovyElementsProvider.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/provider/GroovyElementsProvider.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/completion/provider/GroovyElementsProvider.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/provider/GroovyElementsProvider.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/provider/JavaElementHandler.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/provider/JavaElementHandler.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/completion/provider/JavaElementHandler.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/provider/JavaElementHandler.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/provider/MetaElementsProvider.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/provider/MetaElementsProvider.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/completion/provider/MetaElementsProvider.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/provider/MetaElementsProvider.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/provider/TransformationHandler.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/provider/TransformationHandler.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/completion/provider/TransformationHandler.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/provider/TransformationHandler.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/util/CamelCaseUtil.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/util/CamelCaseUtil.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/completion/util/CamelCaseUtil.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/util/CamelCaseUtil.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/hints/AddImportStatementHint.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/hints/AddImportStatementHint.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/hints/AddImportStatementHint.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/hints/AddImportStatementHint.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/hints/ImplementAllAbstractMethodsHint.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/hints/ImplementAllAbstractMethodsHint.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/hints/ImplementAllAbstractMethodsHint.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/hints/ImplementAllAbstractMethodsHint.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/hints/MakeClassAbstractHint.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/hints/MakeClassAbstractHint.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/hints/MakeClassAbstractHint.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/hints/MakeClassAbstractHint.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/hints/SurroundWithHint.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/hints/SurroundWithHint.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/hints/SurroundWithHint.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/hints/SurroundWithHint.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/hints/infrastructure/GroovyErrorRule.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/hints/infrastructure/GroovyErrorRule.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/hints/infrastructure/GroovyErrorRule.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/hints/infrastructure/GroovyErrorRule.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/hints/infrastructure/GroovyHintsProvider.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/hints/infrastructure/GroovyHintsProvider.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/hints/infrastructure/GroovyHintsProvider.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/hints/infrastructure/GroovyHintsProvider.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/hints/infrastructure/GroovySelectionRule.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/hints/infrastructure/GroovySelectionRule.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/hints/infrastructure/GroovySelectionRule.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/hints/infrastructure/GroovySelectionRule.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/hints/utils/HintUtils.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/hints/utils/HintUtils.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/hints/utils/HintUtils.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/hints/utils/HintUtils.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/imports/Bundle.properties b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/imports/Bundle.properties
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/imports/Bundle.properties
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/imports/Bundle.properties
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/imports/ImportCandidate.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/imports/ImportCandidate.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/imports/ImportCandidate.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/imports/ImportCandidate.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/imports/ImportChooserInnerPanel.form b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/imports/ImportChooserInnerPanel.form
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/imports/ImportChooserInnerPanel.form
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/imports/ImportChooserInnerPanel.form
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/imports/ImportChooserInnerPanel.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/imports/ImportChooserInnerPanel.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/imports/ImportChooserInnerPanel.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/imports/ImportChooserInnerPanel.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/imports/ImportHelper.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/imports/ImportHelper.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/imports/ImportHelper.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/imports/ImportHelper.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/imports/ImportUtils.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/imports/ImportUtils.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/imports/ImportUtils.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/imports/ImportUtils.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/java/ElementDeclaration.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/java/ElementDeclaration.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/java/ElementDeclaration.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/java/ElementDeclaration.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/java/ElementSearch.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/java/ElementSearch.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/java/ElementSearch.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/java/ElementSearch.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/java/Utilities.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/java/Utilities.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/java/Utilities.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/java/Utilities.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/language/Bundle.properties b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/language/Bundle.properties
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/language/Bundle.properties
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/language/Bundle.properties
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyBracesMatcher.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyBracesMatcher.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyBracesMatcher.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyBracesMatcher.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyBracesMatcherFactory.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyBracesMatcherFactory.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyBracesMatcherFactory.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyBracesMatcherFactory.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyBracketCompleter.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyBracketCompleter.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyBracketCompleter.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyBracketCompleter.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyDeclarationFinder.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyDeclarationFinder.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyDeclarationFinder.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyDeclarationFinder.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyFormatter.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyFormatter.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyFormatter.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyFormatter.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyInstantRenamer.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyInstantRenamer.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyInstantRenamer.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyInstantRenamer.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovySemanticAnalyzer.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovySemanticAnalyzer.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovySemanticAnalyzer.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovySemanticAnalyzer.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyTypeSearcher.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyTypeSearcher.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyTypeSearcher.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/language/GroovyTypeSearcher.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/language/SemanticAnalysisVisitor.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/language/SemanticAnalysisVisitor.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/language/SemanticAnalysisVisitor.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/language/SemanticAnalysisVisitor.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/occurrences/TypeVisitor.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/occurrences/TypeVisitor.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/occurrences/TypeVisitor.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/occurrences/TypeVisitor.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/occurrences/VariableScopeVisitor.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/occurrences/VariableScopeVisitor.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/occurrences/VariableScopeVisitor.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/occurrences/VariableScopeVisitor.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/Bundle.properties b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/Bundle.properties
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/resources/Bundle.properties
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/Bundle.properties
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/DefaultAbbrevs.xml b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/DefaultAbbrevs.xml
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/resources/DefaultAbbrevs.xml
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/DefaultAbbrevs.xml
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/DefaultKeyBindings-Mac.xml b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/DefaultKeyBindings-Mac.xml
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/resources/DefaultKeyBindings-Mac.xml
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/DefaultKeyBindings-Mac.xml
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/DefaultKeyBindings.xml b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/DefaultKeyBindings.xml
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/resources/DefaultKeyBindings.xml
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/DefaultKeyBindings.xml
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/FontsAndColorsPreview.groovy b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/FontsAndColorsPreview.groovy
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/resources/FontsAndColorsPreview.groovy
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/FontsAndColorsPreview.groovy
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/GroovyFile16x16.png b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/GroovyFile16x16.png
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/resources/GroovyFile16x16.png
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/GroovyFile16x16.png
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/class.png b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/class.png
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/resources/class.png
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/class.png
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/duke.png b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/duke.png
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/resources/duke.png
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/duke.png
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/enum.png b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/enum.png
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/resources/enum.png
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/enum.png
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/fontsColors.xml b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/fontsColors.xml
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/resources/fontsColors.xml
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/fontsColors.xml
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/interface.png b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/interface.png
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/resources/interface.png
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/interface.png
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/layer.xml b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/layer.xml
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/resources/layer.xml
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/layer.xml
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/new_constructor_16.png b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/new_constructor_16.png
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/resources/new_constructor_16.png
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/new_constructor_16.png
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/package.gif b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/package.gif
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/resources/package.gif
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/package.gif
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/spi/completion/CompletionProvider.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/spi/completion/CompletionProvider.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/spi/completion/CompletionProvider.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/spi/completion/CompletionProvider.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/spi/completion/DefaultImportsProvider.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/spi/completion/DefaultImportsProvider.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/spi/completion/DefaultImportsProvider.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/spi/completion/DefaultImportsProvider.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/typinghooks/GroovyDeletedTextInterceptor.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/typinghooks/GroovyDeletedTextInterceptor.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/typinghooks/GroovyDeletedTextInterceptor.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/typinghooks/GroovyDeletedTextInterceptor.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/typinghooks/GroovyTypedBreakInterceptor.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/typinghooks/GroovyTypedBreakInterceptor.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/typinghooks/GroovyTypedBreakInterceptor.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/typinghooks/GroovyTypedBreakInterceptor.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/typinghooks/GroovyTypedTextInterceptor.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/typinghooks/GroovyTypedTextInterceptor.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/typinghooks/GroovyTypedTextInterceptor.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/typinghooks/GroovyTypedTextInterceptor.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/typinghooks/TypingHooksUtil.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/typinghooks/TypingHooksUtil.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/typinghooks/TypingHooksUtil.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/typinghooks/TypingHooksUtil.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/utils/ASTChildrenVisitor.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/utils/ASTChildrenVisitor.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/utils/ASTChildrenVisitor.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/utils/ASTChildrenVisitor.java
diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/utils/GroovyUtils.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/utils/GroovyUtils.java
similarity index 100%
rename from groovy.editor/src/org/netbeans/modules/groovy/editor/utils/GroovyUtils.java
rename to groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/utils/GroovyUtils.java
diff --git a/groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/GeneralGroovy.java b/groovy/groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/GeneralGroovy.java
similarity index 100%
rename from groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/GeneralGroovy.java
rename to groovy/groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/GeneralGroovy.java
diff --git a/groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/cc/testCC.java b/groovy/groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/cc/testCC.java
similarity index 100%
rename from groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/cc/testCC.java
rename to groovy/groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/cc/testCC.java
diff --git a/groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/cc/testCCCamelCase.java b/groovy/groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/cc/testCCCamelCase.java
similarity index 100%
rename from groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/cc/testCCCamelCase.java
rename to groovy/groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/cc/testCCCamelCase.java
diff --git a/groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/cc/testCCMixed.java b/groovy/groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/cc/testCCMixed.java
similarity index 100%
rename from groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/cc/testCCMixed.java
rename to groovy/groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/cc/testCCMixed.java
diff --git a/groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/cc/testCCProperties.java b/groovy/groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/cc/testCCProperties.java
similarity index 100%
rename from groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/cc/testCCProperties.java
rename to groovy/groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/cc/testCCProperties.java
diff --git a/groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/hints/testFixImport.java b/groovy/groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/hints/testFixImport.java
similarity index 100%
rename from groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/hints/testFixImport.java
rename to groovy/groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/hints/testFixImport.java
diff --git a/groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/refactor/testRefactor.java b/groovy/groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/refactor/testRefactor.java
similarity index 100%
rename from groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/refactor/testRefactor.java
rename to groovy/groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/refactor/testRefactor.java
diff --git a/groovy.editor/test/unit/data/testfiles/AliasOccurrencesTester.groovy b/groovy/groovy.editor/test/unit/data/testfiles/AliasOccurrencesTester.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/AliasOccurrencesTester.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/AliasOccurrencesTester.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/AliasOccurrencesTester.groovy.testFieldAlias.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/AliasOccurrencesTester.groovy.testFieldAlias.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/AliasOccurrencesTester.groovy.testFieldAlias.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/AliasOccurrencesTester.groovy.testFieldAlias.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/AliasOccurrencesTester.groovy.testFieldStaticImport.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/AliasOccurrencesTester.groovy.testFieldStaticImport.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/AliasOccurrencesTester.groovy.testFieldStaticImport.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/AliasOccurrencesTester.groovy.testFieldStaticImport.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/AliasOccurrencesTester.groovy.testMethodAlias.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/AliasOccurrencesTester.groovy.testMethodAlias.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/AliasOccurrencesTester.groovy.testMethodAlias.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/AliasOccurrencesTester.groovy.testMethodAlias.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/AliasOccurrencesTester.groovy.testMethodStaticImport.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/AliasOccurrencesTester.groovy.testMethodStaticImport.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/AliasOccurrencesTester.groovy.testMethodStaticImport.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/AliasOccurrencesTester.groovy.testMethodStaticImport.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy b/groovy/groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy.testAnnotationImport.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy.testAnnotationImport.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy.testAnnotationImport.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy.testAnnotationImport.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy.testAnnotationOnClass.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy.testAnnotationOnClass.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy.testAnnotationOnClass.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy.testAnnotationOnClass.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy.testAnnotationOnConstructor.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy.testAnnotationOnConstructor.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy.testAnnotationOnConstructor.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy.testAnnotationOnConstructor.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy.testAnnotationOnField.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy.testAnnotationOnField.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy.testAnnotationOnField.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy.testAnnotationOnField.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy.testAnnotationOnMethod.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy.testAnnotationOnMethod.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy.testAnnotationOnMethod.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy.testAnnotationOnMethod.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy.testAnnotationOnProperty.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy.testAnnotationOnProperty.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy.testAnnotationOnProperty.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/AnnotationOccurrencesTester.groovy.testAnnotationOnProperty.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/BookmarkController.groovy b/groovy/groovy.editor/test/unit/data/testfiles/BookmarkController.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/BookmarkController.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/BookmarkController.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.folds b/groovy/groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.folds
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.folds
rename to groovy/groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.folds
diff --git a/groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.indexed b/groovy/groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.indexed
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.indexed
rename to groovy/groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.indexed
diff --git a/groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.testClassVariable1.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.testClassVariable1.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.testClassVariable1.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.testClassVariable1.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.testClassVariable2.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.testClassVariable2.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.testClassVariable2.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.testClassVariable2.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.testParams.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.testParams.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.testParams.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.testParams.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.testSuperVariable.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.testSuperVariable.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.testSuperVariable.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.testSuperVariable.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.testUnusedParams.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.testUnusedParams.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.testUnusedParams.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/BookmarkController.groovy.testUnusedParams.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/FieldOccurrencesTester.groovy b/groovy/groovy.editor/test/unit/data/testfiles/FieldOccurrencesTester.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/FieldOccurrencesTester.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/FieldOccurrencesTester.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/FieldOccurrencesTester.groovy.testFieldWithJavaFieldOperator.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/FieldOccurrencesTester.groovy.testFieldWithJavaFieldOperator.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/FieldOccurrencesTester.groovy.testFieldWithJavaFieldOperator.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/FieldOccurrencesTester.groovy.testFieldWithJavaFieldOperator.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/FoldingTestTwo.groovy b/groovy/groovy.editor/test/unit/data/testfiles/FoldingTestTwo.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/FoldingTestTwo.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/FoldingTestTwo.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/FoldingTestTwo.groovy.folds b/groovy/groovy.editor/test/unit/data/testfiles/FoldingTestTwo.groovy.folds
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/FoldingTestTwo.groovy.folds
rename to groovy/groovy.editor/test/unit/data/testfiles/FoldingTestTwo.groovy.folds
diff --git a/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy b/groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testClass1.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testClass1.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testClass1.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testClass1.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testClass2.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testClass2.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testClass2.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testClass2.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testClass3.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testClass3.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testClass3.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testClass3.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testClass4.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testClass4.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testClass4.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testClass4.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testClosureParameter1.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testClosureParameter1.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testClosureParameter1.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testClosureParameter1.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testClosureParameter2.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testClosureParameter2.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testClosureParameter2.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testClosureParameter2.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testConstructor1.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testConstructor1.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testConstructor1.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testConstructor1.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testConstructor2.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testConstructor2.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testConstructor2.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testConstructor2.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testLocalVar3.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testLocalVar3.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testLocalVar3.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testLocalVar3.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMemberVar4.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMemberVar4.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMemberVar4.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMemberVar4.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod1.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod1.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod1.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod1.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod10.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod10.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod10.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod10.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod11.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod11.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod11.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod11.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod2.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod2.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod2.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod2.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod3.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod3.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod3.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod3.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod4.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod4.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod4.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod4.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod5.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod5.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod5.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod5.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod6.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod6.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod6.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod6.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod7.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod7.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod7.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod7.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod8.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod8.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod8.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod8.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod9.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod9.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod9.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethod9.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethodParameter1.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethodParameter1.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethodParameter1.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethodParameter1.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethodParameter2.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethodParameter2.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethodParameter2.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testMethodParameter2.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testNonIdentifier.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testNonIdentifier.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testNonIdentifier.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testNonIdentifier.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testPackageInScript.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testPackageInScript.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testPackageInScript.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testPackageInScript.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testParameter5.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testParameter5.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testParameter5.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testParameter5.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/Hello.groovy b/groovy/groovy.editor/test/unit/data/testfiles/Hello.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/Hello.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/Hello.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/Hello.groovy.indexed b/groovy/groovy.editor/test/unit/data/testfiles/Hello.groovy.indexed
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/Hello.groovy.indexed
rename to groovy/groovy.editor/test/unit/data/testfiles/Hello.groovy.indexed
diff --git a/groovy.editor/test/unit/data/testfiles/Hello.groovy.semantic b/groovy/groovy.editor/test/unit/data/testfiles/Hello.groovy.semantic
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/Hello.groovy.semantic
rename to groovy/groovy.editor/test/unit/data/testfiles/Hello.groovy.semantic
diff --git a/groovy.editor/test/unit/data/testfiles/Hello.groovy.testRename1.rename b/groovy/groovy.editor/test/unit/data/testfiles/Hello.groovy.testRename1.rename
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/Hello.groovy.testRename1.rename
rename to groovy/groovy.editor/test/unit/data/testfiles/Hello.groovy.testRename1.rename
diff --git a/groovy.editor/test/unit/data/testfiles/Hello.groovy.testVariable.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/Hello.groovy.testVariable.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/Hello.groovy.testVariable.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/Hello.groovy.testVariable.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/MiniClass.groovy b/groovy/groovy.editor/test/unit/data/testfiles/MiniClass.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/MiniClass.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/MiniClass.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/MiniClass2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/MiniClass2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/MiniClass2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/MiniClass2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/MiniClass3.groovy b/groovy/groovy.editor/test/unit/data/testfiles/MiniClass3.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/MiniClass3.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/MiniClass3.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/MiniClass3.groovy.testAbstractClass.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/MiniClass3.groovy.testAbstractClass.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/MiniClass3.groovy.testAbstractClass.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/MiniClass3.groovy.testAbstractClass.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testConstructor.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testConstructor.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testConstructor.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testConstructor.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testConstructorArray.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testConstructorArray.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testConstructorArray.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testConstructorArray.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testConstructorList.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testConstructorList.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testConstructorList.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testConstructorList.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclaration.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclaration.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclaration.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclaration.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationArray.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationArray.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationArray.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationArray.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationArrayWithInitialization.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationArrayWithInitialization.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationArrayWithInitialization.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationArrayWithInitialization.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationArrayWithInitialization_init.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationArrayWithInitialization_init.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationArrayWithInitialization_init.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationArrayWithInitialization_init.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationList.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationList.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationList.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationList.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationListWithInitialization.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationListWithInitialization.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationListWithInitialization.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationListWithInitialization.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationListWithInitialization_init.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationListWithInitialization_init.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationListWithInitialization_init.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationListWithInitialization_init.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationWithAssignement.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationWithAssignement.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationWithAssignement.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationWithAssignement.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationWithInitialization.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationWithInitialization.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationWithInitialization.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testDeclarationWithInitialization.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testExtends.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testExtends.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testExtends.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testExtends.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testField.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testField.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testField.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testField.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testFieldArray.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testFieldArray.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testFieldArray.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testFieldArray.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testFieldList.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testFieldList.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testFieldList.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testFieldList.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testForLoopCycle.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testForLoopCycle.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testForLoopCycle.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testForLoopCycle.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testImportStatement.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testImportStatement.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testImportStatement.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testImportStatement.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testInstanceOf.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testInstanceOf.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testInstanceOf.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testInstanceOf.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testParameterType.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testParameterType.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testParameterType.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testParameterType.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testParameterTypeArray.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testParameterTypeArray.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testParameterTypeArray.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testParameterTypeArray.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testParameterTypeList.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testParameterTypeList.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testParameterTypeList.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testParameterTypeList.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testProperty.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testProperty.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testProperty.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testProperty.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testPropertyArray.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testPropertyArray.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testPropertyArray.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testPropertyArray.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testPropertyList.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testPropertyList.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testPropertyList.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testPropertyList.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testPropertyList_init.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testPropertyList_init.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testPropertyList_init.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testPropertyList_init.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testReturnType.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testReturnType.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testReturnType.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testReturnType.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testReturnTypeArray.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testReturnTypeArray.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testReturnTypeArray.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testReturnTypeArray.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testReturnTypeList.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testReturnTypeList.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testReturnTypeList.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testReturnTypeList.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testStaticAccess.occurrences b/groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testStaticAccess.occurrences
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testStaticAccess.occurrences
rename to groovy/groovy.editor/test/unit/data/testfiles/TypeOccurrencesTester.groovy.testStaticAccess.occurrences
diff --git a/groovy.editor/test/unit/data/testfiles/ccresult/NoImportsMoreSpacesAfterPackage.groovy b/groovy/groovy.editor/test/unit/data/testfiles/ccresult/NoImportsMoreSpacesAfterPackage.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/ccresult/NoImportsMoreSpacesAfterPackage.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/ccresult/NoImportsMoreSpacesAfterPackage.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/ccresult/NoImportsMoreSpacesAfterPackage.groovy.ccresult b/groovy/groovy.editor/test/unit/data/testfiles/ccresult/NoImportsMoreSpacesAfterPackage.groovy.ccresult
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/ccresult/NoImportsMoreSpacesAfterPackage.groovy.ccresult
rename to groovy/groovy.editor/test/unit/data/testfiles/ccresult/NoImportsMoreSpacesAfterPackage.groovy.ccresult
diff --git a/groovy.editor/test/unit/data/testfiles/ccresult/NoImportsNoSpaceAfterPackage.groovy b/groovy/groovy.editor/test/unit/data/testfiles/ccresult/NoImportsNoSpaceAfterPackage.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/ccresult/NoImportsNoSpaceAfterPackage.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/ccresult/NoImportsNoSpaceAfterPackage.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/ccresult/NoImportsNoSpaceAfterPackage.groovy.ccresult b/groovy/groovy.editor/test/unit/data/testfiles/ccresult/NoImportsNoSpaceAfterPackage.groovy.ccresult
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/ccresult/NoImportsNoSpaceAfterPackage.groovy.ccresult
rename to groovy/groovy.editor/test/unit/data/testfiles/ccresult/NoImportsNoSpaceAfterPackage.groovy.ccresult
diff --git a/groovy.editor/test/unit/data/testfiles/ccresult/NoImportsSpaceAfterPackage.groovy b/groovy/groovy.editor/test/unit/data/testfiles/ccresult/NoImportsSpaceAfterPackage.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/ccresult/NoImportsSpaceAfterPackage.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/ccresult/NoImportsSpaceAfterPackage.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/ccresult/NoImportsSpaceAfterPackage.groovy.ccresult b/groovy/groovy.editor/test/unit/data/testfiles/ccresult/NoImportsSpaceAfterPackage.groovy.ccresult
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/ccresult/NoImportsSpaceAfterPackage.groovy.ccresult
rename to groovy/groovy.editor/test/unit/data/testfiles/ccresult/NoImportsSpaceAfterPackage.groovy.ccresult
diff --git a/groovy.editor/test/unit/data/testfiles/ccresult/SeveralImportsFirstPosition.groovy b/groovy/groovy.editor/test/unit/data/testfiles/ccresult/SeveralImportsFirstPosition.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/ccresult/SeveralImportsFirstPosition.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/ccresult/SeveralImportsFirstPosition.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/ccresult/SeveralImportsFirstPosition.groovy.ccresult b/groovy/groovy.editor/test/unit/data/testfiles/ccresult/SeveralImportsFirstPosition.groovy.ccresult
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/ccresult/SeveralImportsFirstPosition.groovy.ccresult
rename to groovy/groovy.editor/test/unit/data/testfiles/ccresult/SeveralImportsFirstPosition.groovy.ccresult
diff --git a/groovy.editor/test/unit/data/testfiles/ccresult/SeveralImportsLastPosition.groovy b/groovy/groovy.editor/test/unit/data/testfiles/ccresult/SeveralImportsLastPosition.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/ccresult/SeveralImportsLastPosition.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/ccresult/SeveralImportsLastPosition.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/ccresult/SeveralImportsLastPosition.groovy.ccresult b/groovy/groovy.editor/test/unit/data/testfiles/ccresult/SeveralImportsLastPosition.groovy.ccresult
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/ccresult/SeveralImportsLastPosition.groovy.ccresult
rename to groovy/groovy.editor/test/unit/data/testfiles/ccresult/SeveralImportsLastPosition.groovy.ccresult
diff --git a/groovy.editor/test/unit/data/testfiles/ccresult/SeveralImportsMiddlePosition.groovy b/groovy/groovy.editor/test/unit/data/testfiles/ccresult/SeveralImportsMiddlePosition.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/ccresult/SeveralImportsMiddlePosition.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/ccresult/SeveralImportsMiddlePosition.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/ccresult/SeveralImportsMiddlePosition.groovy.ccresult b/groovy/groovy.editor/test/unit/data/testfiles/ccresult/SeveralImportsMiddlePosition.groovy.ccresult
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/ccresult/SeveralImportsMiddlePosition.groovy.ccresult
rename to groovy/groovy.editor/test/unit/data/testfiles/ccresult/SeveralImportsMiddlePosition.groovy.ccresult
diff --git a/groovy.editor/test/unit/data/testfiles/ccresult/SupportingClasses.groovy b/groovy/groovy.editor/test/unit/data/testfiles/ccresult/SupportingClasses.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/ccresult/SupportingClasses.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/ccresult/SupportingClasses.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/CamelCaseConstructor1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/CamelCaseConstructor1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/CamelCaseConstructor1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/CamelCaseConstructor1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/CamelCaseConstructor1.groovy.testCamelCaseConstructor1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/CamelCaseConstructor1.groovy.testCamelCaseConstructor1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/CamelCaseConstructor1.groovy.testCamelCaseConstructor1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/CamelCaseConstructor1.groovy.testCamelCaseConstructor1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldLong1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldLong1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldLong1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldLong1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldLong1.groovy.testClassMethodFieldLong1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldLong1.groovy.testClassMethodFieldLong1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldLong1.groovy.testClassMethodFieldLong1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldLong1.groovy.testClassMethodFieldLong1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldLong2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldLong2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldLong2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldLong2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldLong2.groovy.testClassMethodFieldLong2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldLong2.groovy.testClassMethodFieldLong2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldLong2.groovy.testClassMethodFieldLong2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldLong2.groovy.testClassMethodFieldLong2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldString1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldString1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldString1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldString1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldString1.groovy.testClassMethodFieldString1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldString1.groovy.testClassMethodFieldString1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldString1.groovy.testClassMethodFieldString1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldString1.groovy.testClassMethodFieldString1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldString2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldString2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldString2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldString2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldString2.groovy.testClassMethodFieldString2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldString2.groovy.testClassMethodFieldString2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldString2.groovy.testClassMethodFieldString2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldString2.groovy.testClassMethodFieldString2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalLong1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalLong1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalLong1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalLong1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalLong1.groovy.testClassMethodLocalLong1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalLong1.groovy.testClassMethodLocalLong1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalLong1.groovy.testClassMethodLocalLong1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalLong1.groovy.testClassMethodLocalLong1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalLong2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalLong2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalLong2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalLong2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalLong2.groovy.testClassMethodLocalLong2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalLong2.groovy.testClassMethodLocalLong2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalLong2.groovy.testClassMethodLocalLong2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalLong2.groovy.testClassMethodLocalLong2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalString1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalString1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalString1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalString1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalString1.groovy.testClassMethodLocalString1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalString1.groovy.testClassMethodLocalString1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalString1.groovy.testClassMethodLocalString1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalString1.groovy.testClassMethodLocalString1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalString2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalString2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalString2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalString2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalString2.groovy.testClassMethodLocalString2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalString2.groovy.testClassMethodLocalString2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalString2.groovy.testClassMethodLocalString2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalString2.groovy.testClassMethodLocalString2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalStringConst1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalStringConst1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalStringConst1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalStringConst1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ConstructorCall1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/ConstructorCall1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ConstructorCall1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ConstructorCall1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ConstructorCall1.groovy.testConstructorCall1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/ConstructorCall1.groovy.testConstructorCall1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ConstructorCall1.groovy.testConstructorCall1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ConstructorCall1.groovy.testConstructorCall1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/KeywordAboveClass1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/KeywordAboveClass1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/KeywordAboveClass1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/KeywordAboveClass1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/KeywordAboveClass1.groovy.testKeywordAboveClass1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/KeywordAboveClass1.groovy.testKeywordAboveClass1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/KeywordAboveClass1.groovy.testKeywordAboveClass1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/KeywordAboveClass1.groovy.testKeywordAboveClass1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/KeywordAboveClass2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/KeywordAboveClass2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/KeywordAboveClass2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/KeywordAboveClass2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/KeywordAboveClass2.groovy.testKeywordAboveClass2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/KeywordAboveClass2.groovy.testKeywordAboveClass2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/KeywordAboveClass2.groovy.testKeywordAboveClass2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/KeywordAboveClass2.groovy.testKeywordAboveClass2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/KeywordImport1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/KeywordImport1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/KeywordImport1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/KeywordImport1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/KeywordImport1.groovy.testKeywordImport1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/KeywordImport1.groovy.testKeywordImport1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/KeywordImport1.groovy.testKeywordImport1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/KeywordImport1.groovy.testKeywordImport1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/KeywordImport2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/KeywordImport2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/KeywordImport2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/KeywordImport2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/MethodCompletionTestCase.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/MethodCompletionTestCase.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/MethodCompletionTestCase.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/MethodCompletionTestCase.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/MethodCompletionTestCase.groovy.testMethodCompletion1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/MethodCompletionTestCase.groovy.testMethodCompletion1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/MethodCompletionTestCase.groovy.testMethodCompletion1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/MethodCompletionTestCase.groovy.testMethodCompletion1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/MethodCompletionTestCase.groovy.testMethodCompletion2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/MethodCompletionTestCase.groovy.testMethodCompletion2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/MethodCompletionTestCase.groovy.testMethodCompletion2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/MethodCompletionTestCase.groovy.testMethodCompletion2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ScriptLong1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/ScriptLong1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ScriptLong1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ScriptLong1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ScriptLong1.groovy.testScriptLong1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/ScriptLong1.groovy.testScriptLong1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ScriptLong1.groovy.testScriptLong1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ScriptLong1.groovy.testScriptLong1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ScriptLong2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/ScriptLong2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ScriptLong2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ScriptLong2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ScriptLong2.groovy.testScriptLong2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/ScriptLong2.groovy.testScriptLong2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ScriptLong2.groovy.testScriptLong2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ScriptLong2.groovy.testScriptLong2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ScriptString1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/ScriptString1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ScriptString1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ScriptString1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ScriptString1.groovy.testScriptString1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/ScriptString1.groovy.testScriptString1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ScriptString1.groovy.testScriptString1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ScriptString1.groovy.testScriptString1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ScriptString2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/ScriptString2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ScriptString2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ScriptString2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ScriptString2.groovy.testScriptString2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/ScriptString2.groovy.testScriptString2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ScriptString2.groovy.testScriptString2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ScriptString2.groovy.testScriptString2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ScriptStringConst1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/ScriptStringConst1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ScriptStringConst1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ScriptStringConst1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/ScriptStringConst1.groovy.testScriptStringConst1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/ScriptStringConst1.groovy.testScriptStringConst1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/ScriptStringConst1.groovy.testScriptStringConst1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/ScriptStringConst1.groovy.testScriptStringConst1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/access/basicAccessLevels1/BasicAccessLevels1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/access/basicAccessLevels1/BasicAccessLevels1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/access/basicAccessLevels1/BasicAccessLevels1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/access/basicAccessLevels1/BasicAccessLevels1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/access/basicAccessLevels1/BasicAccessLevels1.groovy.testBasicAccessLevels1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/access/basicAccessLevels1/BasicAccessLevels1.groovy.testBasicAccessLevels1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/access/basicAccessLevels1/BasicAccessLevels1.groovy.testBasicAccessLevels1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/access/basicAccessLevels1/BasicAccessLevels1.groovy.testBasicAccessLevels1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion1/CamelCaseCompletion1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion1/CamelCaseCompletion1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion1/CamelCaseCompletion1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion1/CamelCaseCompletion1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion1/CamelCaseCompletion1.groovy.testCamelCaseCompletion1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion1/CamelCaseCompletion1.groovy.testCamelCaseCompletion1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion1/CamelCaseCompletion1.groovy.testCamelCaseCompletion1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion1/CamelCaseCompletion1.groovy.testCamelCaseCompletion1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion2/CamelCaseCompletion2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion2/CamelCaseCompletion2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion2/CamelCaseCompletion2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion2/CamelCaseCompletion2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion2/CamelCaseCompletion2.groovy.testCamelCaseCompletion2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion2/CamelCaseCompletion2.groovy.testCamelCaseCompletion2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion2/CamelCaseCompletion2.groovy.testCamelCaseCompletion2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion2/CamelCaseCompletion2.groovy.testCamelCaseCompletion2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion3/CamelCaseCompletion3.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion3/CamelCaseCompletion3.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion3/CamelCaseCompletion3.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion3/CamelCaseCompletion3.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion3/CamelCaseCompletion3.groovy.testCamelCaseCompletion3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion3/CamelCaseCompletion3.groovy.testCamelCaseCompletion3.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion3/CamelCaseCompletion3.groovy.testCamelCaseCompletion3.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion3/CamelCaseCompletion3.groovy.testCamelCaseCompletion3.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion4/CamelCaseCompletion4.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion4/CamelCaseCompletion4.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion4/CamelCaseCompletion4.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion4/CamelCaseCompletion4.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion4/CamelCaseCompletion4.groovy.testCamelCaseCompletion4.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion4/CamelCaseCompletion4.groovy.testCamelCaseCompletion4.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion4/CamelCaseCompletion4.groovy.testCamelCaseCompletion4.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion4/CamelCaseCompletion4.groovy.testCamelCaseCompletion4.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion5/CamelCaseCompletion5.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion5/CamelCaseCompletion5.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion5/CamelCaseCompletion5.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion5/CamelCaseCompletion5.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion5/CamelCaseCompletion5.groovy.testCamelCaseCompletion5.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion5/CamelCaseCompletion5.groovy.testCamelCaseCompletion5.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion5/CamelCaseCompletion5.groovy.testCamelCaseCompletion5.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion5/CamelCaseCompletion5.groovy.testCamelCaseCompletion5.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion6/CamelCaseCompletion6.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion6/CamelCaseCompletion6.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion6/CamelCaseCompletion6.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion6/CamelCaseCompletion6.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion6/CamelCaseCompletion6.groovy.testCamelCaseCompletion6.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion6/CamelCaseCompletion6.groovy.testCamelCaseCompletion6.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion6/CamelCaseCompletion6.groovy.testCamelCaseCompletion6.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion6/CamelCaseCompletion6.groovy.testCamelCaseCompletion6.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion7/CamelCaseCompletion7.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion7/CamelCaseCompletion7.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion7/CamelCaseCompletion7.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion7/CamelCaseCompletion7.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion7/CamelCaseCompletion7.groovy.testCamelCaseCompletion7.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion7/CamelCaseCompletion7.groovy.testCamelCaseCompletion7.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion7/CamelCaseCompletion7.groovy.testCamelCaseCompletion7.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion7/CamelCaseCompletion7.groovy.testCamelCaseCompletion7.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion8/CamelCaseCompletion8.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion8/CamelCaseCompletion8.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion8/CamelCaseCompletion8.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion8/CamelCaseCompletion8.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion8/CamelCaseCompletion8.groovy.testCamelCaseCompletion8.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion8/CamelCaseCompletion8.groovy.testCamelCaseCompletion8.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion8/CamelCaseCompletion8.groovy.testCamelCaseCompletion8.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/camelcase/camelCaseCompletion8/CamelCaseCompletion8.groovy.testCamelCaseCompletion8.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_3.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_3.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_3.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_4.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_4.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_4.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_4.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_5.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_5.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_5.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_5.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_6.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_6.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_6.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_6.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_7.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_7.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_7.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_7.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_8.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_8.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_8.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_8.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_3.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_3.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_3.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_4.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_4.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_4.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_4.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_5.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_5.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_5.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_5.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_6.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_6.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_6.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_6.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors1/Constructors1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors1/Constructors1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/constructors1/Constructors1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors1/Constructors1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors1/Constructors1.groovy.testConstructors1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors1/Constructors1.groovy.testConstructors1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/constructors1/Constructors1.groovy.testConstructors1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors1/Constructors1.groovy.testConstructors1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors2/Constructors2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors2/Constructors2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/constructors2/Constructors2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors2/Constructors2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors2/Constructors2.groovy.testConstructors2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors2/Constructors2.groovy.testConstructors2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/constructors2/Constructors2.groovy.testConstructors2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors2/Constructors2.groovy.testConstructors2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors3/Constructors3.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors3/Constructors3.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/constructors3/Constructors3.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors3/Constructors3.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors3/Constructors3.groovy.testConstructors3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors3/Constructors3.groovy.testConstructors3.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/constructors3/Constructors3.groovy.testConstructors3.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors3/Constructors3.groovy.testConstructors3.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors4/Constructors4.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors4/Constructors4.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/constructors4/Constructors4.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors4/Constructors4.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors4/Constructors4.groovy.testConstructors4.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors4/Constructors4.groovy.testConstructors4.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/constructors4/Constructors4.groovy.testConstructors4.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors4/Constructors4.groovy.testConstructors4.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors5/Constructors5.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors5/Constructors5.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/constructors5/Constructors5.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors5/Constructors5.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors5/Constructors5.groovy.testConstructors5.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors5/Constructors5.groovy.testConstructors5.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/constructors5/Constructors5.groovy.testConstructors5.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors5/Constructors5.groovy.testConstructors5.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors6/Constructors6.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors6/Constructors6.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/constructors6/Constructors6.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors6/Constructors6.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors6/Constructors6.groovy.testConstructors6.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors6/Constructors6.groovy.testConstructors6.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/constructors6/Constructors6.groovy.testConstructors6.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors6/Constructors6.groovy.testConstructors6.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors7/Constructors7.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors7/Constructors7.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/constructors7/Constructors7.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors7/Constructors7.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors7/Constructors7.groovy.testConstructors7.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors7/Constructors7.groovy.testConstructors7.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/constructors7/Constructors7.groovy.testConstructors7.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors7/Constructors7.groovy.testConstructors7.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors8/Constructors8.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors8/Constructors8.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/constructors8/Constructors8.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors8/Constructors8.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors8/Constructors8.groovy.testConstructors8.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors8/Constructors8.groovy.testConstructors8.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/constructors8/Constructors8.groovy.testConstructors8.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors8/Constructors8.groovy.testConstructors8.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/importedType/Bar.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/importedType/Bar.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/importedType/Bar.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/importedType/Bar.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/importedType/ImportedType.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/importedType/ImportedType.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/importedType/ImportedType.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/importedType/ImportedType.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/importedType/ImportedType.groovy.testImportedType.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/importedType/ImportedType.groovy.testImportedType.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/importedType/ImportedType.groovy.testImportedType.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/importedType/ImportedType.groovy.testImportedType.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/importedTypeMoreConstructors/Bar.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/importedTypeMoreConstructors/Bar.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/importedTypeMoreConstructors/Bar.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/importedTypeMoreConstructors/Bar.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/importedTypeMoreConstructors/ImportedTypeMoreConstructors.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/importedTypeMoreConstructors/ImportedTypeMoreConstructors.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/importedTypeMoreConstructors/ImportedTypeMoreConstructors.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/importedTypeMoreConstructors/ImportedTypeMoreConstructors.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/importedTypeMoreConstructors/ImportedTypeMoreConstructors.groovy.testImportedTypeMoreConstructors.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/importedTypeMoreConstructors/ImportedTypeMoreConstructors.groovy.testImportedTypeMoreConstructors.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/importedTypeMoreConstructors/ImportedTypeMoreConstructors.groovy.testImportedTypeMoreConstructors.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/importedTypeMoreConstructors/ImportedTypeMoreConstructors.groovy.testImportedTypeMoreConstructors.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/samePackage/Bar.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/samePackage/Bar.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/samePackage/Bar.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/samePackage/Bar.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/samePackage/SamePackage.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/samePackage/SamePackage.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/samePackage/SamePackage.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/samePackage/SamePackage.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/samePackage/SamePackage.groovy.testSamePackage.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/samePackage/SamePackage.groovy.testSamePackage.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/samePackage/SamePackage.groovy.testSamePackage.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/samePackage/SamePackage.groovy.testSamePackage.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/samePackageMoreConstructors/Bar.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/samePackageMoreConstructors/Bar.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/samePackageMoreConstructors/Bar.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/samePackageMoreConstructors/Bar.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/samePackageMoreConstructors/SamePackageMoreConstructors.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/samePackageMoreConstructors/SamePackageMoreConstructors.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/samePackageMoreConstructors/SamePackageMoreConstructors.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/samePackageMoreConstructors/SamePackageMoreConstructors.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/constructors/samePackageMoreConstructors/SamePackageMoreConstructors.groovy.testSamePackageMoreConstructors.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/samePackageMoreConstructors/SamePackageMoreConstructors.groovy.testSamePackageMoreConstructors.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/constructors/samePackageMoreConstructors/SamePackageMoreConstructors.groovy.testSamePackageMoreConstructors.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/samePackageMoreConstructors/SamePackageMoreConstructors.groovy.testSamePackageMoreConstructors.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/duplicates/a/A.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/duplicates/a/A.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/duplicates/a/A.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/duplicates/a/A.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/duplicates/b/B.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/duplicates/b/B.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/duplicates/b/B.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/duplicates/b/B.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/duplicates/b/B.groovy.testDuplicates1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/duplicates/b/B.groovy.testDuplicates1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/duplicates/b/B.groovy.testDuplicates1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/duplicates/b/B.groovy.testDuplicates1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/duplicates/c/C.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/duplicates/c/C.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/duplicates/c/C.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/duplicates/c/C.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/duplicates/c/C.groovy.testDuplicates2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/duplicates/c/C.groovy.testDuplicates2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/duplicates/c/C.groovy.testDuplicates2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/duplicates/c/C.groovy.testDuplicates2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/duplicates/d/D.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/duplicates/d/D.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/duplicates/d/D.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/duplicates/d/D.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/duplicates/d/D.groovy.testDuplicates3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/duplicates/d/D.groovy.testDuplicates3.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/duplicates/d/D.groovy.testDuplicates3.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/duplicates/d/D.groovy.testDuplicates3.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/field/Fields1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/field/Fields1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/field/Fields1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/field/Fields1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/field/Fields1.groovy.testFields1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/field/Fields1.groovy.testFields1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/field/Fields1.groovy.testFields1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/field/Fields1.groovy.testFields1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/field/Fields1.groovy.testFields2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/field/Fields1.groovy.testFields2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/field/Fields1.groovy.testFields2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/field/Fields1.groovy.testFields2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/grails/dataSourceClosure1/DataSourceClosure1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/grails/dataSourceClosure1/DataSourceClosure1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/grails/dataSourceClosure1/DataSourceClosure1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/grails/dataSourceClosure1/DataSourceClosure1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/grails/dataSourceClosure1/DataSourceClosure1.groovy.testDataSourceClosure1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/grails/dataSourceClosure1/DataSourceClosure1.groovy.testDataSourceClosure1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/grails/dataSourceClosure1/DataSourceClosure1.groovy.testDataSourceClosure1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/grails/dataSourceClosure1/DataSourceClosure1.groovy.testDataSourceClosure1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/import/staticImportCompletion/StaticImportCompletion.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/import/staticImportCompletion/StaticImportCompletion.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/import/staticImportCompletion/StaticImportCompletion.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/import/staticImportCompletion/StaticImportCompletion.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/import/staticImportCompletion/StaticImportCompletion.groovy.testStaticImportCompletion.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/import/staticImportCompletion/StaticImportCompletion.groovy.testStaticImportCompletion.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/import/staticImportCompletion/StaticImportCompletion.groovy.testStaticImportCompletion.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/import/staticImportCompletion/StaticImportCompletion.groovy.testStaticImportCompletion.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/inference/Inference1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/inference/Inference1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/inference/Inference1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/inference/Inference1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/inference/Inference1.groovy.testInference1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/inference/Inference1.groovy.testInference1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/inference/Inference1.groovy.testInference1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/inference/Inference1.groovy.testInference1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/inference/Inference1.groovy.testInference2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/inference/Inference1.groovy.testInference2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/inference/Inference1.groovy.testInference2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/inference/Inference1.groovy.testInference2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy.testInterfaceCompletion1_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy.testInterfaceCompletion1_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy.testInterfaceCompletion1_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy.testInterfaceCompletion1_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy.testInterfaceCompletion1_2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy.testInterfaceCompletion1_2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy.testInterfaceCompletion1_2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy.testInterfaceCompletion1_2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy.testInterfaceCompletion1_3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy.testInterfaceCompletion1_3.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy.testInterfaceCompletion1_3.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy.testInterfaceCompletion1_3.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy.testInterfaceCompletion1_4.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy.testInterfaceCompletion1_4.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy.testInterfaceCompletion1_4.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy.testInterfaceCompletion1_4.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy.testInterfaceCompletion1_5.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy.testInterfaceCompletion1_5.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy.testInterfaceCompletion1_5.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy.testInterfaceCompletion1_5.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionForLiteral1/CompletionForLiteral1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionForLiteral1/CompletionForLiteral1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionForLiteral1/CompletionForLiteral1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionForLiteral1/CompletionForLiteral1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionForLiteral1/CompletionForLiteral1.groovy.testCompletionForLiteral1_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionForLiteral1/CompletionForLiteral1.groovy.testCompletionForLiteral1_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionForLiteral1/CompletionForLiteral1.groovy.testCompletionForLiteral1_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionForLiteral1/CompletionForLiteral1.groovy.testCompletionForLiteral1_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionForLiteral1/CompletionForLiteral1.groovy.testCompletionForLiteral1_2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionForLiteral1/CompletionForLiteral1.groovy.testCompletionForLiteral1_2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionForLiteral1/CompletionForLiteral1.groovy.testCompletionForLiteral1_2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionForLiteral1/CompletionForLiteral1.groovy.testCompletionForLiteral1_2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionForLiteral1/CompletionForLiteral1.groovy.testCompletionForLiteral1_3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionForLiteral1/CompletionForLiteral1.groovy.testCompletionForLiteral1_3.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionForLiteral1/CompletionForLiteral1.groovy.testCompletionForLiteral1_3.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionForLiteral1/CompletionForLiteral1.groovy.testCompletionForLiteral1_3.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionGeneratedAccessors1/CompletionGeneratedAccessors1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGeneratedAccessors1/CompletionGeneratedAccessors1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionGeneratedAccessors1/CompletionGeneratedAccessors1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGeneratedAccessors1/CompletionGeneratedAccessors1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionGeneratedAccessors1/CompletionGeneratedAccessors1.groovy.testCompletionGeneratedAccessors1_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGeneratedAccessors1/CompletionGeneratedAccessors1.groovy.testCompletionGeneratedAccessors1_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionGeneratedAccessors1/CompletionGeneratedAccessors1.groovy.testCompletionGeneratedAccessors1_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGeneratedAccessors1/CompletionGeneratedAccessors1.groovy.testCompletionGeneratedAccessors1_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionGeneratedAccessors1/CompletionGeneratedAccessors1.groovy.testCompletionGeneratedAccessors1_2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGeneratedAccessors1/CompletionGeneratedAccessors1.groovy.testCompletionGeneratedAccessors1_2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionGeneratedAccessors1/CompletionGeneratedAccessors1.groovy.testCompletionGeneratedAccessors1_2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGeneratedAccessors1/CompletionGeneratedAccessors1.groovy.testCompletionGeneratedAccessors1_2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionGeneratedAccessors1/CompletionGeneratedAccessors1.groovy.testCompletionGeneratedAccessors1_3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGeneratedAccessors1/CompletionGeneratedAccessors1.groovy.testCompletionGeneratedAccessors1_3.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionGeneratedAccessors1/CompletionGeneratedAccessors1.groovy.testCompletionGeneratedAccessors1_3.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGeneratedAccessors1/CompletionGeneratedAccessors1.groovy.testCompletionGeneratedAccessors1_3.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionGroovyClass1/CompletionGroovyClass1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGroovyClass1/CompletionGroovyClass1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionGroovyClass1/CompletionGroovyClass1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGroovyClass1/CompletionGroovyClass1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionGroovyClass1/CompletionGroovyClass1.groovy.testCompletionGroovyClass1_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGroovyClass1/CompletionGroovyClass1.groovy.testCompletionGroovyClass1_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionGroovyClass1/CompletionGroovyClass1.groovy.testCompletionGroovyClass1_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGroovyClass1/CompletionGroovyClass1.groovy.testCompletionGroovyClass1_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionGroovySuper1/CompletionGroovySuper1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGroovySuper1/CompletionGroovySuper1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionGroovySuper1/CompletionGroovySuper1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGroovySuper1/CompletionGroovySuper1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionGroovySuper1/CompletionGroovySuper1.groovy.testCompletionGroovySuper1_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGroovySuper1/CompletionGroovySuper1.groovy.testCompletionGroovySuper1_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionGroovySuper1/CompletionGroovySuper1.groovy.testCompletionGroovySuper1_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGroovySuper1/CompletionGroovySuper1.groovy.testCompletionGroovySuper1_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionGroovyThis1/CompletionGroovyThis1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGroovyThis1/CompletionGroovyThis1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionGroovyThis1/CompletionGroovyThis1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGroovyThis1/CompletionGroovyThis1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionGroovyThis1/CompletionGroovyThis1.groovy.testCompletionGroovyThis1_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGroovyThis1/CompletionGroovyThis1.groovy.testCompletionGroovyThis1_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionGroovyThis1/CompletionGroovyThis1.groovy.testCompletionGroovyThis1_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGroovyThis1/CompletionGroovyThis1.groovy.testCompletionGroovyThis1_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionInArgument1/CompletionInArgument1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInArgument1/CompletionInArgument1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionInArgument1/CompletionInArgument1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInArgument1/CompletionInArgument1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionInArgument1/CompletionInArgument1.groovy.testCompletionInArgument1_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInArgument1/CompletionInArgument1.groovy.testCompletionInArgument1_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionInArgument1/CompletionInArgument1.groovy.testCompletionInArgument1_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInArgument1/CompletionInArgument1.groovy.testCompletionInArgument1_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionInMethodCall1/CompletionInMethodCall1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInMethodCall1/CompletionInMethodCall1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionInMethodCall1/CompletionInMethodCall1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInMethodCall1/CompletionInMethodCall1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionInMethodCall1/CompletionInMethodCall1.groovy.testCompletionInMethodCall1_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInMethodCall1/CompletionInMethodCall1.groovy.testCompletionInMethodCall1_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionInMethodCall1/CompletionInMethodCall1.groovy.testCompletionInMethodCall1_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInMethodCall1/CompletionInMethodCall1.groovy.testCompletionInMethodCall1_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionInMethodCall2/CompletionInMethodCall2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInMethodCall2/CompletionInMethodCall2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionInMethodCall2/CompletionInMethodCall2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInMethodCall2/CompletionInMethodCall2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionInMethodCall2/CompletionInMethodCall2.groovy.testCompletionInMethodCall2_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInMethodCall2/CompletionInMethodCall2.groovy.testCompletionInMethodCall2_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionInMethodCall2/CompletionInMethodCall2.groovy.testCompletionInMethodCall2_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInMethodCall2/CompletionInMethodCall2.groovy.testCompletionInMethodCall2_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionInMethodCall3/CompletionInMethodCall3.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInMethodCall3/CompletionInMethodCall3.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionInMethodCall3/CompletionInMethodCall3.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInMethodCall3/CompletionInMethodCall3.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionInMethodCall3/CompletionInMethodCall3.groovy.testCompletionInMethodCall3_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInMethodCall3/CompletionInMethodCall3.groovy.testCompletionInMethodCall3_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionInMethodCall3/CompletionInMethodCall3.groovy.testCompletionInMethodCall3_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInMethodCall3/CompletionInMethodCall3.groovy.testCompletionInMethodCall3_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideConstructor1/CompletionInsideConstructor1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideConstructor1/CompletionInsideConstructor1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionInsideConstructor1/CompletionInsideConstructor1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideConstructor1/CompletionInsideConstructor1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideConstructor1/CompletionInsideConstructor1.groovy.testCompletionInsideConstructor1_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideConstructor1/CompletionInsideConstructor1.groovy.testCompletionInsideConstructor1_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionInsideConstructor1/CompletionInsideConstructor1.groovy.testCompletionInsideConstructor1_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideConstructor1/CompletionInsideConstructor1.groovy.testCompletionInsideConstructor1_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideConstructor1/CompletionInsideConstructor1.groovy.testCompletionInsideConstructor1_2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideConstructor1/CompletionInsideConstructor1.groovy.testCompletionInsideConstructor1_2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionInsideConstructor1/CompletionInsideConstructor1.groovy.testCompletionInsideConstructor1_2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideConstructor1/CompletionInsideConstructor1.groovy.testCompletionInsideConstructor1_2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideConstructor1/CompletionInsideConstructor1.groovy.testCompletionInsideConstructor1_3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideConstructor1/CompletionInsideConstructor1.groovy.testCompletionInsideConstructor1_3.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionInsideConstructor1/CompletionInsideConstructor1.groovy.testCompletionInsideConstructor1_3.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideConstructor1/CompletionInsideConstructor1.groovy.testCompletionInsideConstructor1_3.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideFor1/CompletionInsideFor1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideFor1/CompletionInsideFor1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionInsideFor1/CompletionInsideFor1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideFor1/CompletionInsideFor1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideFor1/CompletionInsideFor1.groovy.testCompletionInsideFor1_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideFor1/CompletionInsideFor1.groovy.testCompletionInsideFor1_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionInsideFor1/CompletionInsideFor1.groovy.testCompletionInsideFor1_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideFor1/CompletionInsideFor1.groovy.testCompletionInsideFor1_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideFor1/CompletionInsideFor1.groovy.testCompletionInsideFor1_2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideFor1/CompletionInsideFor1.groovy.testCompletionInsideFor1_2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionInsideFor1/CompletionInsideFor1.groovy.testCompletionInsideFor1_2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideFor1/CompletionInsideFor1.groovy.testCompletionInsideFor1_2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionNoDot1/CompletionNoDot1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoDot1/CompletionNoDot1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionNoDot1/CompletionNoDot1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoDot1/CompletionNoDot1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionNoDot1/CompletionNoDot1.groovy.testCompletionNoDot1_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoDot1/CompletionNoDot1.groovy.testCompletionNoDot1_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionNoDot1/CompletionNoDot1.groovy.testCompletionNoDot1_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoDot1/CompletionNoDot1.groovy.testCompletionNoDot1_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionNoDot1/CompletionNoDot1.groovy.testCompletionNoDot1_2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoDot1/CompletionNoDot1.groovy.testCompletionNoDot1_2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionNoDot1/CompletionNoDot1.groovy.testCompletionNoDot1_2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoDot1/CompletionNoDot1.groovy.testCompletionNoDot1_2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionNoDot1/CompletionNoDot1.groovy.testCompletionNoDot1_3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoDot1/CompletionNoDot1.groovy.testCompletionNoDot1_3.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionNoDot1/CompletionNoDot1.groovy.testCompletionNoDot1_3.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoDot1/CompletionNoDot1.groovy.testCompletionNoDot1_3.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionNoPrefixString1/CompletionNoPrefixString1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoPrefixString1/CompletionNoPrefixString1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionNoPrefixString1/CompletionNoPrefixString1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoPrefixString1/CompletionNoPrefixString1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionNoPrefixString1/CompletionNoPrefixString1.groovy.testCompletionNoPrefixString1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoPrefixString1/CompletionNoPrefixString1.groovy.testCompletionNoPrefixString1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionNoPrefixString1/CompletionNoPrefixString1.groovy.testCompletionNoPrefixString1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoPrefixString1/CompletionNoPrefixString1.groovy.testCompletionNoPrefixString1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionNoPrefixString2/CompletionNoPrefixString2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoPrefixString2/CompletionNoPrefixString2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionNoPrefixString2/CompletionNoPrefixString2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoPrefixString2/CompletionNoPrefixString2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/completionNoPrefixString2/CompletionNoPrefixString2.groovy.testCompletionNoPrefixString2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoPrefixString2/CompletionNoPrefixString2.groovy.testCompletionNoPrefixString2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/completionNoPrefixString2/CompletionNoPrefixString2.groovy.testCompletionNoPrefixString2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoPrefixString2/CompletionNoPrefixString2.groovy.testCompletionNoPrefixString2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/methods1/Methods1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/methods1/Methods1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/methods1/Methods1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/methods1/Methods1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/methods1/Methods1.groovy.testMethods1_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/methods1/Methods1.groovy.testMethods1_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/methods1/Methods1.groovy.testMethods1_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/methods1/Methods1.groovy.testMethods1_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/methods1/Methods1.groovy.testMethods1_2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/methods1/Methods1.groovy.testMethods1_2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/methods1/Methods1.groovy.testMethods1_2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/methods1/Methods1.groovy.testMethods1_2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/methods1/Methods1.groovy.testMethods1_3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/methods1/Methods1.groovy.testMethods1_3.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/methods1/Methods1.groovy.testMethods1_3.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/methods1/Methods1.groovy.testMethods1_3.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/methods1/Methods1.groovy.testMethods1_4.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/methods1/Methods1.groovy.testMethods1_4.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/methods1/Methods1.groovy.testMethods1_4.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/methods1/Methods1.groovy.testMethods1_4.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/methods2/Methods2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/methods2/Methods2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/methods2/Methods2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/methods2/Methods2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/methods2/Methods2.groovy.testMethods2_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/methods2/Methods2.groovy.testMethods2_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/methods2/Methods2.groovy.testMethods2_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/methods2/Methods2.groovy.testMethods2_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/methods2/Methods2.groovy.testMethods2_2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/methods2/Methods2.groovy.testMethods2_2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/methods2/Methods2.groovy.testMethods2_2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/methods2/Methods2.groovy.testMethods2_2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/method/methods3/Methods3.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/methods3/Methods3.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/method/methods3/Methods3.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/method/methods3/Methods3.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/namedparams/emptyConstructor/EmptyConstructor.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/emptyConstructor/EmptyConstructor.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/namedparams/emptyConstructor/EmptyConstructor.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/emptyConstructor/EmptyConstructor.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/namedparams/emptyConstructor/EmptyConstructor.groovy.testEmptyConstructor.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/emptyConstructor/EmptyConstructor.groovy.testEmptyConstructor.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/namedparams/emptyConstructor/EmptyConstructor.groovy.testEmptyConstructor.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/emptyConstructor/EmptyConstructor.groovy.testEmptyConstructor.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_AfterComma.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_AfterComma.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_AfterComma.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_AfterComma.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_AfterLeftParenthesis.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_AfterLeftParenthesis.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_AfterLeftParenthesis.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_AfterLeftParenthesis.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_InsideNamedParameter1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_InsideNamedParameter1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_InsideNamedParameter1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_InsideNamedParameter1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_InsideNamedParameter2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_InsideNamedParameter2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_InsideNamedParameter2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_InsideNamedParameter2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_InsideNamedParameter3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_InsideNamedParameter3.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_InsideNamedParameter3.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_InsideNamedParameter3.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/newvars/FieldCompletion.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/FieldCompletion.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/newvars/FieldCompletion.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/FieldCompletion.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/newvars/FieldCompletion.groovy.testCompletionField1_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/FieldCompletion.groovy.testCompletionField1_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/newvars/FieldCompletion.groovy.testCompletionField1_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/FieldCompletion.groovy.testCompletionField1_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/newvars/FieldCompletion.groovy.testCompletionField1_2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/FieldCompletion.groovy.testCompletionField1_2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/newvars/FieldCompletion.groovy.testCompletionField1_2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/FieldCompletion.groovy.testCompletionField1_2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/newvars/FieldCompletion.groovy.testCompletionField1_3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/FieldCompletion.groovy.testCompletionField1_3.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/newvars/FieldCompletion.groovy.testCompletionField1_3.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/FieldCompletion.groovy.testCompletionField1_3.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier1.groovy.testIdentifier1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier1.groovy.testIdentifier1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier1.groovy.testIdentifier1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier1.groovy.testIdentifier1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier1.groovy.testIdentifier2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier1.groovy.testIdentifier2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier1.groovy.testIdentifier2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier1.groovy.testIdentifier2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier2.groovy.testIdentifier3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier2.groovy.testIdentifier3.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier2.groovy.testIdentifier3.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier2.groovy.testIdentifier3.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier3.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier3.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier3.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier3.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier3.groovy.testIdentifier4.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier3.groovy.testIdentifier4.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier3.groovy.testIdentifier4.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Identifier3.groovy.testIdentifier4.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive3.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive3.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive3.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive4.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive4.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive4.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive4.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive5.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive5.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive5.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive5.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive6.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive6.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive6.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive6.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive7.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive7.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive7.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive7.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive8.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive8.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive8.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/newvars/Primitive1.groovy.testPrimitive8.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator1/ElvisOperator1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator1/ElvisOperator1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator1/ElvisOperator1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator1/ElvisOperator1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator1/ElvisOperator1.groovy.testElvisOperator1_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator1/ElvisOperator1.groovy.testElvisOperator1_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator1/ElvisOperator1.groovy.testElvisOperator1_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator1/ElvisOperator1.groovy.testElvisOperator1_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator2/ElvisOperator2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator2/ElvisOperator2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator2/ElvisOperator2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator2/ElvisOperator2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator2/ElvisOperator2.groovy.testElvisOperator2_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator2/ElvisOperator2.groovy.testElvisOperator2_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator2/ElvisOperator2.groovy.testElvisOperator2_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator2/ElvisOperator2.groovy.testElvisOperator2_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator3/ElvisOperator3.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator3/ElvisOperator3.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator3/ElvisOperator3.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator3/ElvisOperator3.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator3/ElvisOperator3.groovy.testElvisOperator3_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator3/ElvisOperator3.groovy.testElvisOperator3_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator3/ElvisOperator3.groovy.testElvisOperator3_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator3/ElvisOperator3.groovy.testElvisOperator3_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator1/Foo.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator1/Foo.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator1/Foo.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator1/Foo.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator1/JavaFieldOperator1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator1/JavaFieldOperator1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator1/JavaFieldOperator1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator1/JavaFieldOperator1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator1/JavaFieldOperator1.groovy.testJavaFieldOperator1_all.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator1/JavaFieldOperator1.groovy.testJavaFieldOperator1_all.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator1/JavaFieldOperator1.groovy.testJavaFieldOperator1_all.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator1/JavaFieldOperator1.groovy.testJavaFieldOperator1_all.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator2/Foo.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator2/Foo.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator2/Foo.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator2/Foo.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator2/JavaFieldOperator2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator2/JavaFieldOperator2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator2/JavaFieldOperator2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator2/JavaFieldOperator2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator2/JavaFieldOperator2.groovy.testJavaFieldOperator2_withPrefix.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator2/JavaFieldOperator2.groovy.testJavaFieldOperator2_withPrefix.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator2/JavaFieldOperator2.groovy.testJavaFieldOperator2_withPrefix.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator2/JavaFieldOperator2.groovy.testJavaFieldOperator2_withPrefix.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator3/Foo.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator3/Foo.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator3/Foo.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator3/Foo.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator3/JavaFieldOperator3.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator3/JavaFieldOperator3.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator3/JavaFieldOperator3.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator3/JavaFieldOperator3.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator3/JavaFieldOperator3.groovy.testJavaFieldOperator3_withSuffix.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator3/JavaFieldOperator3.groovy.testJavaFieldOperator3_withSuffix.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator3/JavaFieldOperator3.groovy.testJavaFieldOperator3_withSuffix.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator3/JavaFieldOperator3.groovy.testJavaFieldOperator3_withSuffix.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator4/Foo.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator4/Foo.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator4/Foo.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator4/Foo.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator4/JavaFieldOperator4.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator4/JavaFieldOperator4.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator4/JavaFieldOperator4.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator4/JavaFieldOperator4.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator4/JavaFieldOperator4.groovy.testJavaFieldOperator4_withinIdentifier.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator4/JavaFieldOperator4.groovy.testJavaFieldOperator4_withinIdentifier.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator4/JavaFieldOperator4.groovy.testJavaFieldOperator4_withinIdentifier.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/javaFieldOperator4/JavaFieldOperator4.groovy.testJavaFieldOperator4_withinIdentifier.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure1/MethodClosure1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure1/MethodClosure1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure1/MethodClosure1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure1/MethodClosure1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure1/MethodClosure1.groovy.testMethodClosure1_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure1/MethodClosure1.groovy.testMethodClosure1_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure1/MethodClosure1.groovy.testMethodClosure1_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure1/MethodClosure1.groovy.testMethodClosure1_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure1/MethodClosure1.groovy.testMethodClosure1_2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure1/MethodClosure1.groovy.testMethodClosure1_2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure1/MethodClosure1.groovy.testMethodClosure1_2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure1/MethodClosure1.groovy.testMethodClosure1_2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure1/MethodClosure1.groovy.testMethodClosure1_3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure1/MethodClosure1.groovy.testMethodClosure1_3.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure1/MethodClosure1.groovy.testMethodClosure1_3.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure1/MethodClosure1.groovy.testMethodClosure1_3.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure2/MethodClosure2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure2/MethodClosure2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure2/MethodClosure2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure2/MethodClosure2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure2/MethodClosure2.groovy.testMethodClosure2_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure2/MethodClosure2.groovy.testMethodClosure2_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure2/MethodClosure2.groovy.testMethodClosure2_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure2/MethodClosure2.groovy.testMethodClosure2_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation1/SafeNavigation1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation1/SafeNavigation1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation1/SafeNavigation1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation1/SafeNavigation1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation1/SafeNavigation1.groovy.testSafeNavigation1_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation1/SafeNavigation1.groovy.testSafeNavigation1_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation1/SafeNavigation1.groovy.testSafeNavigation1_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation1/SafeNavigation1.groovy.testSafeNavigation1_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation1/SafeNavigation1.groovy.testSafeNavigation1_2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation1/SafeNavigation1.groovy.testSafeNavigation1_2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation1/SafeNavigation1.groovy.testSafeNavigation1_2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation1/SafeNavigation1.groovy.testSafeNavigation1_2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation1/SafeNavigation1.groovy.testSafeNavigation1_3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation1/SafeNavigation1.groovy.testSafeNavigation1_3.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation1/SafeNavigation1.groovy.testSafeNavigation1_3.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation1/SafeNavigation1.groovy.testSafeNavigation1_3.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation2/SafeNavigation2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation2/SafeNavigation2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation2/SafeNavigation2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation2/SafeNavigation2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation2/SafeNavigation2.groovy.testSafeNavigation2_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation2/SafeNavigation2.groovy.testSafeNavigation2_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation2/SafeNavigation2.groovy.testSafeNavigation2_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation2/SafeNavigation2.groovy.testSafeNavigation2_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator1/SpreadJavaFieldOperator1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator1/SpreadJavaFieldOperator1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator1/SpreadJavaFieldOperator1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator1/SpreadJavaFieldOperator1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator1/SpreadJavaFieldOperator1.groovy.testSpreadJavaFieldOperator1_all.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator1/SpreadJavaFieldOperator1.groovy.testSpreadJavaFieldOperator1_all.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator1/SpreadJavaFieldOperator1.groovy.testSpreadJavaFieldOperator1_all.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator1/SpreadJavaFieldOperator1.groovy.testSpreadJavaFieldOperator1_all.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator2/SpreadJavaFieldOperator2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator2/SpreadJavaFieldOperator2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator2/SpreadJavaFieldOperator2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator2/SpreadJavaFieldOperator2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator2/SpreadJavaFieldOperator2.groovy.testSpreadJavaFieldOperator2_withPrefix.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator2/SpreadJavaFieldOperator2.groovy.testSpreadJavaFieldOperator2_withPrefix.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator2/SpreadJavaFieldOperator2.groovy.testSpreadJavaFieldOperator2_withPrefix.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator2/SpreadJavaFieldOperator2.groovy.testSpreadJavaFieldOperator2_withPrefix.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator3/SpreadJavaFieldOperator3.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator3/SpreadJavaFieldOperator3.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator3/SpreadJavaFieldOperator3.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator3/SpreadJavaFieldOperator3.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator3/SpreadJavaFieldOperator3.groovy.testSpreadJavaFieldOperator3_withSufix.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator3/SpreadJavaFieldOperator3.groovy.testSpreadJavaFieldOperator3_withSufix.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator3/SpreadJavaFieldOperator3.groovy.testSpreadJavaFieldOperator3_withSufix.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator3/SpreadJavaFieldOperator3.groovy.testSpreadJavaFieldOperator3_withSufix.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator4/SpreadJavaFieldOperator4.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator4/SpreadJavaFieldOperator4.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator4/SpreadJavaFieldOperator4.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator4/SpreadJavaFieldOperator4.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator4/SpreadJavaFieldOperator4.groovy.testSpreadJavaFieldOperator4_withinIdentifier.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator4/SpreadJavaFieldOperator4.groovy.testSpreadJavaFieldOperator4_withinIdentifier.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator4/SpreadJavaFieldOperator4.groovy.testSpreadJavaFieldOperator4_withinIdentifier.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadJavaFieldOperator4/SpreadJavaFieldOperator4.groovy.testSpreadJavaFieldOperator4_withinIdentifier.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator1/SpreadOperator1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator1/SpreadOperator1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator1/SpreadOperator1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator1/SpreadOperator1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator1/SpreadOperator1.groovy.testSpreadOperator1_stringArray_all.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator1/SpreadOperator1.groovy.testSpreadOperator1_stringArray_all.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator1/SpreadOperator1.groovy.testSpreadOperator1_stringArray_all.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator1/SpreadOperator1.groovy.testSpreadOperator1_stringArray_all.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator2/SpreadOperator2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator2/SpreadOperator2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator2/SpreadOperator2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator2/SpreadOperator2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator2/SpreadOperator2.groovy.testSpreadOperator2_stringArray_sPrefix.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator2/SpreadOperator2.groovy.testSpreadOperator2_stringArray_sPrefix.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator2/SpreadOperator2.groovy.testSpreadOperator2_stringArray_sPrefix.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator2/SpreadOperator2.groovy.testSpreadOperator2_stringArray_sPrefix.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator3/SpreadOperator3.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator3/SpreadOperator3.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator3/SpreadOperator3.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator3/SpreadOperator3.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator3/SpreadOperator3.groovy.testSpreadOperator3_intArray_all.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator3/SpreadOperator3.groovy.testSpreadOperator3_intArray_all.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator3/SpreadOperator3.groovy.testSpreadOperator3_intArray_all.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator3/SpreadOperator3.groovy.testSpreadOperator3_intArray_all.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator4/SpreadOperator4.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator4/SpreadOperator4.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator4/SpreadOperator4.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator4/SpreadOperator4.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator4/SpreadOperator4.groovy.testSpreadOperator4_intArray_sPrefix.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator4/SpreadOperator4.groovy.testSpreadOperator4_intArray_sPrefix.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator4/SpreadOperator4.groovy.testSpreadOperator4_intArray_sPrefix.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator4/SpreadOperator4.groovy.testSpreadOperator4_intArray_sPrefix.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion1/AfterExtendsTypeCompletion1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion1/AfterExtendsTypeCompletion1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion1/AfterExtendsTypeCompletion1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion1/AfterExtendsTypeCompletion1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion1/AfterExtendsTypeCompletion1.groovy.testAfterExtendsTypeCompletion1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion1/AfterExtendsTypeCompletion1.groovy.testAfterExtendsTypeCompletion1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion1/AfterExtendsTypeCompletion1.groovy.testAfterExtendsTypeCompletion1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion1/AfterExtendsTypeCompletion1.groovy.testAfterExtendsTypeCompletion1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion2/AfterExtendsTypeCompletion2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion2/AfterExtendsTypeCompletion2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion2/AfterExtendsTypeCompletion2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion2/AfterExtendsTypeCompletion2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion2/AfterExtendsTypeCompletion2.groovy.testAfterExtendsTypeCompletion2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion2/AfterExtendsTypeCompletion2.groovy.testAfterExtendsTypeCompletion2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion2/AfterExtendsTypeCompletion2.groovy.testAfterExtendsTypeCompletion2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion2/AfterExtendsTypeCompletion2.groovy.testAfterExtendsTypeCompletion2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion3/AfterExtendsTypeCompletion3.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion3/AfterExtendsTypeCompletion3.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion3/AfterExtendsTypeCompletion3.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion3/AfterExtendsTypeCompletion3.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion3/AfterExtendsTypeCompletion3.groovy.testAfterExtendsTypeCompletion3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion3/AfterExtendsTypeCompletion3.groovy.testAfterExtendsTypeCompletion3.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion3/AfterExtendsTypeCompletion3.groovy.testAfterExtendsTypeCompletion3.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion3/AfterExtendsTypeCompletion3.groovy.testAfterExtendsTypeCompletion3.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion4/AfterExtendsTypeCompletion4.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion4/AfterExtendsTypeCompletion4.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion4/AfterExtendsTypeCompletion4.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion4/AfterExtendsTypeCompletion4.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion4/AfterExtendsTypeCompletion4.groovy.testAfterExtendsTypeCompletion4.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion4/AfterExtendsTypeCompletion4.groovy.testAfterExtendsTypeCompletion4.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion4/AfterExtendsTypeCompletion4.groovy.testAfterExtendsTypeCompletion4.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion4/AfterExtendsTypeCompletion4.groovy.testAfterExtendsTypeCompletion4.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion1/FieldTypeCompletion1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion1/FieldTypeCompletion1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion1/FieldTypeCompletion1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion1/FieldTypeCompletion1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion1/FieldTypeCompletion1.groovy.testFieldTypeCompletion1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion1/FieldTypeCompletion1.groovy.testFieldTypeCompletion1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion1/FieldTypeCompletion1.groovy.testFieldTypeCompletion1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion1/FieldTypeCompletion1.groovy.testFieldTypeCompletion1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion2/FieldTypeCompletion2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion2/FieldTypeCompletion2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion2/FieldTypeCompletion2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion2/FieldTypeCompletion2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion2/FieldTypeCompletion2.groovy.testFieldTypeCompletion2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion2/FieldTypeCompletion2.groovy.testFieldTypeCompletion2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion2/FieldTypeCompletion2.groovy.testFieldTypeCompletion2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion2/FieldTypeCompletion2.groovy.testFieldTypeCompletion2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion3/FieldTypeCompletion3.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion3/FieldTypeCompletion3.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion3/FieldTypeCompletion3.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion3/FieldTypeCompletion3.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion3/FieldTypeCompletion3.groovy.testFieldTypeCompletion3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion3/FieldTypeCompletion3.groovy.testFieldTypeCompletion3.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion3/FieldTypeCompletion3.groovy.testFieldTypeCompletion3.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion3/FieldTypeCompletion3.groovy.testFieldTypeCompletion3.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion1/LocalVariableTypeCompletion1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion1/LocalVariableTypeCompletion1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion1/LocalVariableTypeCompletion1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion1/LocalVariableTypeCompletion1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion1/LocalVariableTypeCompletion1.groovy.testLocalVariableTypeCompletion1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion1/LocalVariableTypeCompletion1.groovy.testLocalVariableTypeCompletion1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion1/LocalVariableTypeCompletion1.groovy.testLocalVariableTypeCompletion1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion1/LocalVariableTypeCompletion1.groovy.testLocalVariableTypeCompletion1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion2/LocalVariableTypeCompletion2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion2/LocalVariableTypeCompletion2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion2/LocalVariableTypeCompletion2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion2/LocalVariableTypeCompletion2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion2/LocalVariableTypeCompletion2.groovy.testLocalVariableTypeCompletion2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion2/LocalVariableTypeCompletion2.groovy.testLocalVariableTypeCompletion2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion2/LocalVariableTypeCompletion2.groovy.testLocalVariableTypeCompletion2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion2/LocalVariableTypeCompletion2.groovy.testLocalVariableTypeCompletion2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion3/LocalVariableTypeCompletion3.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion3/LocalVariableTypeCompletion3.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion3/LocalVariableTypeCompletion3.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion3/LocalVariableTypeCompletion3.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion3/LocalVariableTypeCompletion3.groovy.testLocalVariableTypeCompletion3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion3/LocalVariableTypeCompletion3.groovy.testLocalVariableTypeCompletion3.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion3/LocalVariableTypeCompletion3.groovy.testLocalVariableTypeCompletion3.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion3/LocalVariableTypeCompletion3.groovy.testLocalVariableTypeCompletion3.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/transformations/delegate1/Delegate1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/delegate1/Delegate1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/transformations/delegate1/Delegate1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/delegate1/Delegate1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/transformations/delegate1/Delegate1.groovy.testDelegate1_interfaceDelegator_withoutPrefix.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/delegate1/Delegate1.groovy.testDelegate1_interfaceDelegator_withoutPrefix.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/transformations/delegate1/Delegate1.groovy.testDelegate1_interfaceDelegator_withoutPrefix.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/delegate1/Delegate1.groovy.testDelegate1_interfaceDelegator_withoutPrefix.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/transformations/delegate2/Delegate2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/delegate2/Delegate2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/transformations/delegate2/Delegate2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/delegate2/Delegate2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/transformations/delegate2/Delegate2.groovy.testDelegate2_classDelegator_withPrefix.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/delegate2/Delegate2.groovy.testDelegate2_classDelegator_withPrefix.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/transformations/delegate2/Delegate2.groovy.testDelegate2_classDelegator_withPrefix.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/delegate2/Delegate2.groovy.testDelegate2_classDelegator_withPrefix.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/transformations/singleton1/Singleton1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/singleton1/Singleton1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/transformations/singleton1/Singleton1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/singleton1/Singleton1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/transformations/singleton1/Singleton1.groovy.testSingleton1_withInPrefix.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/singleton1/Singleton1.groovy.testSingleton1_withInPrefix.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/transformations/singleton1/Singleton1.groovy.testSingleton1_withInPrefix.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/singleton1/Singleton1.groovy.testSingleton1_withInPrefix.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/transformations/singleton2/Singleton2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/singleton2/Singleton2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/transformations/singleton2/Singleton2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/singleton2/Singleton2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/transformations/singleton2/Singleton2.groovy.testSingleton2_withGetPrefix.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/singleton2/Singleton2.groovy.testSingleton2_withGetPrefix.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/transformations/singleton2/Singleton2.groovy.testSingleton2_withGetPrefix.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/singleton2/Singleton2.groovy.testSingleton2_withGetPrefix.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/transformations/singleton3/Singleton3.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/singleton3/Singleton3.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/transformations/singleton3/Singleton3.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/singleton3/Singleton3.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/transformations/singleton3/Singleton3.groovy.testSingleton3_withoutPrefix.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/singleton3/Singleton3.groovy.testSingleton3_withoutPrefix.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/transformations/singleton3/Singleton3.groovy.testSingleton3_withoutPrefix.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/singleton3/Singleton3.groovy.testSingleton3_withoutPrefix.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/ExistingGroovyType.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/ExistingGroovyType.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/ExistingGroovyType.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/ExistingGroovyType.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/WildCardImport1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/WildCardImport1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/WildCardImport1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/WildCardImport1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy.testDefaultImport1_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy.testDefaultImport1_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy.testDefaultImport1_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy.testDefaultImport1_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy.testDefaultImport1_2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy.testDefaultImport1_2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy.testDefaultImport1_2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy.testDefaultImport1_2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy.testDefaultImport1_3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy.testDefaultImport1_3.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy.testDefaultImport1_3.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy.testDefaultImport1_3.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy.testDefaultImport1_4.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy.testDefaultImport1_4.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy.testDefaultImport1_4.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy.testDefaultImport1_4.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy.testDefaultImport1_5.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy.testDefaultImport1_5.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy.testDefaultImport1_5.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy.testDefaultImport1_5.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy.testDefaultImport1_6.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy.testDefaultImport1_6.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy.testDefaultImport1_6.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/defaultImport1/DefaultImport1.groovy.testDefaultImport1_6.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/fqnTypeCompletion1/FqnTypeCompletion1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/fqnTypeCompletion1/FqnTypeCompletion1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/fqnTypeCompletion1/FqnTypeCompletion1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/fqnTypeCompletion1/FqnTypeCompletion1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/fqnTypeCompletion1/FqnTypeCompletion1.groovy.testFqnTypeCompletion1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/fqnTypeCompletion1/FqnTypeCompletion1.groovy.testFqnTypeCompletion1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/fqnTypeCompletion1/FqnTypeCompletion1.groovy.testFqnTypeCompletion1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/fqnTypeCompletion1/FqnTypeCompletion1.groovy.testFqnTypeCompletion1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/manualImport1/ManualImport1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/manualImport1/ManualImport1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/manualImport1/ManualImport1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/manualImport1/ManualImport1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/manualImport1/ManualImport1.groovy.testManualImport1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/manualImport1/ManualImport1.groovy.testManualImport1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/manualImport1/ManualImport1.groovy.testManualImport1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/manualImport1/ManualImport1.groovy.testManualImport1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/manualImport2/ManualImport2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/manualImport2/ManualImport2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/manualImport2/ManualImport2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/manualImport2/ManualImport2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/manualImport2/ManualImport2.groovy.testManualImport2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/manualImport2/ManualImport2.groovy.testManualImport2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/manualImport2/ManualImport2.groovy.testManualImport2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/manualImport2/ManualImport2.groovy.testManualImport2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/notInComments1/NotInComments1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/notInComments1/NotInComments1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/notInComments1/NotInComments1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/notInComments1/NotInComments1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/notInComments1/NotInComments1.groovy.testNotInComments1_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/notInComments1/NotInComments1.groovy.testNotInComments1_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/notInComments1/NotInComments1.groovy.testNotInComments1_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/notInComments1/NotInComments1.groovy.testNotInComments1_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/notInComments1/NotInComments1.groovy.testNotInComments1_2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/notInComments1/NotInComments1.groovy.testNotInComments1_2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/notInComments1/NotInComments1.groovy.testNotInComments1_2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/notInComments1/NotInComments1.groovy.testNotInComments1_2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/samePackage1/SamePackage1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/samePackage1/SamePackage1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/samePackage1/SamePackage1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/samePackage1/SamePackage1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/samePackage1/SamePackage1.groovy.testSamePackage1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/samePackage1/SamePackage1.groovy.testSamePackage1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/samePackage1/SamePackage1.groovy.testSamePackage1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/samePackage1/SamePackage1.groovy.testSamePackage1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion1/TypeCompletion1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion1/TypeCompletion1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion1/TypeCompletion1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion1/TypeCompletion1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion1/TypeCompletion1.groovy.testTypeCompletion1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion1/TypeCompletion1.groovy.testTypeCompletion1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion1/TypeCompletion1.groovy.testTypeCompletion1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion1/TypeCompletion1.groovy.testTypeCompletion1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion2/TypeCompletion2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion2/TypeCompletion2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion2/TypeCompletion2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion2/TypeCompletion2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion2/TypeCompletion2.groovy.testTypeCompletion2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion2/TypeCompletion2.groovy.testTypeCompletion2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion2/TypeCompletion2.groovy.testTypeCompletion2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion2/TypeCompletion2.groovy.testTypeCompletion2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion3/TypeCompletion3.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion3/TypeCompletion3.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion3/TypeCompletion3.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion3/TypeCompletion3.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion3/TypeCompletion3.groovy.testTypeCompletion3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion3/TypeCompletion3.groovy.testTypeCompletion3.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion3/TypeCompletion3.groovy.testTypeCompletion3.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion3/TypeCompletion3.groovy.testTypeCompletion3.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion4/TypeCompletion4.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion4/TypeCompletion4.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion4/TypeCompletion4.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion4/TypeCompletion4.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion4/TypeCompletion4.groovy.testTypeCompletion4.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion4/TypeCompletion4.groovy.testTypeCompletion4.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion4/TypeCompletion4.groovy.testTypeCompletion4.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion4/TypeCompletion4.groovy.testTypeCompletion4.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion5/TypeCompletion5.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion5/TypeCompletion5.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion5/TypeCompletion5.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion5/TypeCompletion5.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion5/TypeCompletion5.groovy.testTypeCompletion5.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion5/TypeCompletion5.groovy.testTypeCompletion5.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion5/TypeCompletion5.groovy.testTypeCompletion5.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion5/TypeCompletion5.groovy.testTypeCompletion5.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_3.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_3.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_3.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_4.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_4.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_4.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_4.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_5.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_5.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_5.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_5.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_6.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_6.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_6.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_6.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/variables/variables2/Variables2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables2/Variables2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/variables/variables2/Variables2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables2/Variables2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/variables/variables2/Variables2.groovy.testVariables2_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables2/Variables2.groovy.testVariables2_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/variables/variables2/Variables2.groovy.testVariables2_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables2/Variables2.groovy.testVariables2_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/variables/variables2/Variables2.groovy.testVariables2_2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables2/Variables2.groovy.testVariables2_2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/variables/variables2/Variables2.groovy.testVariables2_2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables2/Variables2.groovy.testVariables2_2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/variables/variables2/Variables2.groovy.testVariables2_3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables2/Variables2.groovy.testVariables2_3.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/variables/variables2/Variables2.groovy.testVariables2_3.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables2/Variables2.groovy.testVariables2_3.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/variables/variables2/Variables2.groovy.testVariables2_4.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables2/Variables2.groovy.testVariables2_4.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/variables/variables2/Variables2.groovy.testVariables2_4.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables2/Variables2.groovy.testVariables2_4.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/variables/variables2/Variables2.groovy.testVariables2_5.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables2/Variables2.groovy.testVariables2_5.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/variables/variables2/Variables2.groovy.testVariables2_5.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables2/Variables2.groovy.testVariables2_5.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/variables/variables3/Variables3.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables3/Variables3.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/variables/variables3/Variables3.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables3/Variables3.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/completion/variables/variables3/Variables3.groovy.testVariables3_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables3/Variables3.groovy.testVariables3_1.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/variables/variables3/Variables3.groovy.testVariables3_1.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables3/Variables3.groovy.testVariables3_1.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/variables/variables3/Variables3.groovy.testVariables3_2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables3/Variables3.groovy.testVariables3_2.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/variables/variables3/Variables3.groovy.testVariables3_2.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables3/Variables3.groovy.testVariables3_2.completion
diff --git a/groovy.editor/test/unit/data/testfiles/completion/variables/variables3/Variables3.groovy.testVariables3_3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables3/Variables3.groovy.testVariables3_3.completion
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/completion/variables/variables3/Variables3.groovy.testVariables3_3.completion
rename to groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables3/Variables3.groovy.testVariables3_3.completion
diff --git a/groovy.editor/test/unit/data/testfiles/declarationfinder/Consumer.groovy b/groovy/groovy.editor/test/unit/data/testfiles/declarationfinder/Consumer.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/declarationfinder/Consumer.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/declarationfinder/Consumer.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/declarationfinder/Methods1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/declarationfinder/Methods1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/declarationfinder/Methods1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/declarationfinder/Methods1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/declarationfinder/Methods2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/declarationfinder/Methods2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/declarationfinder/Methods2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/declarationfinder/Methods2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/declarationfinder/Script.groovy b/groovy/groovy.editor/test/unit/data/testfiles/declarationfinder/Script.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/declarationfinder/Script.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/declarationfinder/Script.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/declarationfinder/a/Declaration1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/declarationfinder/a/Declaration1.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/declarationfinder/a/Declaration1.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/declarationfinder/a/Declaration1.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/declarationfinder/a/Declaration2.groovy b/groovy/groovy.editor/test/unit/data/testfiles/declarationfinder/a/Declaration2.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/declarationfinder/a/Declaration2.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/declarationfinder/a/Declaration2.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/declarationfinder/a/Declaration3.groovy b/groovy/groovy.editor/test/unit/data/testfiles/declarationfinder/a/Declaration3.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/declarationfinder/a/Declaration3.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/declarationfinder/a/Declaration3.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/declarationfinder/a/InnerClasses.java b/groovy/groovy.editor/test/unit/data/testfiles/declarationfinder/a/InnerClasses.java
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/declarationfinder/a/InnerClasses.java
rename to groovy/groovy.editor/test/unit/data/testfiles/declarationfinder/a/InnerClasses.java
diff --git a/groovy.editor/test/unit/data/testfiles/declarationfinder/a/Interface1.java b/groovy/groovy.editor/test/unit/data/testfiles/declarationfinder/a/Interface1.java
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/declarationfinder/a/Interface1.java
rename to groovy/groovy.editor/test/unit/data/testfiles/declarationfinder/a/Interface1.java
diff --git a/groovy.editor/test/unit/data/testfiles/declarationfinder/a/Interface2.java b/groovy/groovy.editor/test/unit/data/testfiles/declarationfinder/a/Interface2.java
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/declarationfinder/a/Interface2.java
rename to groovy/groovy.editor/test/unit/data/testfiles/declarationfinder/a/Interface2.java
diff --git a/groovy.editor/test/unit/data/testfiles/index/testGetClasses/testGetClasses.groovy b/groovy/groovy.editor/test/unit/data/testfiles/index/testGetClasses/testGetClasses.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/index/testGetClasses/testGetClasses.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/index/testGetClasses/testGetClasses.groovy
diff --git a/groovy.editor/test/unit/data/testfiles/index/testGetMethods/testGetMethods.groovy b/groovy/groovy.editor/test/unit/data/testfiles/index/testGetMethods/testGetMethods.groovy
similarity index 100%
rename from groovy.editor/test/unit/data/testfiles/index/testGetMethods/testGetMethods.groovy
rename to groovy/groovy.editor/test/unit/data/testfiles/index/testGetMethods/testGetMethods.groovy
diff --git a/groovy.editor/test/unit/src/META-INF/services/org.netbeans.spi.lexer.LanguageProvider b/groovy/groovy.editor/test/unit/src/META-INF/services/org.netbeans.spi.lexer.LanguageProvider
similarity index 100%
rename from groovy.editor/test/unit/src/META-INF/services/org.netbeans.spi.lexer.LanguageProvider
rename to groovy/groovy.editor/test/unit/src/META-INF/services/org.netbeans.spi.lexer.LanguageProvider
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/AstPathTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/AstPathTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/AstPathTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/AstPathTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyBracesMatcherTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyBracesMatcherTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyBracesMatcherTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyBracesMatcherTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyDeclarationFinderTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyDeclarationFinderTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyDeclarationFinderTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyDeclarationFinderTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyIndexTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyIndexTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyIndexTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyIndexTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyIndexerTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyIndexerTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyIndexerTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyIndexerTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyInstantRenamerTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyInstantRenamerTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyInstantRenamerTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyInstantRenamerTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyLexerBatchTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyLexerBatchTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyLexerBatchTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyLexerBatchTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyLexerGStringTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyLexerGStringTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyLexerGStringTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyLexerGStringTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyLexerIncTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyLexerIncTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyLexerIncTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyLexerIncTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyLexerStringConstantsTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyLexerStringConstantsTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyLexerStringConstantsTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyLexerStringConstantsTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyOccurencesFinderTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyOccurencesFinderTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyOccurencesFinderTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyOccurencesFinderTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyUtilsTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyUtilsTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyUtilsTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyUtilsTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/StructureAnalyzerTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/StructureAnalyzerTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/StructureAnalyzerTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/StructureAnalyzerTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/AccessCCTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/AccessCCTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/AccessCCTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/AccessCCTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/CamelCaseCCTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/CamelCaseCCTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/CamelCaseCCTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/CamelCaseCCTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/ClosuresCCTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/ClosuresCCTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/ClosuresCCTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/ClosuresCCTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/CodeCompletionTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/CodeCompletionTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/CodeCompletionTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/CodeCompletionTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/CollectionsCCTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/CollectionsCCTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/CollectionsCCTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/CollectionsCCTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/ConstructorsCCTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/ConstructorsCCTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/ConstructorsCCTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/ConstructorsCCTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/DuplicatesCCTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/DuplicatesCCTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/DuplicatesCCTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/DuplicatesCCTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/FieldCCTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/FieldCCTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/FieldCCTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/FieldCCTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/GrailsConfigsTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/GrailsConfigsTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/GrailsConfigsTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/GrailsConfigsTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/GroovyCCTestBase.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/GroovyCCTestBase.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/GroovyCCTestBase.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/GroovyCCTestBase.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/ImportCCTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/ImportCCTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/ImportCCTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/ImportCCTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/InferenceCCTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/InferenceCCTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/InferenceCCTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/InferenceCCTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/InterfaceCCTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/InterfaceCCTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/InterfaceCCTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/InterfaceCCTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/MethodCCTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/MethodCCTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/MethodCCTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/MethodCCTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/NamedParamCCTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/NamedParamCCTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/NamedParamCCTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/NamedParamCCTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/NewVarsCCTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/NewVarsCCTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/NewVarsCCTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/NewVarsCCTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/OperatorsCCTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/OperatorsCCTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/OperatorsCCTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/OperatorsCCTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/PackageCCTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/PackageCCTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/PackageCCTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/PackageCCTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/TransformationsCCTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/TransformationsCCTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/TransformationsCCTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/TransformationsCCTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/TypesCCTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/TypesCCTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/TypesCCTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/TypesCCTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/VariablesCCTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/VariablesCCTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/VariablesCCTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/VariablesCCTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/lexer/CallTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/lexer/CallTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/lexer/CallTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/lexer/CallTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/lexer/GroovyLexerTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/lexer/GroovyLexerTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/lexer/GroovyLexerTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/lexer/GroovyLexerTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/lexer/LexerOperatorsTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/lexer/LexerOperatorsTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/lexer/LexerOperatorsTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/lexer/LexerOperatorsTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/parser/GroovyParserTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/parser/GroovyParserTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/parser/GroovyParserTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/parser/GroovyParserTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/parser/GroovySemanticAnalyzerTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/parser/GroovySemanticAnalyzerTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/parser/GroovySemanticAnalyzerTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/parser/GroovySemanticAnalyzerTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/parser/GroovyVirtualSourceProviderTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/parser/GroovyVirtualSourceProviderTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/parser/GroovyVirtualSourceProviderTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/parser/GroovyVirtualSourceProviderTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/PackageCCTest1.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/PackageCCTest1.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/PackageCCTest1.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/PackageCCTest1.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/PackageCCTest2.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/PackageCCTest2.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/PackageCCTest2.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/PackageCCTest2.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/PackageCCTest3.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/PackageCCTest3.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/PackageCCTest3.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/PackageCCTest3.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/README.txt b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/README.txt
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/README.txt
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/README.txt
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/VariableCCTest1.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/VariableCCTest1.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/VariableCCTest1.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/VariableCCTest1.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/VariableCCTest2.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/VariableCCTest2.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/VariableCCTest2.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/VariableCCTest2.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/VariableCCTest3.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/VariableCCTest3.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/VariableCCTest3.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/temporary/VariableCCTest3.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/imports/FastImportTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/imports/FastImportTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/imports/FastImportTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/imports/FastImportTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/imports/ImportUtilsTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/imports/ImportUtilsTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/imports/ImportUtilsTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/imports/ImportUtilsTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/language/LogicalRangesTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/language/LogicalRangesTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/language/LogicalRangesTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/language/LogicalRangesTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/occurrences/AliasOccurrencesTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/occurrences/AliasOccurrencesTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/occurrences/AliasOccurrencesTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/occurrences/AliasOccurrencesTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/occurrences/AnnotationOccurrencesTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/occurrences/AnnotationOccurrencesTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/occurrences/AnnotationOccurrencesTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/occurrences/AnnotationOccurrencesTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/occurrences/FieldOccurrencesTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/occurrences/FieldOccurrencesTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/occurrences/FieldOccurrencesTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/occurrences/FieldOccurrencesTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/occurrences/TypeOccurrencesTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/occurrences/TypeOccurrencesTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/occurrences/TypeOccurrencesTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/occurrences/TypeOccurrencesTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/test/GroovyTestBase.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/test/GroovyTestBase.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/test/GroovyTestBase.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/test/GroovyTestBase.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/typinghooks/DeletedTextInterceptorTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/typinghooks/DeletedTextInterceptorTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/typinghooks/DeletedTextInterceptorTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/typinghooks/DeletedTextInterceptorTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/typinghooks/TypedBreakInterceptorTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/typinghooks/TypedBreakInterceptorTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/typinghooks/TypedBreakInterceptorTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/typinghooks/TypedBreakInterceptorTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/typinghooks/TypedTextInterceptorTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/typinghooks/TypedTextInterceptorTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/typinghooks/TypedTextInterceptorTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/typinghooks/TypedTextInterceptorTest.java
diff --git a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/utils/GroovyUtilsTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/utils/GroovyUtilsTest.java
similarity index 100%
rename from groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/utils/GroovyUtilsTest.java
rename to groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/utils/GroovyUtilsTest.java
diff --git a/groovy.grails/build.xml b/groovy/groovy.grails/build.xml
similarity index 88%
rename from groovy.grails/build.xml
rename to groovy/groovy.grails/build.xml
index 55a1f43ef2..02a3651f3a 100644
--- a/groovy.grails/build.xml
+++ b/groovy/groovy.grails/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="netbeans" name="groovy.grails">
+<project basedir="." default="build" name="groovy/groovy.grails">
     <description>Builds, tests, and runs the project org.netbeans.modules.groovy.grails</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/groovy.grails/manifest.mf b/groovy/groovy.grails/manifest.mf
similarity index 100%
rename from groovy.grails/manifest.mf
rename to groovy/groovy.grails/manifest.mf
diff --git a/groovy.grails/nbproject/project.properties b/groovy/groovy.grails/nbproject/project.properties
similarity index 100%
rename from groovy.grails/nbproject/project.properties
rename to groovy/groovy.grails/nbproject/project.properties
diff --git a/groovy.grails/nbproject/project.xml b/groovy/groovy.grails/nbproject/project.xml
similarity index 100%
rename from groovy.grails/nbproject/project.xml
rename to groovy/groovy.grails/nbproject/project.xml
diff --git a/groovy.grails/src/org/netbeans/modules/groovy/grails/ProcessInputStream.java b/groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/ProcessInputStream.java
similarity index 100%
rename from groovy.grails/src/org/netbeans/modules/groovy/grails/ProcessInputStream.java
rename to groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/ProcessInputStream.java
diff --git a/groovy.grails/src/org/netbeans/modules/groovy/grails/RuntimeHelper.java b/groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/RuntimeHelper.java
similarity index 100%
rename from groovy.grails/src/org/netbeans/modules/groovy/grails/RuntimeHelper.java
rename to groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/RuntimeHelper.java
diff --git a/groovy.grails/src/org/netbeans/modules/groovy/grails/WrapperProcess.java b/groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/WrapperProcess.java
similarity index 100%
rename from groovy.grails/src/org/netbeans/modules/groovy/grails/WrapperProcess.java
rename to groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/WrapperProcess.java
diff --git a/groovy.grails/src/org/netbeans/modules/groovy/grails/api/Bundle.properties b/groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/api/Bundle.properties
similarity index 100%
rename from groovy.grails/src/org/netbeans/modules/groovy/grails/api/Bundle.properties
rename to groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/api/Bundle.properties
diff --git a/groovy.grails/src/org/netbeans/modules/groovy/grails/api/ExecutionSupport.java b/groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/api/ExecutionSupport.java
similarity index 100%
rename from groovy.grails/src/org/netbeans/modules/groovy/grails/api/ExecutionSupport.java
rename to groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/api/ExecutionSupport.java
diff --git a/groovy.grails/src/org/netbeans/modules/groovy/grails/api/GrailsConstants.java b/groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/api/GrailsConstants.java
similarity index 100%
rename from groovy.grails/src/org/netbeans/modules/groovy/grails/api/GrailsConstants.java
rename to groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/api/GrailsConstants.java
diff --git a/groovy.grails/src/org/netbeans/modules/groovy/grails/api/GrailsEnvironment.java b/groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/api/GrailsEnvironment.java
similarity index 100%
rename from groovy.grails/src/org/netbeans/modules/groovy/grails/api/GrailsEnvironment.java
rename to groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/api/GrailsEnvironment.java
diff --git a/groovy.grails/src/org/netbeans/modules/groovy/grails/api/GrailsPlatform.java b/groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/api/GrailsPlatform.java
similarity index 100%
rename from groovy.grails/src/org/netbeans/modules/groovy/grails/api/GrailsPlatform.java
rename to groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/api/GrailsPlatform.java
diff --git a/groovy.grails/src/org/netbeans/modules/groovy/grails/api/GrailsProjectConfig.java b/groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/api/GrailsProjectConfig.java
similarity index 100%
rename from groovy.grails/src/org/netbeans/modules/groovy/grails/api/GrailsProjectConfig.java
rename to groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/api/GrailsProjectConfig.java
diff --git a/groovy.grails/src/org/netbeans/modules/groovy/grails/resources/Bundle.properties b/groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/resources/Bundle.properties
similarity index 100%
rename from groovy.grails/src/org/netbeans/modules/groovy/grails/resources/Bundle.properties
rename to groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/resources/Bundle.properties
diff --git a/groovy.grails/src/org/netbeans/modules/groovy/grails/resources/GrailsIcon16x16.png b/groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/resources/GrailsIcon16x16.png
similarity index 100%
rename from groovy.grails/src/org/netbeans/modules/groovy/grails/resources/GrailsIcon16x16.png
rename to groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/resources/GrailsIcon16x16.png
diff --git a/groovy.grails/src/org/netbeans/modules/groovy/grails/resources/layer.xml b/groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/resources/layer.xml
similarity index 100%
rename from groovy.grails/src/org/netbeans/modules/groovy/grails/resources/layer.xml
rename to groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/resources/layer.xml
diff --git a/groovy.grails/src/org/netbeans/modules/groovy/grails/server/ApplicationNode.java b/groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/server/ApplicationNode.java
similarity index 100%
rename from groovy.grails/src/org/netbeans/modules/groovy/grails/server/ApplicationNode.java
rename to groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/server/ApplicationNode.java
diff --git a/groovy.grails/src/org/netbeans/modules/groovy/grails/server/Bundle.properties b/groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/server/Bundle.properties
similarity index 100%
rename from groovy.grails/src/org/netbeans/modules/groovy/grails/server/Bundle.properties
rename to groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/server/Bundle.properties
diff --git a/groovy.grails/src/org/netbeans/modules/groovy/grails/server/GrailsInstance.java b/groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/server/GrailsInstance.java
similarity index 100%
rename from groovy.grails/src/org/netbeans/modules/groovy/grails/server/GrailsInstance.java
rename to groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/server/GrailsInstance.java
diff --git a/groovy.grails/src/org/netbeans/modules/groovy/grails/server/GrailsInstanceProvider.java b/groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/server/GrailsInstanceProvider.java
similarity index 100%
rename from groovy.grails/src/org/netbeans/modules/groovy/grails/server/GrailsInstanceProvider.java
rename to groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/server/GrailsInstanceProvider.java
diff --git a/groovy.grails/src/org/netbeans/modules/groovy/grails/server/ProcessCookie.java b/groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/server/ProcessCookie.java
similarity index 100%
rename from groovy.grails/src/org/netbeans/modules/groovy/grails/server/ProcessCookie.java
rename to groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/server/ProcessCookie.java
diff --git a/groovy.grails/src/org/netbeans/modules/groovy/grails/settings/Bundle.properties b/groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/settings/Bundle.properties
similarity index 100%
rename from groovy.grails/src/org/netbeans/modules/groovy/grails/settings/Bundle.properties
rename to groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/settings/Bundle.properties
diff --git a/groovy.grails/src/org/netbeans/modules/groovy/grails/settings/GrailsRuntimePanel.form b/groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/settings/GrailsRuntimePanel.form
similarity index 100%
rename from groovy.grails/src/org/netbeans/modules/groovy/grails/settings/GrailsRuntimePanel.form
rename to groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/settings/GrailsRuntimePanel.form
diff --git a/groovy.grails/src/org/netbeans/modules/groovy/grails/settings/GrailsRuntimePanel.java b/groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/settings/GrailsRuntimePanel.java
similarity index 100%
rename from groovy.grails/src/org/netbeans/modules/groovy/grails/settings/GrailsRuntimePanel.java
rename to groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/settings/GrailsRuntimePanel.java
diff --git a/groovy.grails/src/org/netbeans/modules/groovy/grails/settings/GrailsSettings.java b/groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/settings/GrailsSettings.java
similarity index 100%
rename from groovy.grails/src/org/netbeans/modules/groovy/grails/settings/GrailsSettings.java
rename to groovy/groovy.grails/src/org/netbeans/modules/groovy/grails/settings/GrailsSettings.java
diff --git a/groovy.grails/test/unit/src/org/netbeans/modules/groovy/grails/api/GrailsEnvironmentTest.java b/groovy/groovy.grails/test/unit/src/org/netbeans/modules/groovy/grails/api/GrailsEnvironmentTest.java
similarity index 100%
rename from groovy.grails/test/unit/src/org/netbeans/modules/groovy/grails/api/GrailsEnvironmentTest.java
rename to groovy/groovy.grails/test/unit/src/org/netbeans/modules/groovy/grails/api/GrailsEnvironmentTest.java
diff --git a/groovy.grails/test/unit/src/org/netbeans/modules/groovy/grails/api/GrailsProjectConfigTest.java b/groovy/groovy.grails/test/unit/src/org/netbeans/modules/groovy/grails/api/GrailsProjectConfigTest.java
similarity index 100%
rename from groovy.grails/test/unit/src/org/netbeans/modules/groovy/grails/api/GrailsProjectConfigTest.java
rename to groovy/groovy.grails/test/unit/src/org/netbeans/modules/groovy/grails/api/GrailsProjectConfigTest.java
diff --git a/groovy.grails/test/unit/src/org/netbeans/modules/groovy/grails/api/GrailsRuntimeTest.java b/groovy/groovy.grails/test/unit/src/org/netbeans/modules/groovy/grails/api/GrailsRuntimeTest.java
similarity index 100%
rename from groovy.grails/test/unit/src/org/netbeans/modules/groovy/grails/api/GrailsRuntimeTest.java
rename to groovy/groovy.grails/test/unit/src/org/netbeans/modules/groovy/grails/api/GrailsRuntimeTest.java
diff --git a/groovy.grails/test/unit/src/org/netbeans/modules/groovy/grails/api/TestProject.java b/groovy/groovy.grails/test/unit/src/org/netbeans/modules/groovy/grails/api/TestProject.java
similarity index 100%
rename from groovy.grails/test/unit/src/org/netbeans/modules/groovy/grails/api/TestProject.java
rename to groovy/groovy.grails/test/unit/src/org/netbeans/modules/groovy/grails/api/TestProject.java
diff --git a/groovy.grails/test/unit/src/org/netbeans/modules/groovy/grails/settings/GrailsSettingsTest.java b/groovy/groovy.grails/test/unit/src/org/netbeans/modules/groovy/grails/settings/GrailsSettingsTest.java
similarity index 100%
rename from groovy.grails/test/unit/src/org/netbeans/modules/groovy/grails/settings/GrailsSettingsTest.java
rename to groovy/groovy.grails/test/unit/src/org/netbeans/modules/groovy/grails/settings/GrailsSettingsTest.java
diff --git a/groovy.grailsproject/build.xml b/groovy/groovy.grailsproject/build.xml
similarity index 87%
rename from groovy.grailsproject/build.xml
rename to groovy/groovy.grailsproject/build.xml
index 833b3a08b8..5d393cfd04 100644
--- a/groovy.grailsproject/build.xml
+++ b/groovy/groovy.grailsproject/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="netbeans" name="groovy.grailsproject">
+<project basedir="." default="build" name="groovy/groovy.grailsproject">
     <description>Builds, tests, and runs the project org.netbeans.modules.groovy.grailsproject</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/groovy.grailsproject/manifest.mf b/groovy/groovy.grailsproject/manifest.mf
similarity index 100%
rename from groovy.grailsproject/manifest.mf
rename to groovy/groovy.grailsproject/manifest.mf
diff --git a/groovy.grailsproject/nbproject/project.properties b/groovy/groovy.grailsproject/nbproject/project.properties
similarity index 100%
rename from groovy.grailsproject/nbproject/project.properties
rename to groovy/groovy.grailsproject/nbproject/project.properties
diff --git a/groovy.grailsproject/nbproject/project.xml b/groovy/groovy.grailsproject/nbproject/project.xml
similarity index 100%
rename from groovy.grailsproject/nbproject/project.xml
rename to groovy/groovy.grailsproject/nbproject/project.xml
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/Bundle.properties b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/Bundle.properties
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/Bundle.properties
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/Bundle.properties
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsActionProvider.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsActionProvider.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsActionProvider.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsActionProvider.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsProject.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsProject.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsProject.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsProject.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsProjectFactory.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsProjectFactory.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsProjectFactory.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsProjectFactory.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsProjectOperations.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsProjectOperations.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsProjectOperations.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsProjectOperations.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsProjectSettings.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsProjectSettings.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsProjectSettings.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsProjectSettings.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsServerState.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsServerState.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsServerState.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsServerState.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsSources.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsSources.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsSources.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsSources.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ProgressSupport.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ProgressSupport.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ProgressSupport.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ProgressSupport.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesFactory.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesFactory.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesFactory.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesFactory.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails11.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails11.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails11.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails11.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails301.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails301.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails301.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails301.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesInterface.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesInterface.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesInterface.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesInterface.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategory.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategory.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategory.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategory.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoryType.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoryType.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoryType.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoryType.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/Bundle.properties b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/Bundle.properties
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/Bundle.properties
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/Bundle.properties
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/ConfigurationSupport.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/ConfigurationSupport.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/ConfigurationSupport.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/ConfigurationSupport.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GenerateAction.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GenerateAction.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GenerateAction.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GenerateAction.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GenerateAllAction.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GenerateAllAction.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GenerateAllAction.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GenerateAllAction.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GenerateViewsAction.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GenerateViewsAction.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GenerateViewsAction.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GenerateViewsAction.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GotoBaseAction.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GotoBaseAction.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GotoBaseAction.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GotoBaseAction.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GotoControllerAction.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GotoControllerAction.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GotoControllerAction.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GotoControllerAction.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GotoDomainClassAction.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GotoDomainClassAction.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GotoDomainClassAction.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GotoDomainClassAction.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GotoViewAction.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GotoViewAction.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GotoViewAction.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GotoViewAction.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GrailsCommandAction.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GrailsCommandAction.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GrailsCommandAction.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GrailsCommandAction.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/ManagePluginsAction.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/ManagePluginsAction.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/ManagePluginsAction.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/ManagePluginsAction.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/RefreshProjectRunnable.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/RefreshProjectRunnable.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/RefreshProjectRunnable.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/RefreshProjectRunnable.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/ResolvePluginsAction.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/ResolvePluginsAction.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/ResolvePluginsAction.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/ResolvePluginsAction.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/classpath/BootClassPathImplementation.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/classpath/BootClassPathImplementation.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/classpath/BootClassPathImplementation.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/classpath/BootClassPathImplementation.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/classpath/ClassPathProviderImpl.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/classpath/ClassPathProviderImpl.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/classpath/ClassPathProviderImpl.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/classpath/ClassPathProviderImpl.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/classpath/ProjectClassPathImplementation.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/classpath/ProjectClassPathImplementation.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/classpath/ProjectClassPathImplementation.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/classpath/ProjectClassPathImplementation.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/classpath/SourcePathImplementation.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/classpath/SourcePathImplementation.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/classpath/SourcePathImplementation.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/classpath/SourcePathImplementation.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/classpath/SourceRoots.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/classpath/SourceRoots.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/classpath/SourceRoots.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/classpath/SourceRoots.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/Bundle.properties b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/Bundle.properties
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/Bundle.properties
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/Bundle.properties
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommand.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommand.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommand.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommand.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandChooser.form b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandChooser.form
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandChooser.form
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandChooser.form
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandChooser.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandChooser.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandChooser.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandChooser.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandSupport.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandSupport.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandSupport.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandSupport.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/completion/ControllerCompletionProvider.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/completion/ControllerCompletionProvider.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/completion/ControllerCompletionProvider.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/completion/ControllerCompletionProvider.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/completion/DomainCompletionProvider.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/completion/DomainCompletionProvider.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/completion/DomainCompletionProvider.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/completion/DomainCompletionProvider.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/config/BuildConfig.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/config/BuildConfig.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/config/BuildConfig.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/config/BuildConfig.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/debug/GrailsDebugger.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/debug/GrailsDebugger.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/debug/GrailsDebugger.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/debug/GrailsDebugger.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/debug/Utils.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/debug/Utils.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/debug/Utils.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/debug/Utils.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/plugins/Bundle.properties b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/plugins/Bundle.properties
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/plugins/Bundle.properties
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/plugins/Bundle.properties
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/plugins/GrailsPlugin.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/plugins/GrailsPlugin.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/plugins/GrailsPlugin.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/plugins/GrailsPlugin.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/plugins/GrailsPluginSupport.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/plugins/GrailsPluginSupport.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/plugins/GrailsPluginSupport.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/plugins/GrailsPluginSupport.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/queries/GrailsProjectEncodingQueryImpl.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/queries/GrailsProjectEncodingQueryImpl.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/queries/GrailsProjectEncodingQueryImpl.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/queries/GrailsProjectEncodingQueryImpl.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/Bundle.properties b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/Bundle.properties
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/Bundle.properties
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/Bundle.properties
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/Controller.html b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/Controller.html
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/Controller.html
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/Controller.html
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/DomainClass.html b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/DomainClass.html
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/DomainClass.html
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/DomainClass.html
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/GantScript.html b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/GantScript.html
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/GantScript.html
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/GantScript.html
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/GrailsIcon16x16.png b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/GrailsIcon16x16.png
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/GrailsIcon16x16.png
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/GrailsIcon16x16.png
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/IntegrationTest.html b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/IntegrationTest.html
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/IntegrationTest.html
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/IntegrationTest.html
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/Service.html b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/Service.html
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/Service.html
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/Service.html
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/TagLib.html b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/TagLib.html
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/TagLib.html
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/TagLib.html
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/UnitTest.html b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/UnitTest.html
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/UnitTest.html
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/UnitTest.html
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/defaultFolder.gif b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/defaultFolder.gif
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/defaultFolder.gif
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/defaultFolder.gif
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/defaultFolderOpen.gif b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/defaultFolderOpen.gif
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/defaultFolderOpen.gif
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/defaultFolderOpen.gif
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/desktop.html b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/desktop.html
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/desktop.html
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/desktop.html
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/emptyProject.html b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/emptyProject.html
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/emptyProject.html
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/emptyProject.html
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/layer.xml b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/layer.xml
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/layer.xml
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/layer.xml
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/librariesBadge.png b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/librariesBadge.png
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/librariesBadge.png
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/librariesBadge.png
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/packageBadge.gif b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/packageBadge.gif
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/packageBadge.gif
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/packageBadge.gif
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/projectfilesBadge.png b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/projectfilesBadge.png
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/projectfilesBadge.png
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/projectfilesBadge.png
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/Bundle.properties b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/Bundle.properties
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/Bundle.properties
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/Bundle.properties
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/GrailsLogicalViewProvider.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/GrailsLogicalViewProvider.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/GrailsLogicalViewProvider.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/GrailsLogicalViewProvider.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/GrailsPluginsPanel.form b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/GrailsPluginsPanel.form
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/GrailsPluginsPanel.form
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/GrailsPluginsPanel.form
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/GrailsPluginsPanel.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/GrailsPluginsPanel.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/GrailsPluginsPanel.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/GrailsPluginsPanel.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/ProjectFilesNode.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/ProjectFilesNode.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/ProjectFilesNode.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/ProjectFilesNode.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/ProjectFilesNodeFactory.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/ProjectFilesNodeFactory.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/ProjectFilesNodeFactory.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/ProjectFilesNodeFactory.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/SourceNodeFactory.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/SourceNodeFactory.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/SourceNodeFactory.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/SourceNodeFactory.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/TemplatesImpl.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/TemplatesImpl.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/TemplatesImpl.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/TemplatesImpl.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/TreeRootNode.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/TreeRootNode.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/TreeRootNode.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/TreeRootNode.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/Bundle.properties b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/Bundle.properties
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/Bundle.properties
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/Bundle.properties
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/GeneralCustomizerPanel.form b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/GeneralCustomizerPanel.form
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/GeneralCustomizerPanel.form
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/GeneralCustomizerPanel.form
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/GeneralCustomizerPanel.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/GeneralCustomizerPanel.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/GeneralCustomizerPanel.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/GeneralCustomizerPanel.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/GrailsProjectCustomizerProvider.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/GrailsProjectCustomizerProvider.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/GrailsProjectCustomizerProvider.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/GrailsProjectCustomizerProvider.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/GrailsProjectProperties.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/GrailsProjectProperties.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/GrailsProjectProperties.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/GrailsProjectProperties.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/LibrariesCustomizerPanel.form b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/LibrariesCustomizerPanel.form
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/LibrariesCustomizerPanel.form
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/LibrariesCustomizerPanel.form
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/LibrariesCustomizerPanel.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/LibrariesCustomizerPanel.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/LibrariesCustomizerPanel.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/LibrariesCustomizerPanel.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/Bundle.properties b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/Bundle.properties
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/Bundle.properties
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/Bundle.properties
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/GrailsArtifactWizardIterator.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/GrailsArtifactWizardIterator.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/GrailsArtifactWizardIterator.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/GrailsArtifactWizardIterator.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/GrailsProjectWizardIterator.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/GrailsProjectWizardIterator.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/GrailsProjectWizardIterator.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/GrailsProjectWizardIterator.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/GrailsTemplates.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/GrailsTemplates.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/GrailsTemplates.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/GrailsTemplates.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/Bundle.properties b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/Bundle.properties
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/Bundle.properties
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/Bundle.properties
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/GrailsArtifacts.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/GrailsArtifacts.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/GrailsArtifacts.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/GrailsArtifacts.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/GrailsTargetChooserPanel.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/GrailsTargetChooserPanel.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/GrailsTargetChooserPanel.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/GrailsTargetChooserPanel.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/GrailsTargetChooserPanelGUI.form b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/GrailsTargetChooserPanelGUI.form
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/GrailsTargetChooserPanelGUI.form
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/GrailsTargetChooserPanelGUI.form
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/GrailsTargetChooserPanelGUI.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/GrailsTargetChooserPanelGUI.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/GrailsTargetChooserPanelGUI.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/GrailsTargetChooserPanelGUI.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelConfigureProject.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelConfigureProject.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelConfigureProject.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelConfigureProject.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelConfigureProjectVisual.form b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelConfigureProjectVisual.form
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelConfigureProjectVisual.form
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelConfigureProjectVisual.form
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelConfigureProjectVisual.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelConfigureProjectVisual.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelConfigureProjectVisual.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelConfigureProjectVisual.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelOptionsVisual.form b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelOptionsVisual.form
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelOptionsVisual.form
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelOptionsVisual.form
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelOptionsVisual.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelOptionsVisual.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelOptionsVisual.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelOptionsVisual.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelProjectLocationVisual.form b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelProjectLocationVisual.form
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelProjectLocationVisual.form
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelProjectLocationVisual.form
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelProjectLocationVisual.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelProjectLocationVisual.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelProjectLocationVisual.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelProjectLocationVisual.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/ProgressLineProcessor.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/ProgressLineProcessor.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/ProgressLineProcessor.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/ProgressLineProcessor.java
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/SettingsPanel.java b/groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/SettingsPanel.java
similarity index 100%
rename from groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/SettingsPanel.java
rename to groovy/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/SettingsPanel.java
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/.classpath b/groovy/groovy.grailsproject/test/unit/data/projects/completion/.classpath
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/.classpath
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/.classpath
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/.project b/groovy/groovy.grailsproject/test/unit/data/projects/completion/.project
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/.project
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/.project
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/.settings/org.codehaus.groovy.eclipse.preferences.prefs b/groovy/groovy.grailsproject/test/unit/data/projects/completion/.settings/org.codehaus.groovy.eclipse.preferences.prefs
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/.settings/org.codehaus.groovy.eclipse.preferences.prefs
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/.settings/org.codehaus.groovy.eclipse.preferences.prefs
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/application.properties b/groovy/groovy.grailsproject/test/unit/data/projects/completion/application.properties
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/application.properties
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/application.properties
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/build.xml b/groovy/groovy.grailsproject/test/unit/data/projects/completion/build.xml
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/build.xml
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/build.xml
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/completion-test.launch b/groovy/groovy.grailsproject/test/unit/data/projects/completion/completion-test.launch
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/completion-test.launch
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/completion-test.launch
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/completion.launch b/groovy/groovy.grailsproject/test/unit/data/projects/completion/completion.launch
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/completion.launch
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/completion.launch
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/completion.tmproj b/groovy/groovy.grailsproject/test/unit/data/projects/completion/completion.tmproj
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/completion.tmproj
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/completion.tmproj
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/conf/BootStrap.groovy b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/conf/BootStrap.groovy
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/conf/BootStrap.groovy
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/conf/BootStrap.groovy
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/conf/Config.groovy b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/conf/Config.groovy
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/conf/Config.groovy
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/conf/Config.groovy
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/conf/DataSource.groovy b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/conf/DataSource.groovy
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/conf/DataSource.groovy
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/conf/DataSource.groovy
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/conf/UrlMappings.groovy b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/conf/UrlMappings.groovy
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/conf/UrlMappings.groovy
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/conf/UrlMappings.groovy
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/conf/spring/resources.groovy b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/conf/spring/resources.groovy
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/conf/spring/resources.groovy
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/conf/spring/resources.groovy
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/controllers/TestDomainController.groovy b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/controllers/TestDomainController.groovy
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/controllers/TestDomainController.groovy
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/controllers/TestDomainController.groovy
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/controllers/TestDomainController.groovy.testControllerMethods1.completion b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/controllers/TestDomainController.groovy.testControllerMethods1.completion
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/controllers/TestDomainController.groovy.testControllerMethods1.completion
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/controllers/TestDomainController.groovy.testControllerMethods1.completion
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods1.completion b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods1.completion
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods1.completion
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods1.completion
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods2.completion b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods2.completion
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods2.completion
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods2.completion
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods3.completion b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods3.completion
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods3.completion
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods3.completion
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods4.completion b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods4.completion
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods4.completion
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods4.completion
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods5.completion b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods5.completion
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods5.completion
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods5.completion
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods6.completion b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods6.completion
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods6.completion
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods6.completion
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods7.completion b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods7.completion
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods7.completion
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods7.completion
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods8.completion b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods8.completion
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods8.completion
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/domain/TestDomain.groovy.testDomainMethods8.completion
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages.properties b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages.properties
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages.properties
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages.properties
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_de.properties b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_de.properties
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_de.properties
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_de.properties
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_es.properties b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_es.properties
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_es.properties
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_es.properties
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_fr.properties b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_fr.properties
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_fr.properties
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_fr.properties
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_it.properties b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_it.properties
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_it.properties
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_it.properties
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_ja.properties b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_ja.properties
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_ja.properties
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_ja.properties
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_nl.properties b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_nl.properties
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_nl.properties
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_nl.properties
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_pt_BR.properties b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_pt_BR.properties
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_pt_BR.properties
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_pt_BR.properties
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_ru.properties b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_ru.properties
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_ru.properties
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_ru.properties
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_th.properties b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_th.properties
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_th.properties
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_th.properties
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_zh_CN.properties b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_zh_CN.properties
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_zh_CN.properties
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/i18n/messages_zh_CN.properties
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/error.gsp b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/error.gsp
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/error.gsp
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/error.gsp
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/index.gsp b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/index.gsp
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/index.gsp
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/index.gsp
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/layouts/main.gsp b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/layouts/main.gsp
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/layouts/main.gsp
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/layouts/main.gsp
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/testDomain/create.gsp b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/testDomain/create.gsp
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/testDomain/create.gsp
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/testDomain/create.gsp
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/testDomain/edit.gsp b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/testDomain/edit.gsp
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/testDomain/edit.gsp
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/testDomain/edit.gsp
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/testDomain/list.gsp b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/testDomain/list.gsp
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/testDomain/list.gsp
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/testDomain/list.gsp
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/testDomain/show.gsp b/groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/testDomain/show.gsp
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/testDomain/show.gsp
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/grails-app/views/testDomain/show.gsp
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/ivy.xml b/groovy/groovy.grailsproject/test/unit/data/projects/completion/ivy.xml
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/ivy.xml
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/ivy.xml
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/ivysettings.xml b/groovy/groovy.grailsproject/test/unit/data/projects/completion/ivysettings.xml
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/ivysettings.xml
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/ivysettings.xml
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/stacktrace.log b/groovy/groovy.grailsproject/test/unit/data/projects/completion/stacktrace.log
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/stacktrace.log
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/stacktrace.log
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/test/unit/TestDomainTests.groovy b/groovy/groovy.grailsproject/test/unit/data/projects/completion/test/unit/TestDomainTests.groovy
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/test/unit/TestDomainTests.groovy
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/test/unit/TestDomainTests.groovy
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/web-app/WEB-INF/applicationContext.xml b/groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/WEB-INF/applicationContext.xml
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/web-app/WEB-INF/applicationContext.xml
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/WEB-INF/applicationContext.xml
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/web-app/WEB-INF/sitemesh.xml b/groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/WEB-INF/sitemesh.xml
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/web-app/WEB-INF/sitemesh.xml
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/WEB-INF/sitemesh.xml
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/web-app/WEB-INF/tld/c.tld b/groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/WEB-INF/tld/c.tld
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/web-app/WEB-INF/tld/c.tld
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/WEB-INF/tld/c.tld
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/web-app/WEB-INF/tld/fmt.tld b/groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/WEB-INF/tld/fmt.tld
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/web-app/WEB-INF/tld/fmt.tld
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/WEB-INF/tld/fmt.tld
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/web-app/WEB-INF/tld/grails.tld b/groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/WEB-INF/tld/grails.tld
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/web-app/WEB-INF/tld/grails.tld
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/WEB-INF/tld/grails.tld
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/web-app/WEB-INF/tld/spring.tld b/groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/WEB-INF/tld/spring.tld
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/web-app/WEB-INF/tld/spring.tld
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/WEB-INF/tld/spring.tld
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/web-app/css/main.css b/groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/css/main.css
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/web-app/css/main.css
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/css/main.css
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/favicon.ico b/groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/favicon.ico
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/web-app/images/favicon.ico
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/favicon.ico
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/database_add.png b/groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/database_add.png
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/database_add.png
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/database_add.png
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/database_delete.png b/groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/database_delete.png
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/database_delete.png
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/database_delete.png
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/database_edit.png b/groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/database_edit.png
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/database_edit.png
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/database_edit.png
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/database_save.png b/groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/database_save.png
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/database_save.png
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/database_save.png
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/database_table.png b/groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/database_table.png
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/database_table.png
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/database_table.png
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/exclamation.png b/groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/exclamation.png
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/exclamation.png
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/exclamation.png
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/house.png b/groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/house.png
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/house.png
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/house.png
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/information.png b/groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/information.png
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/information.png
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/information.png
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/shadow.jpg b/groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/shadow.jpg
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/shadow.jpg
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/shadow.jpg
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/sorted_asc.gif b/groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/sorted_asc.gif
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/sorted_asc.gif
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/sorted_asc.gif
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/sorted_desc.gif b/groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/sorted_desc.gif
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/sorted_desc.gif
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/skin/sorted_desc.gif
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/spinner.gif b/groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/spinner.gif
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/web-app/images/spinner.gif
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/images/spinner.gif
diff --git a/groovy.grailsproject/test/unit/data/projects/completion/web-app/js/application.js b/groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/js/application.js
similarity index 100%
rename from groovy.grailsproject/test/unit/data/projects/completion/web-app/js/application.js
rename to groovy/groovy.grailsproject/test/unit/data/projects/completion/web-app/js/application.js
diff --git a/groovy.grailsproject/test/unit/src/META-INF/services/org.netbeans.spi.lexer.LanguageProvider b/groovy/groovy.grailsproject/test/unit/src/META-INF/services/org.netbeans.spi.lexer.LanguageProvider
similarity index 100%
rename from groovy.grailsproject/test/unit/src/META-INF/services/org.netbeans.spi.lexer.LanguageProvider
rename to groovy/groovy.grailsproject/test/unit/src/META-INF/services/org.netbeans.spi.lexer.LanguageProvider
diff --git a/groovy.grailsproject/test/unit/src/org/netbeans/modules/groovy/grailsproject/actions/GotoBaseActionTest.java b/groovy/groovy.grailsproject/test/unit/src/org/netbeans/modules/groovy/grailsproject/actions/GotoBaseActionTest.java
similarity index 100%
rename from groovy.grailsproject/test/unit/src/org/netbeans/modules/groovy/grailsproject/actions/GotoBaseActionTest.java
rename to groovy/groovy.grailsproject/test/unit/src/org/netbeans/modules/groovy/grailsproject/actions/GotoBaseActionTest.java
diff --git a/groovy.grailsproject/test/unit/src/org/netbeans/modules/groovy/grailsproject/completion/ControllerCompletionProviderTest.java b/groovy/groovy.grailsproject/test/unit/src/org/netbeans/modules/groovy/grailsproject/completion/ControllerCompletionProviderTest.java
similarity index 100%
rename from groovy.grailsproject/test/unit/src/org/netbeans/modules/groovy/grailsproject/completion/ControllerCompletionProviderTest.java
rename to groovy/groovy.grailsproject/test/unit/src/org/netbeans/modules/groovy/grailsproject/completion/ControllerCompletionProviderTest.java
diff --git a/groovy.grailsproject/test/unit/src/org/netbeans/modules/groovy/grailsproject/completion/DomainCompletionProviderTest.java b/groovy/groovy.grailsproject/test/unit/src/org/netbeans/modules/groovy/grailsproject/completion/DomainCompletionProviderTest.java
similarity index 100%
rename from groovy.grailsproject/test/unit/src/org/netbeans/modules/groovy/grailsproject/completion/DomainCompletionProviderTest.java
rename to groovy/groovy.grailsproject/test/unit/src/org/netbeans/modules/groovy/grailsproject/completion/DomainCompletionProviderTest.java
diff --git a/groovy.gsp/build.xml b/groovy/groovy.gsp/build.xml
similarity index 88%
rename from groovy.gsp/build.xml
rename to groovy/groovy.gsp/build.xml
index e7430483cc..a7770aa9ad 100644
--- a/groovy.gsp/build.xml
+++ b/groovy/groovy.gsp/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="netbeans" name="groovy.gsp">
+<project basedir="." default="build" name="groovy/groovy.gsp">
     <description>Builds, tests, and runs the project org.netbeans.modules.groovy.gsp</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/groovy.gsp/licenseinfo.xml b/groovy/groovy.gsp/licenseinfo.xml
similarity index 100%
rename from groovy.gsp/licenseinfo.xml
rename to groovy/groovy.gsp/licenseinfo.xml
diff --git a/groovy.gsp/manifest.mf b/groovy/groovy.gsp/manifest.mf
similarity index 100%
rename from groovy.gsp/manifest.mf
rename to groovy/groovy.gsp/manifest.mf
diff --git a/groovy.gsp/nbproject/project.properties b/groovy/groovy.gsp/nbproject/project.properties
similarity index 100%
rename from groovy.gsp/nbproject/project.properties
rename to groovy/groovy.gsp/nbproject/project.properties
diff --git a/groovy.gsp/nbproject/project.xml b/groovy/groovy.gsp/nbproject/project.xml
similarity index 100%
rename from groovy.gsp/nbproject/project.xml
rename to groovy/groovy.gsp/nbproject/project.xml
diff --git a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/GspLanguage.java b/groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/GspLanguage.java
similarity index 100%
rename from groovy.gsp/src/org/netbeans/modules/groovy/gsp/GspLanguage.java
rename to groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/GspLanguage.java
diff --git a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/GspParser.java b/groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/GspParser.java
similarity index 100%
rename from groovy.gsp/src/org/netbeans/modules/groovy/gsp/GspParser.java
rename to groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/GspParser.java
diff --git a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/GspStructureScanner.java b/groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/GspStructureScanner.java
similarity index 100%
rename from groovy.gsp/src/org/netbeans/modules/groovy/gsp/GspStructureScanner.java
rename to groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/GspStructureScanner.java
diff --git a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/GspKit.java b/groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/GspKit.java
similarity index 100%
rename from groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/GspKit.java
rename to groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/GspKit.java
diff --git a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/bracesmatcher/GspBracesMacherFactory.java b/groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/bracesmatcher/GspBracesMacherFactory.java
similarity index 100%
rename from groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/bracesmatcher/GspBracesMacherFactory.java
rename to groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/bracesmatcher/GspBracesMacherFactory.java
diff --git a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/bracesmatcher/GspBracesMatcher.java b/groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/bracesmatcher/GspBracesMatcher.java
similarity index 100%
rename from groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/bracesmatcher/GspBracesMatcher.java
rename to groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/bracesmatcher/GspBracesMatcher.java
diff --git a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/completion/GspCompleter.java b/groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/completion/GspCompleter.java
similarity index 100%
rename from groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/completion/GspCompleter.java
rename to groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/completion/GspCompleter.java
diff --git a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/embedding/EmbeddedSectionsHighlighting.java b/groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/embedding/EmbeddedSectionsHighlighting.java
similarity index 100%
rename from groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/embedding/EmbeddedSectionsHighlighting.java
rename to groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/embedding/EmbeddedSectionsHighlighting.java
diff --git a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/embedding/GroovyEmbeddingProvider.java b/groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/embedding/GroovyEmbeddingProvider.java
similarity index 100%
rename from groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/embedding/GroovyEmbeddingProvider.java
rename to groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/embedding/GroovyEmbeddingProvider.java
diff --git a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/embedding/HtmlEmbeddingProvider.java b/groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/embedding/HtmlEmbeddingProvider.java
similarity index 100%
rename from groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/embedding/HtmlEmbeddingProvider.java
rename to groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/embedding/HtmlEmbeddingProvider.java
diff --git a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/indent/GspIndentTask.java b/groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/indent/GspIndentTask.java
similarity index 100%
rename from groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/indent/GspIndentTask.java
rename to groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/indent/GspIndentTask.java
diff --git a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/indent/GspIndentTaskFactory.java b/groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/indent/GspIndentTaskFactory.java
similarity index 100%
rename from groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/indent/GspIndentTaskFactory.java
rename to groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/indent/GspIndentTaskFactory.java
diff --git a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/indent/GspIndenter.java b/groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/indent/GspIndenter.java
similarity index 100%
rename from groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/indent/GspIndenter.java
rename to groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/indent/GspIndenter.java
diff --git a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/lexer/GspLexer.java b/groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/lexer/GspLexer.java
similarity index 100%
rename from groovy.gsp/src/org/netbeans/modules/groovy/gsp/lexer/GspLexer.java
rename to groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/lexer/GspLexer.java
diff --git a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/lexer/GspLexerLanguage.java b/groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/lexer/GspLexerLanguage.java
similarity index 100%
rename from groovy.gsp/src/org/netbeans/modules/groovy/gsp/lexer/GspLexerLanguage.java
rename to groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/lexer/GspLexerLanguage.java
diff --git a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/lexer/GspTokenId.java b/groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/lexer/GspTokenId.java
similarity index 100%
rename from groovy.gsp/src/org/netbeans/modules/groovy/gsp/lexer/GspTokenId.java
rename to groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/lexer/GspTokenId.java
diff --git a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/Bundle.properties b/groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/Bundle.properties
similarity index 100%
rename from groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/Bundle.properties
rename to groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/Bundle.properties
diff --git a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/DefaultKeyBindings-Mac.xml b/groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/DefaultKeyBindings-Mac.xml
similarity index 100%
rename from groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/DefaultKeyBindings-Mac.xml
rename to groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/DefaultKeyBindings-Mac.xml
diff --git a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/DefaultKeyBindings.xml b/groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/DefaultKeyBindings.xml
similarity index 100%
rename from groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/DefaultKeyBindings.xml
rename to groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/DefaultKeyBindings.xml
diff --git a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/GspExample b/groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/GspExample
similarity index 100%
rename from groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/GspExample
rename to groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/GspExample
diff --git a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/GspFile16x16.png b/groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/GspFile16x16.png
similarity index 100%
rename from groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/GspFile16x16.png
rename to groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/GspFile16x16.png
diff --git a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/GspTemplate.gsp b/groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/GspTemplate.gsp
similarity index 100%
rename from groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/GspTemplate.gsp
rename to groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/GspTemplate.gsp
diff --git a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/GspTemplate.html b/groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/GspTemplate.html
similarity index 100%
rename from groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/GspTemplate.html
rename to groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/GspTemplate.html
diff --git a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/fontsColors.xml b/groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/fontsColors.xml
similarity index 100%
rename from groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/fontsColors.xml
rename to groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/fontsColors.xml
diff --git a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/layer.xml b/groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/layer.xml
similarity index 100%
rename from groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/layer.xml
rename to groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/resources/layer.xml
diff --git a/groovy.gsp/test/unit/src/org/netbeans/modules/groovy/gsp/lexer/GspLexerTest.java b/groovy/groovy.gsp/test/unit/src/org/netbeans/modules/groovy/gsp/lexer/GspLexerTest.java
similarity index 100%
rename from groovy.gsp/test/unit/src/org/netbeans/modules/groovy/gsp/lexer/GspLexerTest.java
rename to groovy/groovy.gsp/test/unit/src/org/netbeans/modules/groovy/gsp/lexer/GspLexerTest.java
diff --git a/groovy.gsp/test/unit/src/org/netbeans/modules/groovy/gsp/lexer/GspTokenIdTest.java b/groovy/groovy.gsp/test/unit/src/org/netbeans/modules/groovy/gsp/lexer/GspTokenIdTest.java
similarity index 100%
rename from groovy.gsp/test/unit/src/org/netbeans/modules/groovy/gsp/lexer/GspTokenIdTest.java
rename to groovy/groovy.gsp/test/unit/src/org/netbeans/modules/groovy/gsp/lexer/GspTokenIdTest.java
diff --git a/groovy.kit/build.xml b/groovy/groovy.kit/build.xml
similarity index 95%
rename from groovy.kit/build.xml
rename to groovy/groovy.kit/build.xml
index 456252825e..d7f62ea7e5 100644
--- a/groovy.kit/build.xml
+++ b/groovy/groovy.kit/build.xml
@@ -19,9 +19,9 @@
     under the License.
 
 -->
-<project basedir="." default="netbeans" name="groovy.kit">
+<project basedir="." default="build" name="groovy/groovy.kit">
     <description>Builds, tests, and runs the project org.netbeans.modules.groovy.kit</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 
     <target name="groovy-build" description="Builds all the modules constituting the Groovy/Grails support">
         <ant dir="../groovy.support" inheritAll="false" target="netbeans"/>
diff --git a/groovy.kit/manifest.mf b/groovy/groovy.kit/manifest.mf
similarity index 100%
rename from groovy.kit/manifest.mf
rename to groovy/groovy.kit/manifest.mf
diff --git a/groovy.kit/nbproject/project.properties b/groovy/groovy.kit/nbproject/project.properties
similarity index 100%
rename from groovy.kit/nbproject/project.properties
rename to groovy/groovy.kit/nbproject/project.properties
diff --git a/groovy.kit/nbproject/project.xml b/groovy/groovy.kit/nbproject/project.xml
similarity index 100%
rename from groovy.kit/nbproject/project.xml
rename to groovy/groovy.kit/nbproject/project.xml
diff --git a/groovy.kit/release/VERSION.txt b/groovy/groovy.kit/release/VERSION.txt
similarity index 100%
rename from groovy.kit/release/VERSION.txt
rename to groovy/groovy.kit/release/VERSION.txt
diff --git a/groovy.kit/src/org/netbeans/modules/groovy/kit/Bundle.properties b/groovy/groovy.kit/src/org/netbeans/modules/groovy/kit/Bundle.properties
similarity index 100%
rename from groovy.kit/src/org/netbeans/modules/groovy/kit/Bundle.properties
rename to groovy/groovy.kit/src/org/netbeans/modules/groovy/kit/Bundle.properties
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/GrailsActions.launch b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/GrailsActions.launch
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/GrailsActions.launch
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/GrailsActions.launch
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/GrailsActions.tmproj b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/GrailsActions.tmproj
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/GrailsActions.tmproj
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/GrailsActions.tmproj
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/application.properties b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/application.properties
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/application.properties
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/application.properties
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/build.xml b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/build.xml
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/build.xml
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/build.xml
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/conf/BootStrap.groovy b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/conf/BootStrap.groovy
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/conf/BootStrap.groovy
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/conf/BootStrap.groovy
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/conf/Config.groovy b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/conf/Config.groovy
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/conf/Config.groovy
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/conf/Config.groovy
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/conf/DataSource.groovy b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/conf/DataSource.groovy
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/conf/DataSource.groovy
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/conf/DataSource.groovy
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/conf/UrlMappings.groovy b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/conf/UrlMappings.groovy
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/conf/UrlMappings.groovy
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/conf/UrlMappings.groovy
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/conf/spring/resources.groovy b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/conf/spring/resources.groovy
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/conf/spring/resources.groovy
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/conf/spring/resources.groovy
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/controllers/HelloController.groovy b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/controllers/HelloController.groovy
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/controllers/HelloController.groovy
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/controllers/HelloController.groovy
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/domain/Author.groovy b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/domain/Author.groovy
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/domain/Author.groovy
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/domain/Author.groovy
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/domain/Book.groovy b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/domain/Book.groovy
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/domain/Book.groovy
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/domain/Book.groovy
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages.properties b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages.properties
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages.properties
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages.properties
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_de.properties b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_de.properties
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_de.properties
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_de.properties
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_es.properties b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_es.properties
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_es.properties
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_es.properties
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_fr.properties b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_fr.properties
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_fr.properties
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_fr.properties
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_it.properties b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_it.properties
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_it.properties
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_it.properties
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_ja.properties b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_ja.properties
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_ja.properties
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_ja.properties
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_nl.properties b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_nl.properties
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_nl.properties
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_nl.properties
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_pt_BR.properties b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_pt_BR.properties
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_pt_BR.properties
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_pt_BR.properties
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_ru.properties b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_ru.properties
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_ru.properties
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_ru.properties
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_th.properties b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_th.properties
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_th.properties
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_th.properties
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_zh_CN.properties b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_zh_CN.properties
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_zh_CN.properties
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/i18n/messages_zh_CN.properties
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/views/error.gsp b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/views/error.gsp
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/views/error.gsp
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/views/error.gsp
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/views/layouts/main.gsp b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/views/layouts/main.gsp
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/views/layouts/main.gsp
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/grails-app/views/layouts/main.gsp
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/stacktrace.log b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/stacktrace.log
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/stacktrace.log
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/stacktrace.log
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/test/integration/AuthorTests.groovy b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/test/integration/AuthorTests.groovy
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/test/integration/AuthorTests.groovy
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/test/integration/AuthorTests.groovy
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/test/integration/BookTests.groovy b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/test/integration/BookTests.groovy
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/test/integration/BookTests.groovy
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/test/integration/BookTests.groovy
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/test/integration/HelloControllerTests.groovy b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/test/integration/HelloControllerTests.groovy
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/test/integration/HelloControllerTests.groovy
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/test/integration/HelloControllerTests.groovy
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/WEB-INF/applicationContext.xml b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/WEB-INF/applicationContext.xml
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/WEB-INF/applicationContext.xml
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/WEB-INF/applicationContext.xml
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/WEB-INF/sitemesh.xml b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/WEB-INF/sitemesh.xml
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/WEB-INF/sitemesh.xml
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/WEB-INF/sitemesh.xml
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/WEB-INF/tld/c.tld b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/WEB-INF/tld/c.tld
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/WEB-INF/tld/c.tld
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/WEB-INF/tld/c.tld
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/WEB-INF/tld/fmt.tld b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/WEB-INF/tld/fmt.tld
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/WEB-INF/tld/fmt.tld
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/WEB-INF/tld/fmt.tld
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/WEB-INF/tld/grails.tld b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/WEB-INF/tld/grails.tld
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/WEB-INF/tld/grails.tld
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/WEB-INF/tld/grails.tld
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/WEB-INF/tld/spring.tld b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/WEB-INF/tld/spring.tld
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/WEB-INF/tld/spring.tld
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/WEB-INF/tld/spring.tld
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/css/main.css b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/css/main.css
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/css/main.css
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/css/main.css
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/favicon.ico b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/favicon.ico
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/favicon.ico
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/favicon.ico
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/database_add.png b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/database_add.png
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/database_add.png
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/database_add.png
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/database_delete.png b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/database_delete.png
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/database_delete.png
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/database_delete.png
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/database_edit.png b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/database_edit.png
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/database_edit.png
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/database_edit.png
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/database_save.png b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/database_save.png
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/database_save.png
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/database_save.png
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/database_table.png b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/database_table.png
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/database_table.png
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/database_table.png
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/exclamation.png b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/exclamation.png
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/exclamation.png
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/exclamation.png
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/house.png b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/house.png
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/house.png
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/house.png
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/information.png b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/information.png
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/information.png
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/information.png
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/shadow.jpg b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/shadow.jpg
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/shadow.jpg
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/shadow.jpg
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/sorted_asc.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/sorted_asc.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/sorted_asc.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/sorted_asc.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/sorted_desc.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/sorted_desc.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/sorted_desc.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/skin/sorted_desc.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/spinner.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/spinner.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/spinner.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/spinner.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/bullet.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/bullet.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/bullet.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/bullet.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/check0.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/check0.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/check0.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/check0.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/check1.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/check1.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/check1.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/check1.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/check2.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/check2.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/check2.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/check2.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/lm.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/lm.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/lm.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/lm.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/lmh.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/lmh.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/lmh.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/lmh.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/ln.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/ln.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/ln.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/ln.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/loading.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/loading.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/loading.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/loading.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/lp.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/lp.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/lp.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/lp.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/lph.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/lph.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/lph.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/lph.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/tm.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/tm.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/tm.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/tm.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/tmh.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/tmh.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/tmh.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/tmh.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/tn.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/tn.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/tn.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/tn.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/tp.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/tp.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/tp.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/tp.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/tph.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/tph.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/tph.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/tph.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/vline.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/vline.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/vline.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/check/vline.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/lm.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/lm.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/lm.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/lm.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/lmh.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/lmh.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/lmh.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/lmh.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/ln.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/ln.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/ln.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/ln.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/loading.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/loading.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/loading.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/loading.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/lp.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/lp.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/lp.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/lp.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/lph.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/lph.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/lph.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/lph.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/tm.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/tm.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/tm.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/tm.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/tmh.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/tmh.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/tmh.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/tmh.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/tn.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/tn.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/tn.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/tn.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/tp.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/tp.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/tp.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/tp.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/tph.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/tph.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/tph.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/tph.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/vline.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/vline.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/vline.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/default/vline.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/lm.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/lm.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/lm.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/lm.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/lmh.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/lmh.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/lmh.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/lmh.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/ln.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/ln.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/ln.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/ln.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/loading.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/loading.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/loading.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/loading.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/lp.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/lp.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/lp.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/lp.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/lph.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/lph.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/lph.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/lph.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/tm.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/tm.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/tm.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/tm.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/tmh.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/tmh.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/tmh.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/tmh.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/tn.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/tn.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/tn.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/tn.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/tp.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/tp.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/tp.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/tp.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/tph.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/tph.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/tph.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/tph.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/vline.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/vline.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/vline.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/folders/vline.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/greybg.png b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/greybg.png
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/greybg.png
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/greybg.png
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/header.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/header.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/header.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/header.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/collapse.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/collapse.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/collapse.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/collapse.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/collapseh.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/collapseh.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/collapseh.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/collapseh.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/collapseon.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/collapseon.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/collapseon.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/collapseon.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/dash.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/dash.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/dash.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/dash.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/expand.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/expand.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/expand.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/expand.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/expandh.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/expandh.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/expandh.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/expandh.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/expandon.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/expandon.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/expandon.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/expandon.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/loading.gif b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/loading.gif
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/loading.gif
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/menu/loading.gif
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/navHover2.png b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/navHover2.png
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/navHover2.png
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/navHover2.png
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/qbottom.png b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/qbottom.png
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/qbottom.png
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/qbottom.png
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/qmiddle.png b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/qmiddle.png
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/qmiddle.png
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/qmiddle.png
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/qtop.png b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/qtop.png
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/qtop.png
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/images/tree/qtop.png
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/index.gsp b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/index.gsp
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/index.gsp
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/index.gsp
diff --git a/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/js/application.js b/groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/js/application.js
similarity index 100%
rename from groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/js/application.js
rename to groovy/groovy.kit/test/qa-functional/data/projects/GrailsActions/web-app/js/application.js
diff --git a/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GrailsActionsTest.java b/groovy/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GrailsActionsTest.java
similarity index 100%
rename from groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GrailsActionsTest.java
rename to groovy/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GrailsActionsTest.java
diff --git a/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GrailsTestCase.java b/groovy/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GrailsTestCase.java
similarity index 100%
rename from groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GrailsTestCase.java
rename to groovy/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GrailsTestCase.java
diff --git a/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GrailsWizardsTest.java b/groovy/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GrailsWizardsTest.java
similarity index 100%
rename from groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GrailsWizardsTest.java
rename to groovy/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GrailsWizardsTest.java
diff --git a/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GroovySampleTest.java b/groovy/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GroovySampleTest.java
similarity index 100%
rename from groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GroovySampleTest.java
rename to groovy/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GroovySampleTest.java
diff --git a/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GroovyTestCase.java b/groovy/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GroovyTestCase.java
similarity index 100%
rename from groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GroovyTestCase.java
rename to groovy/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GroovyTestCase.java
diff --git a/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GroovyWizardsTest.java b/groovy/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GroovyWizardsTest.java
similarity index 100%
rename from groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GroovyWizardsTest.java
rename to groovy/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/GroovyWizardsTest.java
diff --git a/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/TestURLDisplayer.java b/groovy/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/TestURLDisplayer.java
similarity index 100%
rename from groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/TestURLDisplayer.java
rename to groovy/groovy.kit/test/qa-functional/src/org/netbeans/modules/groovy/qaf/TestURLDisplayer.java
diff --git a/groovy.refactoring/build.xml b/groovy/groovy.refactoring/build.xml
similarity index 88%
rename from groovy.refactoring/build.xml
rename to groovy/groovy.refactoring/build.xml
index 9ef87e4904..5071371778 100644
--- a/groovy.refactoring/build.xml
+++ b/groovy/groovy.refactoring/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="netbeans" name="groovy.refactoring">
+<project basedir="." default="build" name="groovy/groovy.refactoring">
     <description>Builds, tests, and runs the project org.netbeans.modules.groovy.refactoring</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/groovy.refactoring/manifest.mf b/groovy/groovy.refactoring/manifest.mf
similarity index 100%
rename from groovy.refactoring/manifest.mf
rename to groovy/groovy.refactoring/manifest.mf
diff --git a/groovy.refactoring/nbproject/project.properties b/groovy/groovy.refactoring/nbproject/project.properties
similarity index 100%
rename from groovy.refactoring/nbproject/project.properties
rename to groovy/groovy.refactoring/nbproject/project.properties
diff --git a/groovy.refactoring/nbproject/project.xml b/groovy/groovy.refactoring/nbproject/project.xml
similarity index 100%
rename from groovy.refactoring/nbproject/project.xml
rename to groovy/groovy.refactoring/nbproject/project.xml
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/Bundle.properties b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/Bundle.properties
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/Bundle.properties
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/Bundle.properties
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/DiffElement.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/DiffElement.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/DiffElement.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/DiffElement.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/GroovyRefactoringFactory.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/GroovyRefactoringFactory.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/GroovyRefactoringFactory.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/GroovyRefactoringFactory.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/GroovyRefactoringPlugin.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/GroovyRefactoringPlugin.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/GroovyRefactoringPlugin.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/GroovyRefactoringPlugin.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/RefactoringActionsProvider.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/RefactoringActionsProvider.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/RefactoringActionsProvider.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/RefactoringActionsProvider.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/RefactoringTask.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/RefactoringTask.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/RefactoringTask.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/RefactoringTask.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/RefactoringTaskFactory.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/RefactoringTaskFactory.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/RefactoringTaskFactory.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/RefactoringTaskFactory.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/FindUsagesElement.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/FindUsagesElement.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/FindUsagesElement.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/FindUsagesElement.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/FindUsagesPainter.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/FindUsagesPainter.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/FindUsagesPainter.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/FindUsagesPainter.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/FindUsagesPlugin.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/FindUsagesPlugin.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/FindUsagesPlugin.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/FindUsagesPlugin.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/AbstractFindUsages.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/AbstractFindUsages.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/AbstractFindUsages.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/AbstractFindUsages.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/AbstractFindUsagesVisitor.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/AbstractFindUsagesVisitor.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/AbstractFindUsagesVisitor.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/AbstractFindUsagesVisitor.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindAllSubtypes.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindAllSubtypes.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindAllSubtypes.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindAllSubtypes.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindAllUsages.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindAllUsages.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindAllUsages.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindAllUsages.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindClassDeclarationVisitor.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindClassDeclarationVisitor.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindClassDeclarationVisitor.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindClassDeclarationVisitor.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindConstructorUsagesVisitor.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindConstructorUsagesVisitor.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindConstructorUsagesVisitor.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindConstructorUsagesVisitor.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindDirectSubtypesOnly.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindDirectSubtypesOnly.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindDirectSubtypesOnly.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindDirectSubtypesOnly.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindMethodUsages.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindMethodUsages.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindMethodUsages.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindMethodUsages.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindMethodUsagesVisitor.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindMethodUsagesVisitor.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindMethodUsagesVisitor.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindMethodUsagesVisitor.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindOverridingMethods.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindOverridingMethods.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindOverridingMethods.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindOverridingMethods.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindTypeUsages.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindTypeUsages.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindTypeUsages.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindTypeUsages.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindTypeUsagesVisitor.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindTypeUsagesVisitor.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindTypeUsagesVisitor.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindTypeUsagesVisitor.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindVariableUsages.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindVariableUsages.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindVariableUsages.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/impl/FindVariableUsages.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/model/ClassRefactoringElement.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/model/ClassRefactoringElement.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/model/ClassRefactoringElement.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/model/ClassRefactoringElement.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/model/MethodRefactoringElement.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/model/MethodRefactoringElement.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/model/MethodRefactoringElement.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/model/MethodRefactoringElement.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/model/MethodSignatureBuilder.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/model/MethodSignatureBuilder.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/model/MethodSignatureBuilder.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/model/MethodSignatureBuilder.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/model/RefactoringElement.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/model/RefactoringElement.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/model/RefactoringElement.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/model/RefactoringElement.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/model/VariableRefactoringElement.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/model/VariableRefactoringElement.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/model/VariableRefactoringElement.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/findusages/model/VariableRefactoringElement.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/move/MoveFileRefactoringPlugin.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/move/MoveFileRefactoringPlugin.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/move/MoveFileRefactoringPlugin.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/move/MoveFileRefactoringPlugin.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/move/MoveFileRefactoringUI.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/move/MoveFileRefactoringUI.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/move/MoveFileRefactoringUI.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/move/MoveFileRefactoringUI.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/rename/RenamePackagePlugin.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/rename/RenamePackagePlugin.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/rename/RenamePackagePlugin.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/rename/RenamePackagePlugin.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/rename/RenameRefactoringPlugin.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/rename/RenameRefactoringPlugin.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/rename/RenameRefactoringPlugin.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/rename/RenameRefactoringPlugin.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/rename/RenameRefactoringUI.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/rename/RenameRefactoringUI.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/rename/RenameRefactoringUI.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/rename/RenameRefactoringUI.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/resources/Bundle.properties b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/resources/Bundle.properties
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/resources/Bundle.properties
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/resources/Bundle.properties
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/resources/layer.xml b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/resources/layer.xml
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/resources/layer.xml
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/resources/layer.xml
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/resources/warning_16.png b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/resources/warning_16.png
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/resources/warning_16.png
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/resources/warning_16.png
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/Bundle.properties b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/Bundle.properties
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/Bundle.properties
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/Bundle.properties
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/MoveClassPanel.form b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/MoveClassPanel.form
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/MoveClassPanel.form
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/MoveClassPanel.form
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/MoveClassPanel.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/MoveClassPanel.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/MoveClassPanel.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/MoveClassPanel.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/RefactoringModule.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/RefactoringModule.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/RefactoringModule.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/RefactoringModule.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/RenamePanel.form b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/RenamePanel.form
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/RenamePanel.form
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/RenamePanel.form
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/RenamePanel.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/RenamePanel.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/RenamePanel.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/RenamePanel.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanel.form b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanel.form
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanel.form
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanel.form
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanel.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanel.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanel.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanel.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelClass.form b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelClass.form
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelClass.form
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelClass.form
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelClass.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelClass.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelClass.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelClass.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelMethod.form b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelMethod.form
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelMethod.form
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelMethod.form
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelMethod.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelMethod.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelMethod.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelMethod.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelPackage.form b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelPackage.form
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelPackage.form
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelPackage.form
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelPackage.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelPackage.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelPackage.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelPackage.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelVariable.form b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelVariable.form
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelVariable.form
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelVariable.form
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelVariable.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelVariable.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelVariable.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanelVariable.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedQueryUI.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedQueryUI.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedQueryUI.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedQueryUI.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/utils/FindMethodUtils.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/utils/FindMethodUtils.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/utils/FindMethodUtils.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/utils/FindMethodUtils.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/utils/FindPossibleMethods.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/utils/FindPossibleMethods.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/utils/FindPossibleMethods.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/utils/FindPossibleMethods.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/utils/GroovyProjectUtil.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/utils/GroovyProjectUtil.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/utils/GroovyProjectUtil.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/utils/GroovyProjectUtil.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/utils/IdentifiersUtil.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/utils/IdentifiersUtil.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/utils/IdentifiersUtil.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/utils/IdentifiersUtil.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/utils/TypeFinder.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/utils/TypeFinder.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/utils/TypeFinder.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/utils/TypeFinder.java
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/utils/TypeResolver.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/utils/TypeResolver.java
similarity index 100%
rename from groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/utils/TypeResolver.java
rename to groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/utils/TypeResolver.java
diff --git a/groovy.samples/build.xml b/groovy/groovy.samples/build.xml
similarity index 93%
rename from groovy.samples/build.xml
rename to groovy/groovy.samples/build.xml
index ebec44e83e..22769a5c66 100644
--- a/groovy.samples/build.xml
+++ b/groovy/groovy.samples/build.xml
@@ -19,9 +19,9 @@
     under the License.
 
 -->
-<project basedir="." default="netbeans" name="groovy.samples">
+<project basedir="." default="build" name="groovy/groovy.samples">
     <description>Builds, tests, and runs the project org.netbeans.modules.groovy.samples</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 
     <target name="zipGJDemo" description="Zip the application to the sample project">
         <property name="examples" location="src/org/netbeans/modules/groovy/samples"/>
diff --git a/groovy.samples/manifest.mf b/groovy/groovy.samples/manifest.mf
similarity index 100%
rename from groovy.samples/manifest.mf
rename to groovy/groovy.samples/manifest.mf
diff --git a/groovy.samples/nbproject/project.properties b/groovy/groovy.samples/nbproject/project.properties
similarity index 100%
rename from groovy.samples/nbproject/project.properties
rename to groovy/groovy.samples/nbproject/project.properties
diff --git a/groovy.samples/nbproject/project.xml b/groovy/groovy.samples/nbproject/project.xml
similarity index 100%
rename from groovy.samples/nbproject/project.xml
rename to groovy/groovy.samples/nbproject/project.xml
diff --git a/groovy.samples/sample_src/GroovyJavaDemo/build.xml b/groovy/groovy.samples/sample_src/GroovyJavaDemo/build.xml
similarity index 100%
rename from groovy.samples/sample_src/GroovyJavaDemo/build.xml
rename to groovy/groovy.samples/sample_src/GroovyJavaDemo/build.xml
diff --git a/groovy.samples/sample_src/GroovyJavaDemo/manifest.mf b/groovy/groovy.samples/sample_src/GroovyJavaDemo/manifest.mf
similarity index 100%
rename from groovy.samples/sample_src/GroovyJavaDemo/manifest.mf
rename to groovy/groovy.samples/sample_src/GroovyJavaDemo/manifest.mf
diff --git a/groovy.samples/sample_src/GroovyJavaDemo/nbproject/build-impl.xml b/groovy/groovy.samples/sample_src/GroovyJavaDemo/nbproject/build-impl.xml
similarity index 100%
rename from groovy.samples/sample_src/GroovyJavaDemo/nbproject/build-impl.xml
rename to groovy/groovy.samples/sample_src/GroovyJavaDemo/nbproject/build-impl.xml
diff --git a/groovy.samples/sample_src/GroovyJavaDemo/nbproject/genfiles.properties b/groovy/groovy.samples/sample_src/GroovyJavaDemo/nbproject/genfiles.properties
similarity index 100%
rename from groovy.samples/sample_src/GroovyJavaDemo/nbproject/genfiles.properties
rename to groovy/groovy.samples/sample_src/GroovyJavaDemo/nbproject/genfiles.properties
diff --git a/groovy.samples/sample_src/GroovyJavaDemo/nbproject/groovy-build.xml b/groovy/groovy.samples/sample_src/GroovyJavaDemo/nbproject/groovy-build.xml
similarity index 100%
rename from groovy.samples/sample_src/GroovyJavaDemo/nbproject/groovy-build.xml
rename to groovy/groovy.samples/sample_src/GroovyJavaDemo/nbproject/groovy-build.xml
diff --git a/groovy.samples/sample_src/GroovyJavaDemo/nbproject/project.properties b/groovy/groovy.samples/sample_src/GroovyJavaDemo/nbproject/project.properties
similarity index 100%
rename from groovy.samples/sample_src/GroovyJavaDemo/nbproject/project.properties
rename to groovy/groovy.samples/sample_src/GroovyJavaDemo/nbproject/project.properties
diff --git a/groovy.samples/sample_src/GroovyJavaDemo/nbproject/project.xml b/groovy/groovy.samples/sample_src/GroovyJavaDemo/nbproject/project.xml
similarity index 100%
rename from groovy.samples/sample_src/GroovyJavaDemo/nbproject/project.xml
rename to groovy/groovy.samples/sample_src/GroovyJavaDemo/nbproject/project.xml
diff --git a/groovy.samples/sample_src/GroovyJavaDemo/src/demo/DisplayDialog.form b/groovy/groovy.samples/sample_src/GroovyJavaDemo/src/demo/DisplayDialog.form
similarity index 100%
rename from groovy.samples/sample_src/GroovyJavaDemo/src/demo/DisplayDialog.form
rename to groovy/groovy.samples/sample_src/GroovyJavaDemo/src/demo/DisplayDialog.form
diff --git a/groovy.samples/sample_src/GroovyJavaDemo/src/demo/DisplayDialog.java b/groovy/groovy.samples/sample_src/GroovyJavaDemo/src/demo/DisplayDialog.java
similarity index 100%
rename from groovy.samples/sample_src/GroovyJavaDemo/src/demo/DisplayDialog.java
rename to groovy/groovy.samples/sample_src/GroovyJavaDemo/src/demo/DisplayDialog.java
diff --git a/groovy.samples/sample_src/GroovyJavaDemo/src/demo/DisplayProvider.groovy b/groovy/groovy.samples/sample_src/GroovyJavaDemo/src/demo/DisplayProvider.groovy
similarity index 100%
rename from groovy.samples/sample_src/GroovyJavaDemo/src/demo/DisplayProvider.groovy
rename to groovy/groovy.samples/sample_src/GroovyJavaDemo/src/demo/DisplayProvider.groovy
diff --git a/groovy.samples/sample_src/NBProjectGenerators/build.xml b/groovy/groovy.samples/sample_src/NBProjectGenerators/build.xml
similarity index 100%
rename from groovy.samples/sample_src/NBProjectGenerators/build.xml
rename to groovy/groovy.samples/sample_src/NBProjectGenerators/build.xml
diff --git a/groovy.samples/sample_src/NBProjectGenerators/manifest.mf b/groovy/groovy.samples/sample_src/NBProjectGenerators/manifest.mf
similarity index 100%
rename from groovy.samples/sample_src/NBProjectGenerators/manifest.mf
rename to groovy/groovy.samples/sample_src/NBProjectGenerators/manifest.mf
diff --git a/groovy.samples/sample_src/NBProjectGenerators/nbproject/build-impl.xml b/groovy/groovy.samples/sample_src/NBProjectGenerators/nbproject/build-impl.xml
similarity index 100%
rename from groovy.samples/sample_src/NBProjectGenerators/nbproject/build-impl.xml
rename to groovy/groovy.samples/sample_src/NBProjectGenerators/nbproject/build-impl.xml
diff --git a/groovy.samples/sample_src/NBProjectGenerators/nbproject/genfiles.properties b/groovy/groovy.samples/sample_src/NBProjectGenerators/nbproject/genfiles.properties
similarity index 100%
rename from groovy.samples/sample_src/NBProjectGenerators/nbproject/genfiles.properties
rename to groovy/groovy.samples/sample_src/NBProjectGenerators/nbproject/genfiles.properties
diff --git a/groovy.samples/sample_src/NBProjectGenerators/nbproject/groovy-build.xml b/groovy/groovy.samples/sample_src/NBProjectGenerators/nbproject/groovy-build.xml
similarity index 100%
rename from groovy.samples/sample_src/NBProjectGenerators/nbproject/groovy-build.xml
rename to groovy/groovy.samples/sample_src/NBProjectGenerators/nbproject/groovy-build.xml
diff --git a/groovy.samples/sample_src/NBProjectGenerators/nbproject/project.properties b/groovy/groovy.samples/sample_src/NBProjectGenerators/nbproject/project.properties
similarity index 100%
rename from groovy.samples/sample_src/NBProjectGenerators/nbproject/project.properties
rename to groovy/groovy.samples/sample_src/NBProjectGenerators/nbproject/project.properties
diff --git a/groovy.samples/sample_src/NBProjectGenerators/nbproject/project.xml b/groovy/groovy.samples/sample_src/NBProjectGenerators/nbproject/project.xml
similarity index 100%
rename from groovy.samples/sample_src/NBProjectGenerators/nbproject/project.xml
rename to groovy/groovy.samples/sample_src/NBProjectGenerators/nbproject/project.xml
diff --git a/groovy.samples/sample_src/NBProjectGenerators/src/generators/NetBeansModule.groovy b/groovy/groovy.samples/sample_src/NBProjectGenerators/src/generators/NetBeansModule.groovy
similarity index 100%
rename from groovy.samples/sample_src/NBProjectGenerators/src/generators/NetBeansModule.groovy
rename to groovy/groovy.samples/sample_src/NBProjectGenerators/src/generators/NetBeansModule.groovy
diff --git a/groovy.samples/sample_src/NBProjectGenerators/src/generators/NetBeansPlatform.groovy b/groovy/groovy.samples/sample_src/NBProjectGenerators/src/generators/NetBeansPlatform.groovy
similarity index 100%
rename from groovy.samples/sample_src/NBProjectGenerators/src/generators/NetBeansPlatform.groovy
rename to groovy/groovy.samples/sample_src/NBProjectGenerators/src/generators/NetBeansPlatform.groovy
diff --git a/groovy.samples/src/org/netbeans/modules/groovy/samples/Bundle.properties b/groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/Bundle.properties
similarity index 100%
rename from groovy.samples/src/org/netbeans/modules/groovy/samples/Bundle.properties
rename to groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/Bundle.properties
diff --git a/groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/Bundle.properties b/groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/Bundle.properties
similarity index 100%
rename from groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/Bundle.properties
rename to groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/Bundle.properties
diff --git a/groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoDescription.html b/groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoDescription.html
similarity index 100%
rename from groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoDescription.html
rename to groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoDescription.html
diff --git a/groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoPanelVisual.form b/groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoPanelVisual.form
similarity index 100%
rename from groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoPanelVisual.form
rename to groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoPanelVisual.form
diff --git a/groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoPanelVisual.java b/groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoPanelVisual.java
similarity index 100%
rename from groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoPanelVisual.java
rename to groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoPanelVisual.java
diff --git a/groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoWizardIterator.java b/groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoWizardIterator.java
similarity index 100%
rename from groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoWizardIterator.java
rename to groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoWizardIterator.java
diff --git a/groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoWizardPanel.java b/groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoWizardPanel.java
similarity index 100%
rename from groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoWizardPanel.java
rename to groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoWizardPanel.java
diff --git a/groovy.samples/src/org/netbeans/modules/groovy/samples/layer.xml b/groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/layer.xml
similarity index 100%
rename from groovy.samples/src/org/netbeans/modules/groovy/samples/layer.xml
rename to groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/layer.xml
diff --git a/groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/Bundle.properties b/groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/Bundle.properties
similarity index 100%
rename from groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/Bundle.properties
rename to groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/Bundle.properties
diff --git a/groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsDescription.html b/groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsDescription.html
similarity index 100%
rename from groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsDescription.html
rename to groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsDescription.html
diff --git a/groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsPanelVisual.form b/groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsPanelVisual.form
similarity index 100%
rename from groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsPanelVisual.form
rename to groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsPanelVisual.form
diff --git a/groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsPanelVisual.java b/groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsPanelVisual.java
similarity index 100%
rename from groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsPanelVisual.java
rename to groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsPanelVisual.java
diff --git a/groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsWizardIterator.java b/groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsWizardIterator.java
similarity index 100%
rename from groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsWizardIterator.java
rename to groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsWizardIterator.java
diff --git a/groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsWizardPanel.java b/groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsWizardPanel.java
similarity index 100%
rename from groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsWizardPanel.java
rename to groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsWizardPanel.java
diff --git a/groovy.support/build.xml b/groovy/groovy.support/build.xml
similarity index 88%
rename from groovy.support/build.xml
rename to groovy/groovy.support/build.xml
index ebc0ae55eb..272cfe03db 100644
--- a/groovy.support/build.xml
+++ b/groovy/groovy.support/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="netbeans" name="groovy.support">
+<project basedir="." default="build" name="groovy/groovy.support">
     <description>Builds, tests, and runs the project org.netbeans.modules.groovy.support</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/groovy.support/licenseinfo.xml b/groovy/groovy.support/licenseinfo.xml
similarity index 100%
rename from groovy.support/licenseinfo.xml
rename to groovy/groovy.support/licenseinfo.xml
diff --git a/groovy.support/manifest.mf b/groovy/groovy.support/manifest.mf
similarity index 100%
rename from groovy.support/manifest.mf
rename to groovy/groovy.support/manifest.mf
diff --git a/groovy.support/nbproject/project.properties b/groovy/groovy.support/nbproject/project.properties
similarity index 100%
rename from groovy.support/nbproject/project.properties
rename to groovy/groovy.support/nbproject/project.properties
diff --git a/groovy.support/nbproject/project.xml b/groovy/groovy.support/nbproject/project.xml
similarity index 100%
rename from groovy.support/nbproject/project.xml
rename to groovy/groovy.support/nbproject/project.xml
diff --git a/groovy.support/src/META-INF.debugger.BreakpointsView/org.netbeans.spi.viewmodel.NodeActionsProviderFilter b/groovy/groovy.support/src/META-INF.debugger.BreakpointsView/org.netbeans.spi.viewmodel.NodeActionsProviderFilter
similarity index 100%
rename from groovy.support/src/META-INF.debugger.BreakpointsView/org.netbeans.spi.viewmodel.NodeActionsProviderFilter
rename to groovy/groovy.support/src/META-INF.debugger.BreakpointsView/org.netbeans.spi.viewmodel.NodeActionsProviderFilter
diff --git a/groovy.support/src/META-INF.debugger/org.netbeans.api.debugger.LazyDebuggerManagerListener b/groovy/groovy.support/src/META-INF.debugger/org.netbeans.api.debugger.LazyDebuggerManagerListener
similarity index 100%
rename from groovy.support/src/META-INF.debugger/org.netbeans.api.debugger.LazyDebuggerManagerListener
rename to groovy/groovy.support/src/META-INF.debugger/org.netbeans.api.debugger.LazyDebuggerManagerListener
diff --git a/groovy.support/src/META-INF.debugger/org.netbeans.modules.groovy.support.debug.GroovyBreakpointAnnotationListener b/groovy/groovy.support/src/META-INF.debugger/org.netbeans.modules.groovy.support.debug.GroovyBreakpointAnnotationListener
similarity index 100%
rename from groovy.support/src/META-INF.debugger/org.netbeans.modules.groovy.support.debug.GroovyBreakpointAnnotationListener
rename to groovy/groovy.support/src/META-INF.debugger/org.netbeans.modules.groovy.support.debug.GroovyBreakpointAnnotationListener
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/Bundle.properties b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/Bundle.properties
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/Bundle.properties
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/Bundle.properties
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/actions/GroovyActionsRegistration.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/actions/GroovyActionsRegistration.java
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/actions/GroovyActionsRegistration.java
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/actions/GroovyActionsRegistration.java
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/actions/GroovyDebugMethodDebuggerProvider.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/actions/GroovyDebugMethodDebuggerProvider.java
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/actions/GroovyDebugMethodDebuggerProvider.java
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/actions/GroovyDebugMethodDebuggerProvider.java
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/actions/GroovyTestMethodRunnerProvider.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/actions/GroovyTestMethodRunnerProvider.java
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/actions/GroovyTestMethodRunnerProvider.java
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/actions/GroovyTestMethodRunnerProvider.java
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/actions/TestMethodUtil.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/actions/TestMethodUtil.java
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/actions/TestMethodUtil.java
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/actions/TestMethodUtil.java
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/api/GroovyExtender.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/api/GroovyExtender.java
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/api/GroovyExtender.java
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/api/GroovyExtender.java
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/api/GroovySettings.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/api/GroovySettings.java
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/api/GroovySettings.java
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/api/GroovySettings.java
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/api/GroovySources.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/api/GroovySources.java
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/api/GroovySources.java
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/api/GroovySources.java
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/debug/Context.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/debug/Context.java
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/debug/Context.java
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/debug/Context.java
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/debug/GroovyBreakpointActionsProvider.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/debug/GroovyBreakpointActionsProvider.java
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/debug/GroovyBreakpointActionsProvider.java
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/debug/GroovyBreakpointActionsProvider.java
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/debug/GroovyBreakpointAnnotationListener.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/debug/GroovyBreakpointAnnotationListener.java
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/debug/GroovyBreakpointAnnotationListener.java
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/debug/GroovyBreakpointAnnotationListener.java
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/debug/GroovyLineBreakpointFactory.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/debug/GroovyLineBreakpointFactory.java
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/debug/GroovyLineBreakpointFactory.java
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/debug/GroovyLineBreakpointFactory.java
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/debug/GroovyToggleBreakpointActionProvider.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/debug/GroovyToggleBreakpointActionProvider.java
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/debug/GroovyToggleBreakpointActionProvider.java
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/debug/GroovyToggleBreakpointActionProvider.java
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/options/Bundle.properties b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/options/Bundle.properties
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/options/Bundle.properties
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/options/Bundle.properties
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/options/SupportOptionsPanelController.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/options/SupportOptionsPanelController.java
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/options/SupportOptionsPanelController.java
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/options/SupportOptionsPanelController.java
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/options/SupportPanel.form b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/options/SupportPanel.form
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/options/SupportPanel.form
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/options/SupportPanel.form
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/options/SupportPanel.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/options/SupportPanel.java
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/options/SupportPanel.java
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/options/SupportPanel.java
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/resources/Bundle.properties b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/resources/Bundle.properties
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/resources/Bundle.properties
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/resources/Bundle.properties
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyClass.groovy b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyClass.groovy
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyClass.groovy
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyClass.groovy
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyClass.html b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyClass.html
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyClass.html
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyClass.html
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyFile16x16.png b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyFile16x16.png
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyFile16x16.png
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyFile16x16.png
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyJUnit3Test.groovy b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyJUnit3Test.groovy
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyJUnit3Test.groovy
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyJUnit3Test.groovy
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyJUnit4Test.groovy b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyJUnit4Test.groovy
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyJUnit4Test.groovy
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyJUnit4Test.groovy
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyJUnitTest.groovy b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyJUnitTest.groovy
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyJUnitTest.groovy
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyJUnitTest.groovy
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyJUnitTest.html b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyJUnitTest.html
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyJUnitTest.html
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyJUnitTest.html
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyScript.groovy b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyScript.groovy
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyScript.groovy
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyScript.groovy
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyScript.html b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyScript.html
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyScript.html
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/resources/GroovyScript.html
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/resources/layer.xml b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/resources/layer.xml
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/resources/layer.xml
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/resources/layer.xml
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/resources/runSingle.png b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/resources/runSingle.png
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/resources/runSingle.png
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/resources/runSingle.png
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/spi/GroovyExtenderImplementation.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/spi/GroovyExtenderImplementation.java
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/spi/GroovyExtenderImplementation.java
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/spi/GroovyExtenderImplementation.java
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/spi/GroovyOptionsSubpanel.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/spi/GroovyOptionsSubpanel.java
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/spi/GroovyOptionsSubpanel.java
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/spi/GroovyOptionsSubpanel.java
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/wizard/AbstractFileWizard.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/wizard/AbstractFileWizard.java
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/wizard/AbstractFileWizard.java
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/wizard/AbstractFileWizard.java
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/wizard/AbstractGroovyWizard.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/wizard/AbstractGroovyWizard.java
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/wizard/AbstractGroovyWizard.java
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/wizard/AbstractGroovyWizard.java
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/wizard/Bundle.properties b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/wizard/Bundle.properties
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/wizard/Bundle.properties
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/wizard/Bundle.properties
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/wizard/JUnit.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/wizard/JUnit.java
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/wizard/JUnit.java
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/wizard/JUnit.java
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/wizard/ProjectTypeStrategy.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/wizard/ProjectTypeStrategy.java
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/wizard/ProjectTypeStrategy.java
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/wizard/ProjectTypeStrategy.java
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/wizard/impl/AntProjectTypeStrategy.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/wizard/impl/AntProjectTypeStrategy.java
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/wizard/impl/AntProjectTypeStrategy.java
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/wizard/impl/AntProjectTypeStrategy.java
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/wizard/impl/Bundle.properties b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/wizard/impl/Bundle.properties
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/wizard/impl/Bundle.properties
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/wizard/impl/Bundle.properties
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/wizard/impl/GroovyClassWizard.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/wizard/impl/GroovyClassWizard.java
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/wizard/impl/GroovyClassWizard.java
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/wizard/impl/GroovyClassWizard.java
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/wizard/impl/GroovyJUnitTestWizard.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/wizard/impl/GroovyJUnitTestWizard.java
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/wizard/impl/GroovyJUnitTestWizard.java
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/wizard/impl/GroovyJUnitTestWizard.java
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/wizard/impl/MavenProjectTypeStrategy.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/wizard/impl/MavenProjectTypeStrategy.java
similarity index 100%
rename from groovy.support/src/org/netbeans/modules/groovy/support/wizard/impl/MavenProjectTypeStrategy.java
rename to groovy/groovy.support/src/org/netbeans/modules/groovy/support/wizard/impl/MavenProjectTypeStrategy.java
diff --git a/groovy.support/test/unit/src/org/netbeans/modules/groovy/support/actions/TestMethodUtilTest.java b/groovy/groovy.support/test/unit/src/org/netbeans/modules/groovy/support/actions/TestMethodUtilTest.java
similarity index 100%
rename from groovy.support/test/unit/src/org/netbeans/modules/groovy/support/actions/TestMethodUtilTest.java
rename to groovy/groovy.support/test/unit/src/org/netbeans/modules/groovy/support/actions/TestMethodUtilTest.java
diff --git a/libs.groovy/build.xml b/groovy/libs.groovy/build.xml
similarity index 88%
rename from libs.groovy/build.xml
rename to groovy/libs.groovy/build.xml
index b840f3e144..9a4103848b 100644
--- a/libs.groovy/build.xml
+++ b/groovy/libs.groovy/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="netbeans" name="libs.groovy">
+<project basedir="." default="build" name="groovy/libs.groovy">
     <description>Builds, tests, and runs the project org.netbeans.modules.libs.groovy</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/libs.groovy/external/binaries-list b/groovy/libs.groovy/external/binaries-list
similarity index 100%
rename from libs.groovy/external/binaries-list
rename to groovy/libs.groovy/external/binaries-list
diff --git a/libs.groovy/external/groovy-all-2.4.5-license.txt b/groovy/libs.groovy/external/groovy-all-2.4.5-license.txt
similarity index 100%
rename from libs.groovy/external/groovy-all-2.4.5-license.txt
rename to groovy/libs.groovy/external/groovy-all-2.4.5-license.txt
diff --git a/libs.groovy/external/groovy-all-2.4.5-notice.txt b/groovy/libs.groovy/external/groovy-all-2.4.5-notice.txt
similarity index 100%
rename from libs.groovy/external/groovy-all-2.4.5-notice.txt
rename to groovy/libs.groovy/external/groovy-all-2.4.5-notice.txt
diff --git a/libs.groovy/manifest.mf b/groovy/libs.groovy/manifest.mf
similarity index 100%
rename from libs.groovy/manifest.mf
rename to groovy/libs.groovy/manifest.mf
diff --git a/libs.groovy/nbproject/project.properties b/groovy/libs.groovy/nbproject/project.properties
similarity index 100%
rename from libs.groovy/nbproject/project.properties
rename to groovy/libs.groovy/nbproject/project.properties
diff --git a/libs.groovy/nbproject/project.xml b/groovy/libs.groovy/nbproject/project.xml
similarity index 100%
rename from libs.groovy/nbproject/project.xml
rename to groovy/libs.groovy/nbproject/project.xml
diff --git a/libs.groovy/src/org/netbeans/modules/libs/groovy/Bundle.properties b/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/Bundle.properties
similarity index 100%
rename from libs.groovy/src/org/netbeans/modules/libs/groovy/Bundle.properties
rename to groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/Bundle.properties
diff --git a/libs.groovy/src/org/netbeans/modules/libs/groovy/groovy-all.xml b/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/groovy-all.xml
similarity index 100%
rename from libs.groovy/src/org/netbeans/modules/libs/groovy/groovy-all.xml
rename to groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/groovy-all.xml
diff --git a/libs.groovy/src/org/netbeans/modules/libs/groovy/layer.xml b/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/layer.xml
similarity index 100%
rename from libs.groovy/src/org/netbeans/modules/libs/groovy/layer.xml
rename to groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/layer.xml
diff --git a/maven.groovy/build.xml b/groovy/maven.groovy/build.xml
similarity index 88%
rename from maven.groovy/build.xml
rename to groovy/maven.groovy/build.xml
index 7d6c830595..0074fd478f 100644
--- a/maven.groovy/build.xml
+++ b/groovy/maven.groovy/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="netbeans" name="maven.groovy">
+<project basedir="." default="build" name="groovy/maven.groovy">
     <description>Builds, tests, and runs the project org.netbeans.modules.maven.groovy</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/maven.groovy/manifest.mf b/groovy/maven.groovy/manifest.mf
similarity index 100%
rename from maven.groovy/manifest.mf
rename to groovy/maven.groovy/manifest.mf
diff --git a/maven.groovy/nbproject/project.properties b/groovy/maven.groovy/nbproject/project.properties
similarity index 100%
rename from maven.groovy/nbproject/project.properties
rename to groovy/maven.groovy/nbproject/project.properties
diff --git a/maven.groovy/nbproject/project.xml b/groovy/maven.groovy/nbproject/project.xml
similarity index 100%
rename from maven.groovy/nbproject/project.xml
rename to groovy/maven.groovy/nbproject/project.xml
diff --git a/maven.groovy/src/org/netbeans/modules/maven/groovy/Bundle.properties b/groovy/maven.groovy/src/org/netbeans/modules/maven/groovy/Bundle.properties
similarity index 100%
rename from maven.groovy/src/org/netbeans/modules/maven/groovy/Bundle.properties
rename to groovy/maven.groovy/src/org/netbeans/modules/maven/groovy/Bundle.properties
diff --git a/maven.groovy/src/org/netbeans/modules/maven/groovy/GroovyPrivs.java b/groovy/maven.groovy/src/org/netbeans/modules/maven/groovy/GroovyPrivs.java
similarity index 100%
rename from maven.groovy/src/org/netbeans/modules/maven/groovy/GroovyPrivs.java
rename to groovy/maven.groovy/src/org/netbeans/modules/maven/groovy/GroovyPrivs.java
diff --git a/maven.groovy/src/org/netbeans/modules/maven/groovy/GroovyReplaceTokenProvider.java b/groovy/maven.groovy/src/org/netbeans/modules/maven/groovy/GroovyReplaceTokenProvider.java
similarity index 100%
rename from maven.groovy/src/org/netbeans/modules/maven/groovy/GroovyReplaceTokenProvider.java
rename to groovy/maven.groovy/src/org/netbeans/modules/maven/groovy/GroovyReplaceTokenProvider.java
diff --git a/maven.groovy/src/org/netbeans/modules/maven/groovy/GroovyRootProvider.java b/groovy/maven.groovy/src/org/netbeans/modules/maven/groovy/GroovyRootProvider.java
similarity index 100%
rename from maven.groovy/src/org/netbeans/modules/maven/groovy/GroovyRootProvider.java
rename to groovy/maven.groovy/src/org/netbeans/modules/maven/groovy/GroovyRootProvider.java
diff --git a/maven.groovy/src/org/netbeans/modules/maven/groovy/GroovySourcesImpl.java b/groovy/maven.groovy/src/org/netbeans/modules/maven/groovy/GroovySourcesImpl.java
similarity index 100%
rename from maven.groovy/src/org/netbeans/modules/maven/groovy/GroovySourcesImpl.java
rename to groovy/maven.groovy/src/org/netbeans/modules/maven/groovy/GroovySourcesImpl.java
diff --git a/maven.groovy/src/org/netbeans/modules/maven/groovy/GroovySourcesNodeFactory.java b/groovy/maven.groovy/src/org/netbeans/modules/maven/groovy/GroovySourcesNodeFactory.java
similarity index 100%
rename from maven.groovy/src/org/netbeans/modules/maven/groovy/GroovySourcesNodeFactory.java
rename to groovy/maven.groovy/src/org/netbeans/modules/maven/groovy/GroovySourcesNodeFactory.java
diff --git a/maven.groovy/src/org/netbeans/modules/maven/groovy/extender/AddGroovyDependency.java b/groovy/maven.groovy/src/org/netbeans/modules/maven/groovy/extender/AddGroovyDependency.java
similarity index 100%
rename from maven.groovy/src/org/netbeans/modules/maven/groovy/extender/AddGroovyDependency.java
rename to groovy/maven.groovy/src/org/netbeans/modules/maven/groovy/extender/AddGroovyDependency.java
diff --git a/maven.groovy/src/org/netbeans/modules/maven/groovy/extender/AddGroovyEclipseCompiler.java b/groovy/maven.groovy/src/org/netbeans/modules/maven/groovy/extender/AddGroovyEclipseCompiler.java
similarity index 100%
rename from maven.groovy/src/org/netbeans/modules/maven/groovy/extender/AddGroovyEclipseCompiler.java
rename to groovy/maven.groovy/src/org/netbeans/modules/maven/groovy/extender/AddGroovyEclipseCompiler.java
diff --git a/maven.groovy/src/org/netbeans/modules/maven/groovy/extender/AddMavenCompilerPlugin.java b/groovy/maven.groovy/src/org/netbeans/modules/maven/groovy/extender/AddMavenCompilerPlugin.java
similarity index 100%
rename from maven.groovy/src/org/netbeans/modules/maven/groovy/extender/AddMavenCompilerPlugin.java
rename to groovy/maven.groovy/src/org/netbeans/modules/maven/groovy/extender/AddMavenCompilerPlugin.java
diff --git a/maven.groovy/src/org/netbeans/modules/maven/groovy/extender/MavenConstants.java b/groovy/maven.groovy/src/org/netbeans/modules/maven/groovy/extender/MavenConstants.java
similarity index 100%
rename from maven.groovy/src/org/netbeans/modules/maven/groovy/extender/MavenConstants.java
rename to groovy/maven.groovy/src/org/netbeans/modules/maven/groovy/extender/MavenConstants.java
diff --git a/maven.groovy/src/org/netbeans/modules/maven/groovy/extender/MavenGroovyExtender.java b/groovy/maven.groovy/src/org/netbeans/modules/maven/groovy/extender/MavenGroovyExtender.java
similarity index 100%
rename from maven.groovy/src/org/netbeans/modules/maven/groovy/extender/MavenGroovyExtender.java
rename to groovy/maven.groovy/src/org/netbeans/modules/maven/groovy/extender/MavenGroovyExtender.java


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists