[GitHub] mcdonnell-john closed pull request #747: [NETBEANS-1163] Apisupport cluster move

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

mcdonnell-john closed pull request #747: [NETBEANS-1163] Apisupport cluster move
URL: https://github.com/apache/incubator-netbeans/pull/747
 
 
   

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/apisupport.ant/antsrc/org/netbeans/modules/apisupport/ant/InstallModuleTask.java b/apisupport/apisupport.ant/antsrc/org/netbeans/modules/apisupport/ant/InstallModuleTask.java
similarity index 100%
rename from apisupport.ant/antsrc/org/netbeans/modules/apisupport/ant/InstallModuleTask.java
rename to apisupport/apisupport.ant/antsrc/org/netbeans/modules/apisupport/ant/InstallModuleTask.java
diff --git a/apisupport.ant/antsrc/org/netbeans/modules/apisupport/ant/antlib.xml b/apisupport/apisupport.ant/antsrc/org/netbeans/modules/apisupport/ant/antlib.xml
similarity index 100%
rename from apisupport.ant/antsrc/org/netbeans/modules/apisupport/ant/antlib.xml
rename to apisupport/apisupport.ant/antsrc/org/netbeans/modules/apisupport/ant/antlib.xml
diff --git a/apisupport.ant/arch.xml b/apisupport/apisupport.ant/arch.xml
similarity index 99%
rename from apisupport.ant/arch.xml
rename to apisupport/apisupport.ant/arch.xml
index 2356f32a46..fb2d7e3f5a 100644
--- a/apisupport.ant/arch.xml
+++ b/apisupport/apisupport.ant/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/apisupport.ant/build.xml b/apisupport/apisupport.ant/build.xml
similarity index 92%
rename from apisupport.ant/build.xml
rename to apisupport/apisupport.ant/build.xml
index 4312737307..2ca4fa79ac 100644
--- a/apisupport.ant/build.xml
+++ b/apisupport/apisupport.ant/build.xml
@@ -19,9 +19,9 @@
     under the License.
 
 -->
-<project name="apisupport.ant" default="build" basedir=".">
+<project name="apisupport/apisupport.ant" default="build" basedir=".">
 
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 
     <target name="nblib" depends="init">
         <mkdir dir="build/antclasses"/>
diff --git a/apisupport.ant/l10n.list b/apisupport/apisupport.ant/l10n.list
similarity index 100%
rename from apisupport.ant/l10n.list
rename to apisupport/apisupport.ant/l10n.list
diff --git a/apisupport.ant/licenseinfo.xml b/apisupport/apisupport.ant/licenseinfo.xml
similarity index 100%
rename from apisupport.ant/licenseinfo.xml
rename to apisupport/apisupport.ant/licenseinfo.xml
diff --git a/apisupport.ant/manifest.mf b/apisupport/apisupport.ant/manifest.mf
similarity index 100%
rename from apisupport.ant/manifest.mf
rename to apisupport/apisupport.ant/manifest.mf
diff --git a/apisupport.ant/nbproject/project.properties b/apisupport/apisupport.ant/nbproject/project.properties
similarity index 100%
rename from apisupport.ant/nbproject/project.properties
rename to apisupport/apisupport.ant/nbproject/project.properties
diff --git a/apisupport.ant/nbproject/project.xml b/apisupport/apisupport.ant/nbproject/project.xml
similarity index 100%
rename from apisupport.ant/nbproject/project.xml
rename to apisupport/apisupport.ant/nbproject/project.xml
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ApisupportAntUtils.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ApisupportAntUtils.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ApisupportAntUtils.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ApisupportAntUtils.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/Bundle.properties b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/Bundle.properties
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/Bundle.properties
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/Bundle.properties
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/Evaluator.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/Evaluator.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/Evaluator.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/Evaluator.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ModuleDependency.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ModuleDependency.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ModuleDependency.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ModuleDependency.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/NbModuleProject.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/NbModuleProject.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/NbModuleProject.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/NbModuleProject.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/NbModuleProjectGenerator.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/NbModuleProjectGenerator.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/NbModuleProjectGenerator.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/NbModuleProjectGenerator.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/NbModuleProviderImpl.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/NbModuleProviderImpl.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/NbModuleProviderImpl.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/NbModuleProviderImpl.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/NbModuleType.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/NbModuleType.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/NbModuleType.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/NbModuleType.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/NbProjectProviderImpl.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/NbProjectProviderImpl.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/NbProjectProviderImpl.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/NbProjectProviderImpl.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/NbRefactoringProviderImpl.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/NbRefactoringProviderImpl.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/NbRefactoringProviderImpl.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/NbRefactoringProviderImpl.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ProjectXMLManager.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ProjectXMLManager.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ProjectXMLManager.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ProjectXMLManager.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/SuiteProvider.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/SuiteProvider.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/SuiteProvider.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/SuiteProvider.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/java/hints/errors/SearchModuleDependency.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/java/hints/errors/SearchModuleDependency.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/java/hints/errors/SearchModuleDependency.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/java/hints/errors/SearchModuleDependency.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/AccessibilityQueryImpl.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/AccessibilityQueryImpl.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/AccessibilityQueryImpl.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/AccessibilityQueryImpl.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/AnnotationProcessingQueryImpl.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/AnnotationProcessingQueryImpl.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/AnnotationProcessingQueryImpl.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/AnnotationProcessingQueryImpl.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/AntArtifactProviderImpl.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/AntArtifactProviderImpl.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/AntArtifactProviderImpl.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/AntArtifactProviderImpl.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/BinaryForSourceImpl.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/BinaryForSourceImpl.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/BinaryForSourceImpl.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/BinaryForSourceImpl.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/Bundle.properties b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/Bundle.properties
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/Bundle.properties
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/Bundle.properties
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/ClassPathProviderImpl.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/ClassPathProviderImpl.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/ClassPathProviderImpl.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/ClassPathProviderImpl.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/FileEncodingQueryImpl.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/FileEncodingQueryImpl.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/FileEncodingQueryImpl.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/FileEncodingQueryImpl.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/GlobalJavadocForBinaryImpl.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/GlobalJavadocForBinaryImpl.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/GlobalJavadocForBinaryImpl.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/GlobalJavadocForBinaryImpl.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/GlobalSourceForBinaryImpl.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/GlobalSourceForBinaryImpl.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/GlobalSourceForBinaryImpl.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/GlobalSourceForBinaryImpl.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/JavadocForBinaryImpl.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/JavadocForBinaryImpl.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/JavadocForBinaryImpl.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/JavadocForBinaryImpl.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/ModuleProjectClassPathExtender.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/ModuleProjectClassPathExtender.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/ModuleProjectClassPathExtender.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/ModuleProjectClassPathExtender.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/OSGiSourceForBinaryImpl.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/OSGiSourceForBinaryImpl.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/OSGiSourceForBinaryImpl.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/OSGiSourceForBinaryImpl.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/ProjectWhiteListQueryImplementation.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/ProjectWhiteListQueryImplementation.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/ProjectWhiteListQueryImplementation.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/ProjectWhiteListQueryImplementation.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/SourceForBinaryImpl.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/SourceForBinaryImpl.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/SourceForBinaryImpl.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/SourceForBinaryImpl.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/SourceLevelQueryImpl.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/SourceLevelQueryImpl.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/SourceLevelQueryImpl.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/SourceLevelQueryImpl.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/SubprojectProviderImpl.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/SubprojectProviderImpl.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/SubprojectProviderImpl.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/SubprojectProviderImpl.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/TemplateAttributesProvider.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/TemplateAttributesProvider.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/TemplateAttributesProvider.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/TemplateAttributesProvider.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/UnitTestForSourceQueryImpl.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/UnitTestForSourceQueryImpl.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/UnitTestForSourceQueryImpl.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/UnitTestForSourceQueryImpl.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/UpdateTrackingFileOwnerQuery.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/UpdateTrackingFileOwnerQuery.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/UpdateTrackingFileOwnerQuery.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/UpdateTrackingFileOwnerQuery.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/build-impl-65.xsl b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/build-impl-65.xsl
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/build-impl-65.xsl
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/build-impl-65.xsl
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/build-impl.xsl b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/build-impl.xsl
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/build-impl.xsl
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/build-impl.xsl
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/build.xsl b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/build.xsl
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/build.xsl
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/build.xsl
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/bundle.png b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/bundle.png
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/bundle.png
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/bundle.png
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/config-badge.gif b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/config-badge.gif
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/config-badge.gif
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/config-badge.gif
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/defaultFolder.gif b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/defaultFolder.gif
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/defaultFolder.gif
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/defaultFolder.gif
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/defaultFolderOpen.gif b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/defaultFolderOpen.gif
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/defaultFolderOpen.gif
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/defaultFolderOpen.gif
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/emptyApplication.html b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/emptyApplication.html
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/emptyApplication.html
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/emptyApplication.html
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/emptyModule.html b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/emptyModule.html
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/emptyModule.html
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/emptyModule.html
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/emptySuite.html b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/emptySuite.html
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/emptySuite.html
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/emptySuite.html
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/layer.xml b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/layer.xml
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/layer.xml
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/layer.xml
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/libraryModule.html b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/libraryModule.html
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/libraryModule.html
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/libraryModule.html
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/license-cddl-netbeans-sun.txt b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/license-cddl-netbeans-sun.txt
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/license-cddl-netbeans-sun.txt
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/license-cddl-netbeans-sun.txt
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/module.png b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/module.png
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/module.png
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/module.png
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/nb-module-project-private.xsd b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/nb-module-project-private.xsd
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/nb-module-project-private.xsd
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/nb-module-project-private.xsd
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/nb-module-project2.xsd b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/nb-module-project2.xsd
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/nb-module-project2.xsd
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/nb-module-project2.xsd
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/nb-module-project3.xsd b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/nb-module-project3.xsd
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/nb-module-project3.xsd
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/nb-module-project3.xsd
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteBrandingModel.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteBrandingModel.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteBrandingModel.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteBrandingModel.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteBrandingSupport.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteBrandingSupport.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteBrandingSupport.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteBrandingSupport.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteProject.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteProject.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteProject.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteProject.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteProjectGenerator.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteProjectGenerator.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteProjectGenerator.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteProjectGenerator.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteProjectType.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteProjectType.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteProjectType.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteProjectType.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteSubprojectProviderImpl.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteSubprojectProviderImpl.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteSubprojectProviderImpl.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteSubprojectProviderImpl.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteType.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteType.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteType.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/SuiteType.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/build-impl-65.xsl b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/build-impl-65.xsl
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/build-impl-65.xsl
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/build-impl-65.xsl
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/build-impl.xsl b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/build-impl.xsl
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/build-impl.xsl
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/build-impl.xsl
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/build.xsl b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/build.xsl
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/build.xsl
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/build.xsl
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/module-badge.png b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/module-badge.png
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/module-badge.png
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/module-badge.png
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/nb-module-suite-project-private.xsd b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/nb-module-suite-project-private.xsd
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/nb-module-suite-project-private.xsd
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/nb-module-suite-project-private.xsd
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/nb-module-suite-project.xsd b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/nb-module-suite-project.xsd
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/nb-module-suite-project.xsd
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/nb-module-suite-project.xsd
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/platform.xsl b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/platform.xsl
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/platform.xsl
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/platform.xsl
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/suite.png b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/suite.png
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/suite.png
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/suite.png
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/wait.png b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/wait.png
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/wait.png
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/suite/resources/wait.png
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ActionFilterNode.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ActionFilterNode.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ActionFilterNode.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ActionFilterNode.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/AnnotatedNode.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/AnnotatedNode.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/AnnotatedNode.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/AnnotatedNode.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ApisupportAntUIUtils.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ApisupportAntUIUtils.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ApisupportAntUIUtils.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ApisupportAntUIUtils.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/Bundle.properties b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/Bundle.properties
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/Bundle.properties
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/Bundle.properties
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ImportantFilesNodeFactory.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ImportantFilesNodeFactory.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ImportantFilesNodeFactory.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ImportantFilesNodeFactory.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/LibrariesNode.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/LibrariesNode.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/LibrariesNode.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/LibrariesNode.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/LibrariesNodeFactory.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/LibrariesNodeFactory.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/LibrariesNodeFactory.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/LibrariesNodeFactory.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/LibrariesSourceGroup.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/LibrariesSourceGroup.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/LibrariesSourceGroup.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/LibrariesSourceGroup.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ModuleActions.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ModuleActions.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ModuleActions.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ModuleActions.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ModuleLogicalView.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ModuleLogicalView.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ModuleLogicalView.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ModuleLogicalView.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ModuleOperations.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ModuleOperations.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ModuleOperations.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ModuleOperations.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ModuleUISettings.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ModuleUISettings.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ModuleUISettings.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ModuleUISettings.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ModulesNodeFactory.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ModulesNodeFactory.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ModulesNodeFactory.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ModulesNodeFactory.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/PlatformNode.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/PlatformNode.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/PlatformNode.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/PlatformNode.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ShowJavadocAction.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ShowJavadocAction.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ShowJavadocAction.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ShowJavadocAction.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/SourcesNodeFactory.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/SourcesNodeFactory.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/SourcesNodeFactory.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/SourcesNodeFactory.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/SuiteActions.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/SuiteActions.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/SuiteActions.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/SuiteActions.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/SuiteLogicalView.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/SuiteLogicalView.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/SuiteLogicalView.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/SuiteLogicalView.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/SuiteOperations.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/SuiteOperations.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/SuiteOperations.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/SuiteOperations.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/TestDataDirsNodeFactory.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/TestDataDirsNodeFactory.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/TestDataDirsNodeFactory.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/TestDataDirsNodeFactory.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/UnitTestLibrariesNode.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/UnitTestLibrariesNode.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/UnitTestLibrariesNode.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/UnitTestLibrariesNode.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/AddFriendPanel.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/AddFriendPanel.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/AddFriendPanel.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/AddFriendPanel.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/AddFriendPanel.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/AddFriendPanel.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/AddFriendPanel.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/AddFriendPanel.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/AddModuleFilter.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/AddModuleFilter.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/AddModuleFilter.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/AddModuleFilter.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/AddModulePanel.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/AddModulePanel.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/AddModulePanel.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/AddModulePanel.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/AddModulePanel.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/AddModulePanel.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/AddModulePanel.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/AddModulePanel.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/BasicCustomizer.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/BasicCustomizer.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/BasicCustomizer.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/BasicCustomizer.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/Bundle.properties b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/Bundle.properties
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/Bundle.properties
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/Bundle.properties
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterInfo.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterInfo.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterInfo.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterInfo.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/Clusterize.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/Clusterize.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/Clusterize.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/Clusterize.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeAction.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeAction.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeAction.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeAction.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeInfo.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeInfo.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeInfo.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeInfo.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel1.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel1.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel1.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel1.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel1.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel1.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel1.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel1.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel2.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel2.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel2.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel2.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel2.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel2.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel2.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel2.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel3.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel3.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel3.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel3.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel3.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel3.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel3.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel3.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeWizardPanel1.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeWizardPanel1.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeWizardPanel1.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeWizardPanel1.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeWizardPanel2.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeWizardPanel2.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeWizardPanel2.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeWizardPanel2.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeWizardPanel3.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeWizardPanel3.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeWizardPanel3.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeWizardPanel3.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerCompiling.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerCompiling.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerCompiling.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerCompiling.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerCompiling.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerCompiling.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerCompiling.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerCompiling.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerCompilingFactory.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerCompilingFactory.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerCompilingFactory.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerCompilingFactory.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerComponentFactory.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerComponentFactory.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerComponentFactory.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerComponentFactory.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerDisplay.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerDisplay.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerDisplay.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerDisplay.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerDisplay.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerDisplay.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerDisplay.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerDisplay.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerDisplayFactory.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerDisplayFactory.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerDisplayFactory.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerDisplayFactory.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerLibraries.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerLibraries.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerLibraries.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerLibraries.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerLibraries.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerLibraries.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerLibraries.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerLibraries.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerLibrariesFactory.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerLibrariesFactory.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerLibrariesFactory.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerLibrariesFactory.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerPackaging.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerPackaging.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerPackaging.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerPackaging.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerPackaging.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerPackaging.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerPackaging.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerPackaging.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerPackagingFactory.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerPackagingFactory.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerPackagingFactory.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerPackagingFactory.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerProviderImpl.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerProviderImpl.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerProviderImpl.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerProviderImpl.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerSources.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerSources.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerSources.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerSources.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerSources.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerSources.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerSources.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerSources.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerSourcesFactory.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerSourcesFactory.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerSourcesFactory.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerSourcesFactory.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerVersioning.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerVersioning.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerVersioning.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerVersioning.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerVersioning.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerVersioning.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerVersioning.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerVersioning.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerVersioningFactory.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerVersioningFactory.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerVersioningFactory.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerVersioningFactory.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/EditClusterPanel.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/EditClusterPanel.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/EditClusterPanel.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/EditClusterPanel.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/EditClusterPanel.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/EditClusterPanel.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/EditClusterPanel.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/EditClusterPanel.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/EditDependencyPanel.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/EditDependencyPanel.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/EditDependencyPanel.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/EditDependencyPanel.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/EditDependencyPanel.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/EditDependencyPanel.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/EditDependencyPanel.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/EditDependencyPanel.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/EditTestDependencyPanel.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/EditTestDependencyPanel.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/EditTestDependencyPanel.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/EditTestDependencyPanel.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/EditTestDependencyPanel.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/EditTestDependencyPanel.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/EditTestDependencyPanel.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/EditTestDependencyPanel.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/JavaPlatformComponentFactory.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/JavaPlatformComponentFactory.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/JavaPlatformComponentFactory.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/JavaPlatformComponentFactory.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ModuleProperties.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ModuleProperties.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ModuleProperties.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ModuleProperties.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/NbModulePackageModifierImplementation.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/NbModulePackageModifierImplementation.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/NbModulePackageModifierImplementation.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/NbModulePackageModifierImplementation.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/NbPropertyPanel.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/NbPropertyPanel.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/NbPropertyPanel.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/NbPropertyPanel.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/NbPropertyPanel.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/NbPropertyPanel.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/NbPropertyPanel.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/NbPropertyPanel.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SingleModuleProperties.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SingleModuleProperties.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SingleModuleProperties.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SingleModuleProperties.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizer.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizer.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizer.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizer.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerBasicBranding.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerBasicBranding.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerBasicBranding.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerBasicBranding.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerBasicBranding.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerBasicBranding.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerBasicBranding.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerBasicBranding.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerBasicBrandingFactory.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerBasicBrandingFactory.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerBasicBrandingFactory.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerBasicBrandingFactory.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerLibraries.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerLibraries.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerLibraries.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerLibraries.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerLibraries.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerLibraries.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerLibraries.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerLibraries.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerLibrariesFactory.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerLibrariesFactory.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerLibrariesFactory.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerLibrariesFactory.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerSources.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerSources.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerSources.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerSources.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerSources.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerSources.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerSources.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerSources.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerSourcesFactory.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerSourcesFactory.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerSourcesFactory.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerSourcesFactory.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteProperties.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteProperties.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteProperties.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteProperties.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteUtils.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteUtils.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteUtils.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteUtils.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/package-info.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/package-info.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/package-info.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/package-info.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/Bundle.properties b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/Bundle.properties
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/Bundle.properties
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/Bundle.properties
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/HarnessUpgrader.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/HarnessUpgrader.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/HarnessUpgrader.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/HarnessUpgrader.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizer.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizer.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizer.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizer.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizer.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizer.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizer.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizer.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerHarness.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerHarness.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerHarness.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerHarness.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerHarness.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerHarness.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerHarness.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerHarness.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerJavadoc.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerJavadoc.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerJavadoc.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerJavadoc.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerJavadoc.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerJavadoc.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerJavadoc.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerJavadoc.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerModules.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerModules.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerModules.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerModules.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerModules.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerModules.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerModules.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerModules.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerSources.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerSources.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerSources.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerSources.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerSources.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerSources.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerSources.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerSources.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformChooserVisualPanel.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformChooserVisualPanel.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformChooserVisualPanel.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformChooserVisualPanel.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformChooserVisualPanel.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformChooserVisualPanel.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformChooserVisualPanel.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformChooserVisualPanel.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformChooserWizardPanel.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformChooserWizardPanel.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformChooserWizardPanel.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformChooserWizardPanel.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformComponentFactory.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformComponentFactory.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformComponentFactory.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformComponentFactory.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformInfoVisualPanel.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformInfoVisualPanel.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformInfoVisualPanel.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformInfoVisualPanel.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformInfoVisualPanel.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformInfoVisualPanel.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformInfoVisualPanel.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformInfoVisualPanel.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformInfoWizardPanel.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformInfoWizardPanel.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformInfoWizardPanel.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformInfoWizardPanel.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/BasicConfVisualPanel.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/BasicConfVisualPanel.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/BasicConfVisualPanel.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/BasicConfVisualPanel.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/BasicConfVisualPanel.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/BasicConfVisualPanel.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/BasicConfVisualPanel.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/BasicConfVisualPanel.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/BasicConfWizardPanel.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/BasicConfWizardPanel.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/BasicConfWizardPanel.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/BasicConfWizardPanel.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/BasicInfoVisualPanel.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/BasicInfoVisualPanel.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/BasicInfoVisualPanel.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/BasicInfoVisualPanel.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/BasicInfoVisualPanel.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/BasicInfoVisualPanel.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/BasicInfoVisualPanel.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/BasicInfoVisualPanel.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/BasicInfoWizardPanel.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/BasicInfoWizardPanel.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/BasicInfoWizardPanel.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/BasicInfoWizardPanel.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/Bundle.properties b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/Bundle.properties
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/Bundle.properties
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/Bundle.properties
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/DefaultSuiteProjectDeletePanel.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/DefaultSuiteProjectDeletePanel.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/DefaultSuiteProjectDeletePanel.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/DefaultSuiteProjectDeletePanel.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/DefaultSuiteProjectDeletePanel.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/DefaultSuiteProjectDeletePanel.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/DefaultSuiteProjectDeletePanel.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/DefaultSuiteProjectDeletePanel.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/DefaultSuiteProjectOperations.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/DefaultSuiteProjectOperations.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/DefaultSuiteProjectOperations.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/DefaultSuiteProjectOperations.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/DefaultSuiteProjectOperationsImplementation.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/DefaultSuiteProjectOperationsImplementation.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/DefaultSuiteProjectOperationsImplementation.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/DefaultSuiteProjectOperationsImplementation.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/LibraryConfWizardPanel.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/LibraryConfWizardPanel.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/LibraryConfWizardPanel.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/LibraryConfWizardPanel.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/LibraryStartVisualPanel.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/LibraryStartVisualPanel.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/LibraryStartVisualPanel.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/LibraryStartVisualPanel.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/LibraryStartVisualPanel.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/LibraryStartVisualPanel.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/LibraryStartVisualPanel.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/LibraryStartVisualPanel.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/LibraryStartWizardPanel.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/LibraryStartWizardPanel.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/LibraryStartWizardPanel.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/LibraryStartWizardPanel.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/NewModuleProjectData.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/NewModuleProjectData.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/NewModuleProjectData.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/NewModuleProjectData.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/NewNbModuleWizardIterator.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/NewNbModuleWizardIterator.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/NewNbModuleWizardIterator.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/NewNbModuleWizardIterator.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/NewTemplatePanel.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/NewTemplatePanel.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/NewTemplatePanel.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/NewTemplatePanel.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/NewTemplateVisualPanel.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/NewTemplateVisualPanel.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/NewTemplateVisualPanel.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/NewTemplateVisualPanel.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/TypeChooserPanelImpl.form b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/TypeChooserPanelImpl.form
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/TypeChooserPanelImpl.form
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/TypeChooserPanelImpl.form
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/TypeChooserPanelImpl.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/TypeChooserPanelImpl.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/TypeChooserPanelImpl.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/TypeChooserPanelImpl.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/spi/Bundle.properties b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/spi/Bundle.properties
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/spi/Bundle.properties
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/spi/Bundle.properties
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/spi/ModuleTypePanel.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/spi/ModuleTypePanel.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/spi/ModuleTypePanel.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/spi/ModuleTypePanel.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/AbstractBinaryEntry.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/AbstractBinaryEntry.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/AbstractBinaryEntry.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/AbstractBinaryEntry.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/AbstractEntry.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/AbstractEntry.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/AbstractEntry.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/AbstractEntry.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/AbstractEntryWithSources.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/AbstractEntryWithSources.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/AbstractEntryWithSources.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/AbstractEntryWithSources.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/BinaryClusterEntry.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/BinaryClusterEntry.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/BinaryClusterEntry.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/BinaryClusterEntry.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/BinaryEntry.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/BinaryEntry.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/BinaryEntry.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/BinaryEntry.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/Bundle.properties b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/Bundle.properties
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/Bundle.properties
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/Bundle.properties
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/ClusterUtils.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/ClusterUtils.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/ClusterUtils.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/ClusterUtils.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/DestDirProvider.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/DestDirProvider.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/DestDirProvider.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/DestDirProvider.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/ExternalEntry.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/ExternalEntry.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/ExternalEntry.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/ExternalEntry.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/HarnessVersion.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/HarnessVersion.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/HarnessVersion.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/HarnessVersion.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/JavadocRootsProvider.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/JavadocRootsProvider.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/JavadocRootsProvider.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/JavadocRootsProvider.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/JavadocRootsSupport.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/JavadocRootsSupport.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/JavadocRootsSupport.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/JavadocRootsSupport.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/LocalizedBundleInfo.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/LocalizedBundleInfo.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/LocalizedBundleInfo.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/LocalizedBundleInfo.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/ModuleEntry.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/ModuleEntry.java
similarity index 97%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/ModuleEntry.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/ModuleEntry.java
index 43e21fa6cd..05221dcb25 100644
--- a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/ModuleEntry.java
+++ b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/ModuleEntry.java
@@ -62,13 +62,13 @@
     
     /**
      * Get the directory to which the module is built.
-     * @return e.g. .../nbbuild/netbeans/ide
+     * @return e.g. .../../nbbuild/netbeans/ide
      */
     File getClusterDirectory();
     
     /**
      * Get the module JAR file.
-     * @return e.g. .../nbbuild/netbeans/ide/modules/org-netbeans-modules-java-project.jar
+     * @return e.g. .../../nbbuild/netbeans/ide/modules/org-netbeans-modules-java-project.jar
      */
     File getJarLocation();
     
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/ModuleList.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/ModuleList.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/ModuleList.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/ModuleList.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/NbPlatform.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/NbPlatform.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/NbPlatform.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/NbPlatform.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/NetBeansOrgEntry.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/NetBeansOrgEntry.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/NetBeansOrgEntry.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/NetBeansOrgEntry.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/NonexistentModuleEntry.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/NonexistentModuleEntry.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/NonexistentModuleEntry.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/NonexistentModuleEntry.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/PlatformLayersCacheManager.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/PlatformLayersCacheManager.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/PlatformLayersCacheManager.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/PlatformLayersCacheManager.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/SourceRootsProvider.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/SourceRootsProvider.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/SourceRootsProvider.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/SourceRootsProvider.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/SourceRootsSupport.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/SourceRootsSupport.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/SourceRootsSupport.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/SourceRootsSupport.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/TestEntry.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/TestEntry.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/TestEntry.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/TestEntry.java
diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/TestModuleDependency.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/TestModuleDependency.java
similarity index 100%
rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/TestModuleDependency.java
rename to apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/TestModuleDependency.java
diff --git a/apisupport.ant/test/unit/data/example-external-projects/README b/apisupport/apisupport.ant/test/unit/data/example-external-projects/README
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/README
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/README
diff --git a/apisupport.ant/test/unit/data/example-external-projects/html4j/build.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/build.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/html4j/build.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/build.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/html4j/manifest.mf b/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/manifest.mf
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/html4j/manifest.mf
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/manifest.mf
diff --git a/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/build-impl.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/build-impl.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/build-impl.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/build-impl.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/genfiles.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/genfiles.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/genfiles.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/genfiles.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/platform.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/platform.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/platform.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/platform.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/html4j/src/org/netbeans/test/html4j/Bundle.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/src/org/netbeans/test/html4j/Bundle.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/html4j/src/org/netbeans/test/html4j/Bundle.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/src/org/netbeans/test/html4j/Bundle.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/html4j/src/org/netbeans/test/html4j/UseJSB.java b/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/src/org/netbeans/test/html4j/UseJSB.java
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/html4j/src/org/netbeans/test/html4j/UseJSB.java
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/src/org/netbeans/test/html4j/UseJSB.java
diff --git a/apisupport.ant/test/unit/data/example-external-projects/html4j/test/unit/src/org/netbeans/test/html4j/UseJSBTest.java b/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/test/unit/src/org/netbeans/test/html4j/UseJSBTest.java
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/html4j/test/unit/src/org/netbeans/test/html4j/UseJSBTest.java
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/test/unit/src/org/netbeans/test/html4j/UseJSBTest.java
diff --git a/apisupport.ant/test/unit/data/example-external-projects/javafx/build.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/build.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/javafx/build.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/build.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/javafx/manifest.mf b/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/manifest.mf
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/javafx/manifest.mf
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/manifest.mf
diff --git a/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/build-impl.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/build-impl.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/build-impl.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/build-impl.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/genfiles.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/genfiles.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/genfiles.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/genfiles.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/platform.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/platform.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/platform.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/platform.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/javafx/src/org/netbeans/test/fx/UseFx.java b/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/src/org/netbeans/test/fx/UseFx.java
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/javafx/src/org/netbeans/test/fx/UseFx.java
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/src/org/netbeans/test/fx/UseFx.java
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/build.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/build.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/build.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/build.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/manifest.mf b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/manifest.mf
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/manifest.mf
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/manifest.mf
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/nbproject/build-impl.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/nbproject/build-impl.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/nbproject/build-impl.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/nbproject/build-impl.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/nbproject/genfiles.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/nbproject/genfiles.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/nbproject/genfiles.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/nbproject/genfiles.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/nbproject/project.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/nbproject/project.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/nbproject/project.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/nbproject/project.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/nbproject/project.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/nbproject/project.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/nbproject/project.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/nbproject/project.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/nbproject/suite.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/nbproject/suite.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/nbproject/suite.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/nbproject/suite.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/src/org/netbeans/examples/modules/action/Bundle.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/src/org/netbeans/examples/modules/action/Bundle.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/src/org/netbeans/examples/modules/action/Bundle.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/src/org/netbeans/examples/modules/action/Bundle.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/src/org/netbeans/examples/modules/action/MagicAction.java b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/src/org/netbeans/examples/modules/action/MagicAction.java
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/src/org/netbeans/examples/modules/action/MagicAction.java
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/src/org/netbeans/examples/modules/action/MagicAction.java
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/src/org/netbeans/examples/modules/action/layer.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/src/org/netbeans/examples/modules/action/layer.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/src/org/netbeans/examples/modules/action/layer.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/src/org/netbeans/examples/modules/action/layer.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/test/qa-functional/src/.exists b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/test/qa-functional/src/.exists
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/test/qa-functional/src/.exists
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/action-project/test/qa-functional/src/.exists
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite1/build.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/build.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite1/build.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/build.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite1/nbproject/build-impl.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/nbproject/build-impl.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite1/nbproject/build-impl.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/nbproject/build-impl.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite1/nbproject/genfiles.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/nbproject/genfiles.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite1/nbproject/genfiles.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/nbproject/genfiles.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite1/nbproject/platform.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/nbproject/platform.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite1/nbproject/platform.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/nbproject/platform.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite1/nbproject/project.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/nbproject/project.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite1/nbproject/project.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/nbproject/project.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite1/nbproject/project.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/nbproject/project.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite1/nbproject/project.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/nbproject/project.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/build.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/build.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/build.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/build.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/manifest.mf b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/manifest.mf
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/manifest.mf
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/manifest.mf
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/nbproject/build-impl.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/nbproject/build-impl.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/nbproject/build-impl.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/nbproject/build-impl.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/nbproject/genfiles.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/nbproject/genfiles.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/nbproject/genfiles.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/nbproject/genfiles.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/nbproject/project.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/nbproject/project.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/nbproject/project.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/nbproject/project.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/nbproject/project.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/nbproject/project.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/nbproject/project.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/nbproject/project.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/nbproject/suite.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/nbproject/suite.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/nbproject/suite.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/nbproject/suite.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/src/org/netbeans/examples/modules/lib/Bundle.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/src/org/netbeans/examples/modules/lib/Bundle.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/src/org/netbeans/examples/modules/lib/Bundle.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/src/org/netbeans/examples/modules/lib/Bundle.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/src/org/netbeans/examples/modules/lib/LibClass.java b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/src/org/netbeans/examples/modules/lib/LibClass.java
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/src/org/netbeans/examples/modules/lib/LibClass.java
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/src/org/netbeans/examples/modules/lib/LibClass.java
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/test/unit/src/org/netbeans/examples/modules/lib/LibClassTest.java b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/test/unit/src/org/netbeans/examples/modules/lib/LibClassTest.java
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/test/unit/src/org/netbeans/examples/modules/lib/LibClassTest.java
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite1/support/lib-project/test/unit/src/org/netbeans/examples/modules/lib/LibClassTest.java
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite2/build.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/build.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite2/build.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/build.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/build.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/build.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/build.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/build.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/manifest.mf b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/manifest.mf
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/manifest.mf
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/manifest.mf
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/nbproject/build-impl.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/nbproject/build-impl.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/nbproject/build-impl.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/nbproject/build-impl.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/nbproject/genfiles.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/nbproject/genfiles.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/nbproject/genfiles.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/nbproject/genfiles.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/nbproject/project.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/nbproject/project.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/nbproject/project.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/nbproject/project.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/nbproject/project.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/nbproject/project.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/nbproject/project.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/nbproject/project.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/nbproject/suite.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/nbproject/suite.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/nbproject/suite.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/nbproject/suite.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/src/org/netbeans/examples/modules/misc/Bundle.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/src/org/netbeans/examples/modules/misc/Bundle.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/src/org/netbeans/examples/modules/misc/Bundle.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/src/org/netbeans/examples/modules/misc/Bundle.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/src/org/netbeans/examples/modules/misc/Misc.java b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/src/org/netbeans/examples/modules/misc/Misc.java
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/src/org/netbeans/examples/modules/misc/Misc.java
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/src/org/netbeans/examples/modules/misc/Misc.java
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/test/unit/src/org/netbeans/examples/modules/misc/MiscTest.java b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/test/unit/src/org/netbeans/examples/modules/misc/MiscTest.java
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/test/unit/src/org/netbeans/examples/modules/misc/MiscTest.java
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/misc-project/test/unit/src/org/netbeans/examples/modules/misc/MiscTest.java
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite2/nbproject/build-impl.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/nbproject/build-impl.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite2/nbproject/build-impl.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/nbproject/build-impl.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite2/nbproject/genfiles.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/nbproject/genfiles.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite2/nbproject/genfiles.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/nbproject/genfiles.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite2/nbproject/platform.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/nbproject/platform.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite2/nbproject/platform.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/nbproject/platform.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite2/nbproject/project.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/nbproject/project.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite2/nbproject/project.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/nbproject/project.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite2/nbproject/project.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/nbproject/project.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite2/nbproject/project.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite2/nbproject/project.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/build.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/build.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/build.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/build.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/nbproject/build-impl.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/nbproject/build-impl.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/nbproject/build-impl.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/nbproject/build-impl.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/nbproject/genfiles.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/nbproject/genfiles.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/nbproject/genfiles.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/nbproject/genfiles.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/nbproject/platform.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/nbproject/platform.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/nbproject/platform.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/nbproject/platform.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/nbproject/project.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/nbproject/project.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/nbproject/project.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/nbproject/project.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/nbproject/project.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/nbproject/project.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/nbproject/project.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/nbproject/project.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/src/.placeholder b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/src/.placeholder
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/src/.placeholder
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/src/.placeholder
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/test/unit/src/.placeholder b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/test/unit/src/.placeholder
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/test/unit/src/.placeholder
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/test/unit/src/.placeholder
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite4/build.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/build.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite4/build.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/build.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite4/module1/build.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module1/build.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite4/module1/build.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module1/build.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite4/module1/manifest.mf b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module1/manifest.mf
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite4/module1/manifest.mf
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module1/manifest.mf
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite4/module1/nbproject/build-impl.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module1/nbproject/build-impl.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite4/module1/nbproject/build-impl.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module1/nbproject/build-impl.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite4/module1/nbproject/genfiles.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module1/nbproject/genfiles.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite4/module1/nbproject/genfiles.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module1/nbproject/genfiles.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite4/module1/nbproject/project.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module1/nbproject/project.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite4/module1/nbproject/project.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module1/nbproject/project.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite4/module1/nbproject/suite.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module1/nbproject/suite.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite4/module1/nbproject/suite.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module1/nbproject/suite.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite4/module1/src/module1/Bundle.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module1/src/module1/Bundle.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite4/module1/src/module1/Bundle.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module1/src/module1/Bundle.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite4/module1/src/module1/layer.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module1/src/module1/layer.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite4/module1/src/module1/layer.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module1/src/module1/layer.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite4/module1/test/unit/src/aa/ATest.java b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module1/test/unit/src/aa/ATest.java
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite4/module1/test/unit/src/aa/ATest.java
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module1/test/unit/src/aa/ATest.java
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite4/module2/build.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module2/build.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite4/module2/build.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module2/build.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite4/module2/manifest.mf b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module2/manifest.mf
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite4/module2/manifest.mf
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module2/manifest.mf
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite4/module2/nbproject/build-impl.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module2/nbproject/build-impl.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite4/module2/nbproject/build-impl.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module2/nbproject/build-impl.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite4/module2/nbproject/genfiles.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module2/nbproject/genfiles.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite4/module2/nbproject/genfiles.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module2/nbproject/genfiles.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite4/module2/nbproject/project.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module2/nbproject/project.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite4/module2/nbproject/project.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module2/nbproject/project.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite4/module2/nbproject/suite.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module2/nbproject/suite.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite4/module2/nbproject/suite.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module2/nbproject/suite.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite4/module2/src/module2/Bundle.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module2/src/module2/Bundle.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite4/module2/src/module2/Bundle.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module2/src/module2/Bundle.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite4/module2/src/module2/layer.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module2/src/module2/layer.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite4/module2/src/module2/layer.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module2/src/module2/layer.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite4/module2/test/unit/src/a/DepsTest.java b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module2/test/unit/src/a/DepsTest.java
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite4/module2/test/unit/src/a/DepsTest.java
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module2/test/unit/src/a/DepsTest.java
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite4/nbproject/build-impl.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/nbproject/build-impl.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite4/nbproject/build-impl.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/nbproject/build-impl.xml
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite4/nbproject/genfiles.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/nbproject/genfiles.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite4/nbproject/genfiles.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/nbproject/genfiles.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite4/nbproject/platform.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/nbproject/platform.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite4/nbproject/platform.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/nbproject/platform.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite4/nbproject/project.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/nbproject/project.properties
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite4/nbproject/project.properties
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/nbproject/project.properties
diff --git a/apisupport.ant/test/unit/data/example-external-projects/suite4/nbproject/project.xml b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/nbproject/project.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/example-external-projects/suite4/nbproject/project.xml
rename to apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/nbproject/project.xml
diff --git a/apisupport.ant/test/unit/data/layers/a-layer.xml b/apisupport/apisupport.ant/test/unit/data/layers/a-layer.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/layers/a-layer.xml
rename to apisupport/apisupport.ant/test/unit/data/layers/a-layer.xml
diff --git a/apisupport.ant/test/unit/data/layers/b-layer.xml b/apisupport/apisupport.ant/test/unit/data/layers/b-layer.xml
similarity index 100%
rename from apisupport.ant/test/unit/data/layers/b-layer.xml
rename to apisupport/apisupport.ant/test/unit/data/layers/b-layer.xml
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ApisupportAntUtilsTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ApisupportAntUtilsTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ApisupportAntUtilsTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ApisupportAntUtilsTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/AvoidModuleListInProjectConstructorTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/AvoidModuleListInProjectConstructorTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/AvoidModuleListInProjectConstructorTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/AvoidModuleListInProjectConstructorTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/BrokenPlatformReferenceTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/BrokenPlatformReferenceTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/BrokenPlatformReferenceTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/BrokenPlatformReferenceTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/CompilationDependencyTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/CompilationDependencyTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/CompilationDependencyTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/CompilationDependencyTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/EvaluatorTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/EvaluatorTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/EvaluatorTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/EvaluatorTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ExternalBuildDirTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ExternalBuildDirTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ExternalBuildDirTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ExternalBuildDirTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ModuleDependencyTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ModuleDependencyTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ModuleDependencyTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ModuleDependencyTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/NbModuleProjectGeneratorTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/NbModuleProjectGeneratorTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/NbModuleProjectGeneratorTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/NbModuleProjectGeneratorTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/NbModuleProjectTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/NbModuleProjectTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/NbModuleProjectTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/NbModuleProjectTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/NbModuleProviderImplTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/NbModuleProviderImplTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/NbModuleProviderImplTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/NbModuleProviderImplTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/NbModuleTestingTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/NbModuleTestingTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/NbModuleTestingTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/NbModuleTestingTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ProjectXMLManagerTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ProjectXMLManagerTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ProjectXMLManagerTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ProjectXMLManagerTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/TestBase.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/TestBase.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/TestBase.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/TestBase.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/UseFxTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/UseFxTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/UseFxTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/UseFxTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/UseHtml4JavaTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/UseHtml4JavaTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/UseHtml4JavaTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/UseHtml4JavaTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/api/LayerHandleTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/api/LayerHandleTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/api/LayerHandleTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/api/LayerHandleTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/jnlp/GenerateJNLPApplicationTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/jnlp/GenerateJNLPApplicationTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/jnlp/GenerateJNLPApplicationTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/jnlp/GenerateJNLPApplicationTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/jnlp/GenerateJNLPApplicationTest.xsl b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/jnlp/GenerateJNLPApplicationTest.xsl
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/jnlp/GenerateJNLPApplicationTest.xsl
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/jnlp/GenerateJNLPApplicationTest.xsl
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/layers/LayerUtilsTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/layers/LayerUtilsTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/layers/LayerUtilsTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/layers/LayerUtilsTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/layers/TestBundle.properties b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/layers/TestBundle.properties
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/layers/TestBundle.properties
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/layers/TestBundle.properties
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/layers/icon.png b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/layers/icon.png
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/layers/icon.png
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/layers/icon.png
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/AccessibilityQueryImplTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/AccessibilityQueryImplTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/AccessibilityQueryImplTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/AccessibilityQueryImplTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/AntArtifactProviderImplTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/AntArtifactProviderImplTest.java
similarity index 92%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/AntArtifactProviderImplTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/AntArtifactProviderImplTest.java
index aded0dee03..f0313d126e 100644
--- a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/AntArtifactProviderImplTest.java
+++ b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/AntArtifactProviderImplTest.java
@@ -61,7 +61,7 @@ public void testJARFileIsProduced() throws Exception {
         assertEquals("correct type", JavaProjectConstants.ARTIFACT_TYPE_JAR, arts[0].getType());
         assertEquals("correct ID", "module", arts[0].getID());
         assertEquals("correct location",
-            Collections.singletonList(URI.create("../nbbuild/netbeans/" + TestBase.CLUSTER_PLATFORM + "/modules/org-openide-loaders.jar")),
+            Collections.singletonList(URI.create("../../nbbuild/netbeans/" + TestBase.CLUSTER_PLATFORM + "/modules/org-openide-loaders.jar")),
             Arrays.asList(arts[0].getArtifactLocations()));
         assertEquals("correct script", nbRoot().getFileObject("openide.loaders/build.xml"), arts[0].getScriptFile());
         assertEquals("correct build target", "netbeans", arts[0].getTargetName());
@@ -70,7 +70,7 @@ public void testJARFileIsProduced() throws Exception {
         arts = AntArtifactQuery.findArtifactsByType(javaProjectProject, JavaProjectConstants.ARTIFACT_TYPE_JAR);
         assertEquals("one artifact produced", 1, arts.length);
         assertEquals("correct location",
-            Collections.singletonList(URI.create("../nbbuild/netbeans/" + TestBase.CLUSTER_JAVA + "/modules/org-netbeans-modules-java-project.jar")),
+            Collections.singletonList(URI.create("../../nbbuild/netbeans/" + TestBase.CLUSTER_JAVA + "/modules/org-netbeans-modules-java-project.jar")),
             Arrays.asList(arts[0].getArtifactLocations()));
     }
     
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/BinaryForSourceImplTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/BinaryForSourceImplTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/BinaryForSourceImplTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/BinaryForSourceImplTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/ClassPathProviderImplTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/ClassPathProviderImplTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/ClassPathProviderImplTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/ClassPathProviderImplTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/GlobalJavadocForBinaryImplTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/GlobalJavadocForBinaryImplTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/GlobalJavadocForBinaryImplTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/GlobalJavadocForBinaryImplTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/GlobalSourceForBinaryImplTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/GlobalSourceForBinaryImplTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/GlobalSourceForBinaryImplTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/GlobalSourceForBinaryImplTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/JavadocForBinaryImplTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/JavadocForBinaryImplTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/JavadocForBinaryImplTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/JavadocForBinaryImplTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/ModuleProjectClassPathExtenderTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/ModuleProjectClassPathExtenderTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/ModuleProjectClassPathExtenderTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/ModuleProjectClassPathExtenderTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/OSGiSourceForBinaryImplTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/OSGiSourceForBinaryImplTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/OSGiSourceForBinaryImplTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/OSGiSourceForBinaryImplTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SourceForBinaryImplTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SourceForBinaryImplTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SourceForBinaryImplTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SourceForBinaryImplTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SourceLevelQueryImplTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SourceLevelQueryImplTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SourceLevelQueryImplTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SourceLevelQueryImplTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SubprojectProviderImplTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SubprojectProviderImplTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SubprojectProviderImplTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SubprojectProviderImplTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/TemplateAttributesProviderTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/TemplateAttributesProviderTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/TemplateAttributesProviderTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/TemplateAttributesProviderTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/UnitTestForSourceQueryImplTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/UnitTestForSourceQueryImplTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/UnitTestForSourceQueryImplTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/UnitTestForSourceQueryImplTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/UpdateTrackingFileOwnerQueryTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/UpdateTrackingFileOwnerQueryTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/UpdateTrackingFileOwnerQueryTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/UpdateTrackingFileOwnerQueryTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/spi/BrandingSupportTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/spi/BrandingSupportTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/spi/BrandingSupportTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/spi/BrandingSupportTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/BuildNBMSTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/BuildNBMSTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/BuildNBMSTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/BuildNBMSTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/BuildZipDistributionTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/BuildZipDistributionTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/BuildZipDistributionTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/BuildZipDistributionTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/MainCallback.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/MainCallback.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/MainCallback.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/MainCallback.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/SuiteBrandingModelTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/SuiteBrandingModelTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/SuiteBrandingModelTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/SuiteBrandingModelTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/SuiteProjectGeneratorTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/SuiteProjectGeneratorTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/SuiteProjectGeneratorTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/SuiteProjectGeneratorTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/SuiteProjectTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/SuiteProjectTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/SuiteProjectTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/SuiteProjectTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/SuiteSubprojectProviderImplTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/SuiteSubprojectProviderImplTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/SuiteSubprojectProviderImplTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/SuiteSubprojectProviderImplTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/LibrariesNodeTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/LibrariesNodeTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/LibrariesNodeTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/LibrariesNodeTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/ModuleActionsTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/ModuleActionsTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/ModuleActionsTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/ModuleActionsTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/ModuleLogicalViewTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/ModuleLogicalViewTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/ModuleLogicalViewTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/ModuleLogicalViewTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/ModuleOperationsTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/ModuleOperationsTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/ModuleOperationsTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/ModuleOperationsTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/SuiteLogicalViewTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/SuiteLogicalViewTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/SuiteLogicalViewTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/SuiteLogicalViewTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/SuiteOperationsTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/SuiteOperationsTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/SuiteOperationsTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/SuiteOperationsTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/UnitTestLibrariesNodeTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/UnitTestLibrariesNodeTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/UnitTestLibrariesNodeTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/UnitTestLibrariesNodeTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/AddModuleFilterTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/AddModuleFilterTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/AddModuleFilterTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/AddModuleFilterTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/AddModulePanelTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/AddModulePanelTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/AddModulePanelTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/AddModulePanelTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterUtilsTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterUtilsTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterUtilsTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterUtilsTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerLibrariesTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerLibrariesTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerLibrariesTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/CustomizerLibrariesTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/SingleModulePropertiesTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/SingleModulePropertiesTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/SingleModulePropertiesTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/SingleModulePropertiesTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerLibrariesTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerLibrariesTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerLibrariesTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerLibrariesTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerModuleListTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerModuleListTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerModuleListTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerModuleListTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/SuitePropertiesTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/SuitePropertiesTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/SuitePropertiesTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/SuitePropertiesTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteUtilsTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteUtilsTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteUtilsTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteUtilsTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformChooserVisualPanelTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformChooserVisualPanelTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformChooserVisualPanelTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformChooserVisualPanelTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformComponentFactoryTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformComponentFactoryTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformComponentFactoryTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/platform/PlatformComponentFactoryTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/LibraryStartVisualPanelTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/LibraryStartVisualPanelTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/LibraryStartVisualPanelTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/LibraryStartVisualPanelTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/common/CreatedModifiedFilesTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/common/CreatedModifiedFilesTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/common/CreatedModifiedFilesTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/common/CreatedModifiedFilesTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/spi/ModuleTypePanelTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/spi/ModuleTypePanelTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/spi/ModuleTypePanelTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/spi/ModuleTypePanelTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/ClusterUtilsTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/ClusterUtilsTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/ClusterUtilsTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/ClusterUtilsTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/Issue167725DeadlockTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/Issue167725DeadlockTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/Issue167725DeadlockTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/Issue167725DeadlockTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/LocalizedBundleInfoTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/LocalizedBundleInfoTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/LocalizedBundleInfoTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/LocalizedBundleInfoTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/ModuleListTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/ModuleListTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/ModuleListTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/ModuleListTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/NbPlatformTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/NbPlatformTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/NbPlatformTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/NbPlatformTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/NetigsoModuleListTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/NetigsoModuleListTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/NetigsoModuleListTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/NetigsoModuleListTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/PlatformLayersCacheManagerTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/PlatformLayersCacheManagerTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/PlatformLayersCacheManagerTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/PlatformLayersCacheManagerTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/TestEntryTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/TestEntryTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/TestEntryTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/TestEntryTest.java
diff --git a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/TestModuleDependencyTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/TestModuleDependencyTest.java
similarity index 100%
rename from apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/TestModuleDependencyTest.java
rename to apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/TestModuleDependencyTest.java
diff --git a/apisupport.installer.maven/build.xml b/apisupport/apisupport.installer.maven/build.xml
similarity index 87%
rename from apisupport.installer.maven/build.xml
rename to apisupport/apisupport.installer.maven/build.xml
index ae03f6de84..b65dc4c41f 100644
--- a/apisupport.installer.maven/build.xml
+++ b/apisupport/apisupport.installer.maven/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="apisupport.installer.maven">
+<project basedir="." default="build" name="apisupport/apisupport.installer.maven">
     <description>Builds, tests, and runs the project org.netbeans.modules.apisupport.installer.maven</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/apisupport.installer.maven/manifest.mf b/apisupport/apisupport.installer.maven/manifest.mf
similarity index 100%
rename from apisupport.installer.maven/manifest.mf
rename to apisupport/apisupport.installer.maven/manifest.mf
diff --git a/apisupport.installer.maven/nbproject/project.properties b/apisupport/apisupport.installer.maven/nbproject/project.properties
similarity index 100%
rename from apisupport.installer.maven/nbproject/project.properties
rename to apisupport/apisupport.installer.maven/nbproject/project.properties
diff --git a/apisupport.installer.maven/nbproject/project.xml b/apisupport/apisupport.installer.maven/nbproject/project.xml
similarity index 100%
rename from apisupport.installer.maven/nbproject/project.xml
rename to apisupport/apisupport.installer.maven/nbproject/project.xml
diff --git a/apisupport.installer.maven/src/org/netbeans/modules/apisupport/installer/maven/Bundle.properties b/apisupport/apisupport.installer.maven/src/org/netbeans/modules/apisupport/installer/maven/Bundle.properties
similarity index 100%
rename from apisupport.installer.maven/src/org/netbeans/modules/apisupport/installer/maven/Bundle.properties
rename to apisupport/apisupport.installer.maven/src/org/netbeans/modules/apisupport/installer/maven/Bundle.properties
diff --git a/apisupport.installer.maven/src/org/netbeans/modules/apisupport/installer/maven/actions/BuildInstallersAction.java b/apisupport/apisupport.installer.maven/src/org/netbeans/modules/apisupport/installer/maven/actions/BuildInstallersAction.java
similarity index 100%
rename from apisupport.installer.maven/src/org/netbeans/modules/apisupport/installer/maven/actions/BuildInstallersAction.java
rename to apisupport/apisupport.installer.maven/src/org/netbeans/modules/apisupport/installer/maven/actions/BuildInstallersAction.java
diff --git a/apisupport.installer.maven/src/org/netbeans/modules/apisupport/installer/maven/actions/Bundle.properties b/apisupport/apisupport.installer.maven/src/org/netbeans/modules/apisupport/installer/maven/actions/Bundle.properties
similarity index 100%
rename from apisupport.installer.maven/src/org/netbeans/modules/apisupport/installer/maven/actions/Bundle.properties
rename to apisupport/apisupport.installer.maven/src/org/netbeans/modules/apisupport/installer/maven/actions/Bundle.properties
diff --git a/apisupport.installer.maven/src/org/netbeans/modules/apisupport/installer/maven/ui/ExtraPanel.java b/apisupport/apisupport.installer.maven/src/org/netbeans/modules/apisupport/installer/maven/ui/ExtraPanel.java
similarity index 100%
rename from apisupport.installer.maven/src/org/netbeans/modules/apisupport/installer/maven/ui/ExtraPanel.java
rename to apisupport/apisupport.installer.maven/src/org/netbeans/modules/apisupport/installer/maven/ui/ExtraPanel.java
diff --git a/apisupport.installer/build.xml b/apisupport/apisupport.installer/build.xml
similarity index 86%
rename from apisupport.installer/build.xml
rename to apisupport/apisupport.installer/build.xml
index 486f852f19..e9a7ac8684 100644
--- a/apisupport.installer/build.xml
+++ b/apisupport/apisupport.installer/build.xml
@@ -19,6 +19,6 @@
     under the License.
 
 -->
-<project basedir="." name="apisupport.installer" default="build">
-    <import file="../nbbuild/templates/projectized.xml"/>
+<project basedir="." name="apisupport/apisupport.installer" default="build">
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/apisupport.installer/manifest.mf b/apisupport/apisupport.installer/manifest.mf
similarity index 100%
rename from apisupport.installer/manifest.mf
rename to apisupport/apisupport.installer/manifest.mf
diff --git a/apisupport.installer/nbproject/project.properties b/apisupport/apisupport.installer/nbproject/project.properties
similarity index 100%
rename from apisupport.installer/nbproject/project.properties
rename to apisupport/apisupport.installer/nbproject/project.properties
diff --git a/apisupport.installer/nbproject/project.xml b/apisupport/apisupport.installer/nbproject/project.xml
similarity index 100%
rename from apisupport.installer/nbproject/project.xml
rename to apisupport/apisupport.installer/nbproject/project.xml
diff --git a/apisupport.installer/src/org/netbeans/modules/apisupport/installer/Bundle.properties b/apisupport/apisupport.installer/src/org/netbeans/modules/apisupport/installer/Bundle.properties
similarity index 100%
rename from apisupport.installer/src/org/netbeans/modules/apisupport/installer/Bundle.properties
rename to apisupport/apisupport.installer/src/org/netbeans/modules/apisupport/installer/Bundle.properties
diff --git a/apisupport.installer/src/org/netbeans/modules/apisupport/installer/actions/BuildInstallersAction.java b/apisupport/apisupport.installer/src/org/netbeans/modules/apisupport/installer/actions/BuildInstallersAction.java
similarity index 100%
rename from apisupport.installer/src/org/netbeans/modules/apisupport/installer/actions/BuildInstallersAction.java
rename to apisupport/apisupport.installer/src/org/netbeans/modules/apisupport/installer/actions/BuildInstallersAction.java
diff --git a/apisupport.installer/src/org/netbeans/modules/apisupport/installer/actions/Bundle.properties b/apisupport/apisupport.installer/src/org/netbeans/modules/apisupport/installer/actions/Bundle.properties
similarity index 100%
rename from apisupport.installer/src/org/netbeans/modules/apisupport/installer/actions/Bundle.properties
rename to apisupport/apisupport.installer/src/org/netbeans/modules/apisupport/installer/actions/Bundle.properties
diff --git a/apisupport.installer/src/org/netbeans/modules/apisupport/installer/resources/licenses/Apache-2.0 b/apisupport/apisupport.installer/src/org/netbeans/modules/apisupport/installer/resources/licenses/Apache-2.0
similarity index 100%
rename from apisupport.installer/src/org/netbeans/modules/apisupport/installer/resources/licenses/Apache-2.0
rename to apisupport/apisupport.installer/src/org/netbeans/modules/apisupport/installer/resources/licenses/Apache-2.0
diff --git a/apisupport.installer/src/org/netbeans/modules/apisupport/installer/resources/licenses/CDDL-1.0 b/apisupport/apisupport.installer/src/org/netbeans/modules/apisupport/installer/resources/licenses/CDDL-1.0
similarity index 100%
rename from apisupport.installer/src/org/netbeans/modules/apisupport/installer/resources/licenses/CDDL-1.0
rename to apisupport/apisupport.installer/src/org/netbeans/modules/apisupport/installer/resources/licenses/CDDL-1.0
diff --git a/apisupport.installer/src/org/netbeans/modules/apisupport/installer/resources/licenses/CDDL-GPL-2-CP b/apisupport/apisupport.installer/src/org/netbeans/modules/apisupport/installer/resources/licenses/CDDL-GPL-2-CP
similarity index 100%
rename from apisupport.installer/src/org/netbeans/modules/apisupport/installer/resources/licenses/CDDL-GPL-2-CP
rename to apisupport/apisupport.installer/src/org/netbeans/modules/apisupport/installer/resources/licenses/CDDL-GPL-2-CP
diff --git a/apisupport.installer/src/org/netbeans/modules/apisupport/installer/ui/Bundle.properties b/apisupport/apisupport.installer/src/org/netbeans/modules/apisupport/installer/ui/Bundle.properties
similarity index 100%
rename from apisupport.installer/src/org/netbeans/modules/apisupport/installer/ui/Bundle.properties
rename to apisupport/apisupport.installer/src/org/netbeans/modules/apisupport/installer/ui/Bundle.properties
diff --git a/apisupport.installer/src/org/netbeans/modules/apisupport/installer/ui/ExtraPanel.java b/apisupport/apisupport.installer/src/org/netbeans/modules/apisupport/installer/ui/ExtraPanel.java
similarity index 100%
rename from apisupport.installer/src/org/netbeans/modules/apisupport/installer/ui/ExtraPanel.java
rename to apisupport/apisupport.installer/src/org/netbeans/modules/apisupport/installer/ui/ExtraPanel.java
diff --git a/apisupport.installer/src/org/netbeans/modules/apisupport/installer/ui/InstallerPanel.form b/apisupport/apisupport.installer/src/org/netbeans/modules/apisupport/installer/ui/InstallerPanel.form
similarity index 100%
rename from apisupport.installer/src/org/netbeans/modules/apisupport/installer/ui/InstallerPanel.form
rename to apisupport/apisupport.installer/src/org/netbeans/modules/apisupport/installer/ui/InstallerPanel.form
diff --git a/apisupport.installer/src/org/netbeans/modules/apisupport/installer/ui/InstallerPanel.java b/apisupport/apisupport.installer/src/org/netbeans/modules/apisupport/installer/ui/InstallerPanel.java
similarity index 100%
rename from apisupport.installer/src/org/netbeans/modules/apisupport/installer/ui/InstallerPanel.java
rename to apisupport/apisupport.installer/src/org/netbeans/modules/apisupport/installer/ui/InstallerPanel.java
diff --git a/apisupport.installer/src/org/netbeans/modules/apisupport/installer/ui/LicenseComboBoxModel.java b/apisupport/apisupport.installer/src/org/netbeans/modules/apisupport/installer/ui/LicenseComboBoxModel.java
similarity index 100%
rename from apisupport.installer/src/org/netbeans/modules/apisupport/installer/ui/LicenseComboBoxModel.java
rename to apisupport/apisupport.installer/src/org/netbeans/modules/apisupport/installer/ui/LicenseComboBoxModel.java
diff --git a/apisupport.installer/src/org/netbeans/modules/apisupport/installer/ui/SuiteInstallerProjectProperties.java b/apisupport/apisupport.installer/src/org/netbeans/modules/apisupport/installer/ui/SuiteInstallerProjectProperties.java
similarity index 100%
rename from apisupport.installer/src/org/netbeans/modules/apisupport/installer/ui/SuiteInstallerProjectProperties.java
rename to apisupport/apisupport.installer/src/org/netbeans/modules/apisupport/installer/ui/SuiteInstallerProjectProperties.java
diff --git a/apisupport.kit/build.xml b/apisupport/apisupport.kit/build.xml
similarity index 88%
rename from apisupport.kit/build.xml
rename to apisupport/apisupport.kit/build.xml
index 1786facaf4..e3c6d68761 100644
--- a/apisupport.kit/build.xml
+++ b/apisupport/apisupport.kit/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="apisupport.kit">
+<project basedir="." default="build" name="apisupport/apisupport.kit">
     <description>Builds, tests, and runs the project org.netbeans.modules.apisupport.kit</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/apisupport.kit/manifest.mf b/apisupport/apisupport.kit/manifest.mf
similarity index 100%
rename from apisupport.kit/manifest.mf
rename to apisupport/apisupport.kit/manifest.mf
diff --git a/apisupport.kit/nbproject/project.properties b/apisupport/apisupport.kit/nbproject/project.properties
similarity index 100%
rename from apisupport.kit/nbproject/project.properties
rename to apisupport/apisupport.kit/nbproject/project.properties
diff --git a/apisupport.kit/nbproject/project.xml b/apisupport/apisupport.kit/nbproject/project.xml
similarity index 100%
rename from apisupport.kit/nbproject/project.xml
rename to apisupport/apisupport.kit/nbproject/project.xml
diff --git a/apisupport.kit/release/VERSION.txt b/apisupport/apisupport.kit/release/VERSION.txt
similarity index 100%
rename from apisupport.kit/release/VERSION.txt
rename to apisupport/apisupport.kit/release/VERSION.txt
diff --git a/apisupport.kit/src/org/netbeans/modules/apisupport/kit/Bundle.properties b/apisupport/apisupport.kit/src/org/netbeans/modules/apisupport/kit/Bundle.properties
similarity index 100%
rename from apisupport.kit/src/org/netbeans/modules/apisupport/kit/Bundle.properties
rename to apisupport/apisupport.kit/src/org/netbeans/modules/apisupport/kit/Bundle.properties
diff --git a/apisupport.project/apichanges.xml b/apisupport/apisupport.project/apichanges.xml
similarity index 99%
rename from apisupport.project/apichanges.xml
rename to apisupport/apisupport.project/apichanges.xml
index 30508d4cf0..2db77e4f73 100644
--- a/apisupport.project/apichanges.xml
+++ b/apisupport/apisupport.project/apichanges.xml
@@ -21,7 +21,7 @@
 
 -->
 <?xml-stylesheet type="text/xml" href="CHANGEME/nbbuild/javadoctools/apichanges.xsl"?>
-<!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../nbbuild/javadoctools/apichanges.dtd">
+<!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
 
 <!--
 
diff --git a/apisupport.project/arch.xml b/apisupport/apisupport.project/arch.xml
similarity index 99%
rename from apisupport.project/arch.xml
rename to apisupport/apisupport.project/arch.xml
index d2019ac44d..4dcfcfdbba 100644
--- a/apisupport.project/arch.xml
+++ b/apisupport/apisupport.project/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/apisupport.project/build.xml b/apisupport/apisupport.project/build.xml
similarity index 86%
rename from apisupport.project/build.xml
rename to apisupport/apisupport.project/build.xml
index b0e6f4c4b2..3685f059f3 100644
--- a/apisupport.project/build.xml
+++ b/apisupport/apisupport.project/build.xml
@@ -19,6 +19,6 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="apisupport.project">
-    <import file="../nbbuild/templates/projectized.xml"/>
+<project basedir="." default="build" name="apisupport/apisupport.project">
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/apisupport.project/l10n.list b/apisupport/apisupport.project/l10n.list
similarity index 100%
rename from apisupport.project/l10n.list
rename to apisupport/apisupport.project/l10n.list
diff --git a/apisupport.project/licenseinfo.xml b/apisupport/apisupport.project/licenseinfo.xml
similarity index 100%
rename from apisupport.project/licenseinfo.xml
rename to apisupport/apisupport.project/licenseinfo.xml
diff --git a/apisupport.project/manifest.mf b/apisupport/apisupport.project/manifest.mf
similarity index 100%
rename from apisupport.project/manifest.mf
rename to apisupport/apisupport.project/manifest.mf
diff --git a/apisupport.project/nbproject/project.properties b/apisupport/apisupport.project/nbproject/project.properties
similarity index 100%
rename from apisupport.project/nbproject/project.properties
rename to apisupport/apisupport.project/nbproject/project.properties
diff --git a/apisupport.project/nbproject/project.xml b/apisupport/apisupport.project/nbproject/project.xml
similarity index 100%
rename from apisupport.project/nbproject/project.xml
rename to apisupport/apisupport.project/nbproject/project.xml
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/api/BasicVisualPanel.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/api/BasicVisualPanel.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/api/BasicVisualPanel.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/api/BasicVisualPanel.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/api/BasicWizardPanel.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/api/BasicWizardPanel.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/api/BasicWizardPanel.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/api/BasicWizardPanel.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/api/BrandingUtils.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/api/BrandingUtils.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/api/BrandingUtils.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/api/BrandingUtils.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/api/Bundle.properties b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/api/Bundle.properties
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/api/Bundle.properties
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/api/Bundle.properties
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/api/EditableManifest.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/api/EditableManifest.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/api/EditableManifest.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/api/EditableManifest.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/api/LayerHandle.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/api/LayerHandle.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/api/LayerHandle.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/api/LayerHandle.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/api/ManifestManager.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/api/ManifestManager.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/api/ManifestManager.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/api/ManifestManager.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/api/NodeFactoryUtils.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/api/NodeFactoryUtils.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/api/NodeFactoryUtils.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/api/NodeFactoryUtils.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/api/UIUtil.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/api/UIUtil.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/api/UIUtil.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/api/UIUtil.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/api/Util.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/api/Util.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/api/Util.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/api/Util.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/api/libraries.gif b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/api/libraries.gif
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/api/libraries.gif
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/api/libraries.gif
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/hyperlink/ApisupportHyperlinkProvider.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/hyperlink/ApisupportHyperlinkProvider.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/hyperlink/ApisupportHyperlinkProvider.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/hyperlink/ApisupportHyperlinkProvider.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/hyperlink/ManifestHyperlinkProvider.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/hyperlink/ManifestHyperlinkProvider.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/hyperlink/ManifestHyperlinkProvider.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/hyperlink/ManifestHyperlinkProvider.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/BadgingSupport.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/BadgingSupport.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/layers/BadgingSupport.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/BadgingSupport.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/Bundle.properties b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/Bundle.properties
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/layers/Bundle.properties
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/Bundle.properties
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/HiddenDataObject.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/HiddenDataObject.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/layers/HiddenDataObject.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/HiddenDataObject.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/LayerDataObject.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/LayerDataObject.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/layers/LayerDataObject.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/LayerDataObject.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/LayerFileSystem.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/LayerFileSystem.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/layers/LayerFileSystem.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/LayerFileSystem.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/LayerFilterNode.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/LayerFilterNode.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/layers/LayerFilterNode.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/LayerFilterNode.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/LayerNode.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/LayerNode.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/layers/LayerNode.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/LayerNode.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/LayerUtils.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/LayerUtils.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/layers/LayerUtils.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/LayerUtils.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/OpenLayerFilesAction.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/OpenLayerFilesAction.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/layers/OpenLayerFilesAction.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/OpenLayerFilesAction.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/PathCompletions.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/PathCompletions.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/layers/PathCompletions.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/PathCompletions.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/PickIconAction.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/PickIconAction.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/layers/PickIconAction.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/PickIconAction.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/PickNameAction.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/PickNameAction.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/layers/PickNameAction.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/PickNameAction.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/SynchronousStatus.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/SynchronousStatus.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/layers/SynchronousStatus.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/SynchronousStatus.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/WritableXMLFileSystem.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/WritableXMLFileSystem.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/layers/WritableXMLFileSystem.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/layers/WritableXMLFileSystem.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/BrandingModel.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/BrandingModel.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/spi/BrandingModel.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/BrandingModel.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/BrandingSupport.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/BrandingSupport.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/spi/BrandingSupport.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/BrandingSupport.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/ExecProject.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/ExecProject.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/spi/ExecProject.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/ExecProject.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/LayerUtil.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/LayerUtil.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/spi/LayerUtil.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/LayerUtil.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/NbModuleProvider.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/NbModuleProvider.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/spi/NbModuleProvider.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/NbModuleProvider.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/NbProjectProvider.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/NbProjectProvider.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/spi/NbProjectProvider.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/NbProjectProvider.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/NbRefactoringContext.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/NbRefactoringContext.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/spi/NbRefactoringContext.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/NbRefactoringContext.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/NbRefactoringProvider.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/NbRefactoringProvider.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/spi/NbRefactoringProvider.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/NbRefactoringProvider.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/PlatformJarProvider.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/PlatformJarProvider.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/spi/PlatformJarProvider.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/PlatformJarProvider.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/layerObject.gif b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/layerObject.gif
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/spi/layerObject.gif
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/layerObject.gif
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/AbstractBrandingPanel.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/AbstractBrandingPanel.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/AbstractBrandingPanel.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/AbstractBrandingPanel.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/BasicBrandingPanel.form b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/BasicBrandingPanel.form
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/BasicBrandingPanel.form
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/BasicBrandingPanel.form
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/BasicBrandingPanel.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/BasicBrandingPanel.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/BasicBrandingPanel.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/BasicBrandingPanel.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/BrandingEditorPanel.form b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/BrandingEditorPanel.form
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/BrandingEditorPanel.form
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/BrandingEditorPanel.form
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/BrandingEditorPanel.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/BrandingEditorPanel.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/BrandingEditorPanel.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/BrandingEditorPanel.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/Bundle.properties b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/Bundle.properties
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/Bundle.properties
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/Bundle.properties
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/DragManager.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/DragManager.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/DragManager.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/DragManager.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/InternationalizationResourceBundleBrandingPanel.form b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/InternationalizationResourceBundleBrandingPanel.form
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/InternationalizationResourceBundleBrandingPanel.form
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/InternationalizationResourceBundleBrandingPanel.form
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/InternationalizationResourceBundleBrandingPanel.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/InternationalizationResourceBundleBrandingPanel.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/InternationalizationResourceBundleBrandingPanel.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/InternationalizationResourceBundleBrandingPanel.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/ResourceBundleBrandingPanel.form b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/ResourceBundleBrandingPanel.form
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/ResourceBundleBrandingPanel.form
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/ResourceBundleBrandingPanel.form
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/ResourceBundleBrandingPanel.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/ResourceBundleBrandingPanel.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/ResourceBundleBrandingPanel.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/ResourceBundleBrandingPanel.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/ResourceBundleKeyPanel.form b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/ResourceBundleKeyPanel.form
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/ResourceBundleKeyPanel.form
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/ResourceBundleKeyPanel.form
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/ResourceBundleKeyPanel.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/ResourceBundleKeyPanel.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/ResourceBundleKeyPanel.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/ResourceBundleKeyPanel.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/SplashBrandingPanel.form b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/SplashBrandingPanel.form
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/SplashBrandingPanel.form
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/SplashBrandingPanel.form
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/SplashBrandingPanel.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/SplashBrandingPanel.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/SplashBrandingPanel.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/SplashBrandingPanel.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/SplashComponentPreview.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/SplashComponentPreview.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/SplashComponentPreview.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/SplashComponentPreview.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/SplashUISupport.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/SplashUISupport.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/SplashUISupport.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/SplashUISupport.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/WindowSystemBrandingPanel.form b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/WindowSystemBrandingPanel.form
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/WindowSystemBrandingPanel.form
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/WindowSystemBrandingPanel.form
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/WindowSystemBrandingPanel.java b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/WindowSystemBrandingPanel.java
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/WindowSystemBrandingPanel.java
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/WindowSystemBrandingPanel.java
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/code-templates.xml b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/code-templates.xml
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/code-templates.xml
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/code-templates.xml
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/error.gif b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/error.gif
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/error.gif
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/error.gif
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/hidden-resolver.xml b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/hidden-resolver.xml
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/hidden-resolver.xml
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/hidden-resolver.xml
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/jar.gif b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/jar.gif
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/jar.gif
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/jar.gif
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/layer.xml b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/layer.xml
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/layer.xml
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/layer.xml
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/layer_template.xml b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/layer_template.xml
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/layer_template.xml
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/layer_template.xml
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/libraries-badge.png b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/libraries-badge.png
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/libraries-badge.png
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/libraries-badge.png
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/platform.gif b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/platform.gif
similarity index 100%
rename from apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/platform.gif
rename to apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/platform.gif
diff --git a/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/DialogDisplayerImpl.java b/apisupport/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/DialogDisplayerImpl.java
similarity index 100%
rename from apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/DialogDisplayerImpl.java
rename to apisupport/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/DialogDisplayerImpl.java
diff --git a/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/ErrorManagerImpl.java b/apisupport/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/ErrorManagerImpl.java
similarity index 100%
rename from apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/ErrorManagerImpl.java
rename to apisupport/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/ErrorManagerImpl.java
diff --git a/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/FsDtdEntityCatalog.java b/apisupport/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/FsDtdEntityCatalog.java
similarity index 100%
rename from apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/FsDtdEntityCatalog.java
rename to apisupport/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/FsDtdEntityCatalog.java
diff --git a/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/InputOutputProviderImpl.java b/apisupport/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/InputOutputProviderImpl.java
similarity index 100%
rename from apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/InputOutputProviderImpl.java
rename to apisupport/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/InputOutputProviderImpl.java
diff --git a/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/InstalledFileLocatorImpl.java b/apisupport/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/InstalledFileLocatorImpl.java
similarity index 100%
rename from apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/InstalledFileLocatorImpl.java
rename to apisupport/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/InstalledFileLocatorImpl.java
diff --git a/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/NetigsoManifestManagerTest.java b/apisupport/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/NetigsoManifestManagerTest.java
similarity index 100%
rename from apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/NetigsoManifestManagerTest.java
rename to apisupport/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/NetigsoManifestManagerTest.java
diff --git a/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/TestAntLogger.java b/apisupport/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/TestAntLogger.java
similarity index 100%
rename from apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/TestAntLogger.java
rename to apisupport/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/TestAntLogger.java
diff --git a/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/TestUtil.java b/apisupport/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/TestUtil.java
similarity index 100%
rename from apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/TestUtil.java
rename to apisupport/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/TestUtil.java
diff --git a/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/api/EditableManifestTest.java b/apisupport/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/api/EditableManifestTest.java
similarity index 100%
rename from apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/api/EditableManifestTest.java
rename to apisupport/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/api/EditableManifestTest.java
diff --git a/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/api/ManifestManagerTest.java b/apisupport/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/api/ManifestManagerTest.java
similarity index 100%
rename from apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/api/ManifestManagerTest.java
rename to apisupport/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/api/ManifestManagerTest.java
diff --git a/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/api/UtilTest.java b/apisupport/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/api/UtilTest.java
similarity index 100%
rename from apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/api/UtilTest.java
rename to apisupport/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/api/UtilTest.java
diff --git a/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/layers/LayerTestBase.java b/apisupport/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/layers/LayerTestBase.java
similarity index 100%
rename from apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/layers/LayerTestBase.java
rename to apisupport/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/layers/LayerTestBase.java
diff --git a/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/layers/WritableXMLFileSystemTest.java b/apisupport/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/layers/WritableXMLFileSystemTest.java
similarity index 100%
rename from apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/layers/WritableXMLFileSystemTest.java
rename to apisupport/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/layers/WritableXMLFileSystemTest.java
diff --git a/apisupport.refactoring/build.xml b/apisupport/apisupport.refactoring/build.xml
similarity index 87%
rename from apisupport.refactoring/build.xml
rename to apisupport/apisupport.refactoring/build.xml
index aa395d7cea..4023012a9e 100644
--- a/apisupport.refactoring/build.xml
+++ b/apisupport/apisupport.refactoring/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="apisupport.refactoring">
+<project basedir="." default="build" name="apisupport/apisupport.refactoring">
     <description>Builds, tests, and runs the project org.netbeans.modules.apisupport.refactoring</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/apisupport.refactoring/manifest.mf b/apisupport/apisupport.refactoring/manifest.mf
similarity index 100%
rename from apisupport.refactoring/manifest.mf
rename to apisupport/apisupport.refactoring/manifest.mf
diff --git a/apisupport.refactoring/nbproject/project.properties b/apisupport/apisupport.refactoring/nbproject/project.properties
similarity index 100%
rename from apisupport.refactoring/nbproject/project.properties
rename to apisupport/apisupport.refactoring/nbproject/project.properties
diff --git a/apisupport.refactoring/nbproject/project.xml b/apisupport/apisupport.refactoring/nbproject/project.xml
similarity index 100%
rename from apisupport.refactoring/nbproject/project.xml
rename to apisupport/apisupport.refactoring/nbproject/project.xml
diff --git a/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/ActionRegistrationHinter.java b/apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/ActionRegistrationHinter.java
similarity index 100%
rename from apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/ActionRegistrationHinter.java
rename to apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/ActionRegistrationHinter.java
diff --git a/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/DataObjectRegistrationHinter.java b/apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/DataObjectRegistrationHinter.java
similarity index 100%
rename from apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/DataObjectRegistrationHinter.java
rename to apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/DataObjectRegistrationHinter.java
diff --git a/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/HelpCtxHint.java b/apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/HelpCtxHint.java
similarity index 100%
rename from apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/HelpCtxHint.java
rename to apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/HelpCtxHint.java
diff --git a/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/HelpSetHinter.java b/apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/HelpSetHinter.java
similarity index 100%
rename from apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/HelpSetHinter.java
rename to apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/HelpSetHinter.java
diff --git a/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/Hinter.java b/apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/Hinter.java
similarity index 100%
rename from apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/Hinter.java
rename to apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/Hinter.java
diff --git a/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/LayerHints.java b/apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/LayerHints.java
similarity index 100%
rename from apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/LayerHints.java
rename to apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/LayerHints.java
diff --git a/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/NavigatorHinter.java b/apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/NavigatorHinter.java
similarity index 100%
rename from apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/NavigatorHinter.java
rename to apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/NavigatorHinter.java
diff --git a/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/SystemFileSystemAttrHinter.java b/apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/SystemFileSystemAttrHinter.java
similarity index 100%
rename from apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/SystemFileSystemAttrHinter.java
rename to apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/SystemFileSystemAttrHinter.java
diff --git a/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/TemplateHinter.java b/apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/TemplateHinter.java
similarity index 100%
rename from apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/TemplateHinter.java
rename to apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/TemplateHinter.java
diff --git a/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/UseNbBundleMessages.java b/apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/UseNbBundleMessages.java
similarity index 100%
rename from apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/UseNbBundleMessages.java
rename to apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/UseNbBundleMessages.java
diff --git a/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/projectbridge/ProjectConfiguration.java b/apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/projectbridge/ProjectConfiguration.java
similarity index 98%
rename from apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/projectbridge/ProjectConfiguration.java
rename to apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/projectbridge/ProjectConfiguration.java
index 3607427499..9976dab21e 100644
--- a/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/projectbridge/ProjectConfiguration.java
+++ b/apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/projectbridge/ProjectConfiguration.java
@@ -65,10 +65,10 @@
         public Lookup createAdditionalLookup(Lookup baseContext) {
             Project prj = baseContext.lookup(Project.class);
 
-            FileObject nbbuildMisc = prj.getProjectDirectory().getFileObject("../nbbuild/misc");
+            FileObject nbbuildMisc = prj.getProjectDirectory().getFileObject("../../nbbuild/misc");
 
             if (nbbuildMisc == null) {
-                nbbuildMisc = prj.getProjectDirectory().getFileObject("../../nbbuild/misc");
+                nbbuildMisc = prj.getProjectDirectory().getFileObject("../../../nbbuild/misc");
             }
 
             if (nbbuildMisc != null) {
@@ -149,10 +149,10 @@ public JComponent createComponent(Category category, Lookup context) {
 
             final PerProjectHintsPanel panel = PerProjectHintsPanel.create(customizersFolder);
 
-            FileObject nbbuildMisc = prj.getProjectDirectory().getFileObject("../nbbuild/misc");
+            FileObject nbbuildMisc = prj.getProjectDirectory().getFileObject("../../nbbuild/misc");
 
             if (nbbuildMisc == null) {
-                nbbuildMisc = prj.getProjectDirectory().getFileObject("../../nbbuild/misc");
+                nbbuildMisc = prj.getProjectDirectory().getFileObject("../../../nbbuild/misc");
             }
 
             if (nbbuildMisc != null) {
diff --git a/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/projectbridge/SuiteConfiguration.java b/apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/projectbridge/SuiteConfiguration.java
similarity index 100%
rename from apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/projectbridge/SuiteConfiguration.java
rename to apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/projectbridge/SuiteConfiguration.java
diff --git a/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/AbstractRefactoringElement.java b/apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/AbstractRefactoringElement.java
similarity index 100%
rename from apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/AbstractRefactoringElement.java
rename to apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/AbstractRefactoringElement.java
diff --git a/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/AbstractRefactoringPlugin.java b/apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/AbstractRefactoringPlugin.java
similarity index 100%
rename from apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/AbstractRefactoringPlugin.java
rename to apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/AbstractRefactoringPlugin.java
diff --git a/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/Bundle.properties b/apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/Bundle.properties
similarity index 100%
rename from apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/Bundle.properties
rename to apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/Bundle.properties
diff --git a/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/NbMoveRefactoringPlugin.java b/apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/NbMoveRefactoringPlugin.java
similarity index 100%
rename from apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/NbMoveRefactoringPlugin.java
rename to apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/NbMoveRefactoringPlugin.java
diff --git a/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/NbRefactoringFactory.java b/apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/NbRefactoringFactory.java
similarity index 100%
rename from apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/NbRefactoringFactory.java
rename to apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/NbRefactoringFactory.java
diff --git a/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/NbRenameRefactoringPlugin.java b/apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/NbRenameRefactoringPlugin.java
similarity index 100%
rename from apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/NbRenameRefactoringPlugin.java
rename to apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/NbRenameRefactoringPlugin.java
diff --git a/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/NbSafeDeleteRefactoringPlugin.java b/apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/NbSafeDeleteRefactoringPlugin.java
similarity index 100%
rename from apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/NbSafeDeleteRefactoringPlugin.java
rename to apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/NbSafeDeleteRefactoringPlugin.java
diff --git a/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/NbWhereUsedRefactoringPlugin.java b/apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/NbWhereUsedRefactoringPlugin.java
similarity index 100%
rename from apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/NbWhereUsedRefactoringPlugin.java
rename to apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/NbWhereUsedRefactoringPlugin.java
diff --git a/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/RetoucheUtils.java b/apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/RetoucheUtils.java
similarity index 100%
rename from apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/RetoucheUtils.java
rename to apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/RetoucheUtils.java
diff --git a/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/Utility.java b/apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/Utility.java
similarity index 100%
rename from apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/Utility.java
rename to apisupport/apisupport.refactoring/src/org/netbeans/modules/apisupport/refactoring/Utility.java
diff --git a/apisupport.refactoring/test/qa-functional/data/goldenfiles/org/netbeans/modules/apisupport/refactoring/RenameTest/RenamedAction.java.pass b/apisupport/apisupport.refactoring/test/qa-functional/data/goldenfiles/org/netbeans/modules/apisupport/refactoring/RenameTest/RenamedAction.java.pass
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/goldenfiles/org/netbeans/modules/apisupport/refactoring/RenameTest/RenamedAction.java.pass
rename to apisupport/apisupport.refactoring/test/qa-functional/data/goldenfiles/org/netbeans/modules/apisupport/refactoring/RenameTest/RenamedAction.java.pass
diff --git a/apisupport.refactoring/test/qa-functional/data/goldenfiles/org/netbeans/modules/apisupport/refactoring/RenameTest/RenamedLoader.java.pass b/apisupport/apisupport.refactoring/test/qa-functional/data/goldenfiles/org/netbeans/modules/apisupport/refactoring/RenameTest/RenamedLoader.java.pass
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/goldenfiles/org/netbeans/modules/apisupport/refactoring/RenameTest/RenamedLoader.java.pass
rename to apisupport/apisupport.refactoring/test/qa-functional/data/goldenfiles/org/netbeans/modules/apisupport/refactoring/RenameTest/RenamedLoader.java.pass
diff --git a/apisupport.refactoring/test/qa-functional/data/goldenfiles/org/netbeans/modules/apisupport/refactoring/RenameTest/layer.xml.pass b/apisupport/apisupport.refactoring/test/qa-functional/data/goldenfiles/org/netbeans/modules/apisupport/refactoring/RenameTest/layer.xml.pass
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/goldenfiles/org/netbeans/modules/apisupport/refactoring/RenameTest/layer.xml.pass
rename to apisupport/apisupport.refactoring/test/qa-functional/data/goldenfiles/org/netbeans/modules/apisupport/refactoring/RenameTest/layer.xml.pass
diff --git a/apisupport.refactoring/test/qa-functional/data/goldenfiles/org/netbeans/modules/apisupport/refactoring/RenameTest/manifest.mf.pass b/apisupport/apisupport.refactoring/test/qa-functional/data/goldenfiles/org/netbeans/modules/apisupport/refactoring/RenameTest/manifest.mf.pass
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/goldenfiles/org/netbeans/modules/apisupport/refactoring/RenameTest/manifest.mf.pass
rename to apisupport/apisupport.refactoring/test/qa-functional/data/goldenfiles/org/netbeans/modules/apisupport/refactoring/RenameTest/manifest.mf.pass
diff --git a/apisupport.refactoring/test/qa-functional/data/goldenfiles/org/netbeans/modules/apisupport/refactoring/RenameTest/whereUsed.ref b/apisupport/apisupport.refactoring/test/qa-functional/data/goldenfiles/org/netbeans/modules/apisupport/refactoring/RenameTest/whereUsed.ref
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/goldenfiles/org/netbeans/modules/apisupport/refactoring/RenameTest/whereUsed.ref
rename to apisupport/apisupport.refactoring/test/qa-functional/data/goldenfiles/org/netbeans/modules/apisupport/refactoring/RenameTest/whereUsed.ref
diff --git a/apisupport.refactoring/test/qa-functional/data/testRename/build.xml b/apisupport/apisupport.refactoring/test/qa-functional/data/testRename/build.xml
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/testRename/build.xml
rename to apisupport/apisupport.refactoring/test/qa-functional/data/testRename/build.xml
diff --git a/apisupport.refactoring/test/qa-functional/data/testRename/manifest.mf b/apisupport/apisupport.refactoring/test/qa-functional/data/testRename/manifest.mf
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/testRename/manifest.mf
rename to apisupport/apisupport.refactoring/test/qa-functional/data/testRename/manifest.mf
diff --git a/apisupport.refactoring/test/qa-functional/data/testRename/nbproject/build-impl.xml b/apisupport/apisupport.refactoring/test/qa-functional/data/testRename/nbproject/build-impl.xml
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/testRename/nbproject/build-impl.xml
rename to apisupport/apisupport.refactoring/test/qa-functional/data/testRename/nbproject/build-impl.xml
diff --git a/apisupport.refactoring/test/qa-functional/data/testRename/nbproject/genfiles.properties b/apisupport/apisupport.refactoring/test/qa-functional/data/testRename/nbproject/genfiles.properties
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/testRename/nbproject/genfiles.properties
rename to apisupport/apisupport.refactoring/test/qa-functional/data/testRename/nbproject/genfiles.properties
diff --git a/apisupport.refactoring/test/qa-functional/data/testRename/nbproject/platform.properties b/apisupport/apisupport.refactoring/test/qa-functional/data/testRename/nbproject/platform.properties
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/testRename/nbproject/platform.properties
rename to apisupport/apisupport.refactoring/test/qa-functional/data/testRename/nbproject/platform.properties
diff --git a/apisupport.refactoring/test/qa-functional/data/testRename/nbproject/project.xml b/apisupport/apisupport.refactoring/test/qa-functional/data/testRename/nbproject/project.xml
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/testRename/nbproject/project.xml
rename to apisupport/apisupport.refactoring/test/qa-functional/data/testRename/nbproject/project.xml
diff --git a/apisupport.refactoring/test/qa-functional/data/testRename/src/META-INF/services/org.openide.loaders.UniFileLoader b/apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/META-INF/services/org.openide.loaders.UniFileLoader
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/testRename/src/META-INF/services/org.openide.loaders.UniFileLoader
rename to apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/META-INF/services/org.openide.loaders.UniFileLoader
diff --git a/apisupport.refactoring/test/qa-functional/data/testRename/src/META-INF/services/org.openide.util.actions.CookieAction b/apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/META-INF/services/org.openide.util.actions.CookieAction
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/testRename/src/META-INF/services/org.openide.util.actions.CookieAction
rename to apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/META-INF/services/org.openide.util.actions.CookieAction
diff --git a/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/Bundle.properties b/apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/Bundle.properties
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/Bundle.properties
rename to apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/Bundle.properties
diff --git a/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyAction.java b/apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyAction.java
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyAction.java
rename to apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyAction.java
diff --git a/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyDataLoader.java b/apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyDataLoader.java
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyDataLoader.java
rename to apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyDataLoader.java
diff --git a/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyDataLoaderBeanInfo.java b/apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyDataLoaderBeanInfo.java
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyDataLoaderBeanInfo.java
rename to apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyDataLoaderBeanInfo.java
diff --git a/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyDataNode.java b/apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyDataNode.java
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyDataNode.java
rename to apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyDataNode.java
diff --git a/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyDataObject.java b/apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyDataObject.java
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyDataObject.java
rename to apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyDataObject.java
diff --git a/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyResolver.xml b/apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyResolver.xml
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyResolver.xml
rename to apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyResolver.xml
diff --git a/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyTemplate.my b/apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyTemplate.my
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyTemplate.my
rename to apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/MyTemplate.my
diff --git a/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedAction.java b/apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedAction.java
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedAction.java
rename to apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedAction.java
diff --git a/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedDataLoader.java b/apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedDataLoader.java
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedDataLoader.java
rename to apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedDataLoader.java
diff --git a/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedDataLoaderBeanInfo.java b/apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedDataLoaderBeanInfo.java
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedDataLoaderBeanInfo.java
rename to apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedDataLoaderBeanInfo.java
diff --git a/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedDataNode.java b/apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedDataNode.java
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedDataNode.java
rename to apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedDataNode.java
diff --git a/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedDataObject.java b/apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedDataObject.java
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedDataObject.java
rename to apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedDataObject.java
diff --git a/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedResolver.xml b/apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedResolver.xml
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedResolver.xml
rename to apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedResolver.xml
diff --git a/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedTemplate.whu b/apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedTemplate.whu
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedTemplate.whu
rename to apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/WhereUsedTemplate.whu
diff --git a/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/layer.xml b/apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/layer.xml
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/layer.xml
rename to apisupport/apisupport.refactoring/test/qa-functional/data/testRename/src/testRename/layer.xml
diff --git a/apisupport.refactoring/test/qa-functional/src/org/netbeans/modules/apisupport/refactoring/RenameTest.java b/apisupport/apisupport.refactoring/test/qa-functional/src/org/netbeans/modules/apisupport/refactoring/RenameTest.java
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/src/org/netbeans/modules/apisupport/refactoring/RenameTest.java
rename to apisupport/apisupport.refactoring/test/qa-functional/src/org/netbeans/modules/apisupport/refactoring/RenameTest.java
diff --git a/apisupport.refactoring/test/qa-functional/src/org/netbeans/modules/apisupport/refactoring/TestUtility.java b/apisupport/apisupport.refactoring/test/qa-functional/src/org/netbeans/modules/apisupport/refactoring/TestUtility.java
similarity index 100%
rename from apisupport.refactoring/test/qa-functional/src/org/netbeans/modules/apisupport/refactoring/TestUtility.java
rename to apisupport/apisupport.refactoring/test/qa-functional/src/org/netbeans/modules/apisupport/refactoring/TestUtility.java
diff --git a/apisupport.refactoring/test/unit/src/org/netbeans/modules/apisupport/hints/HelpCtxHintTest.java b/apisupport/apisupport.refactoring/test/unit/src/org/netbeans/modules/apisupport/hints/HelpCtxHintTest.java
similarity index 100%
rename from apisupport.refactoring/test/unit/src/org/netbeans/modules/apisupport/hints/HelpCtxHintTest.java
rename to apisupport/apisupport.refactoring/test/unit/src/org/netbeans/modules/apisupport/hints/HelpCtxHintTest.java
diff --git a/apisupport.refactoring/test/unit/src/org/netbeans/modules/apisupport/hints/UseNbBundleMessagesTest.java b/apisupport/apisupport.refactoring/test/unit/src/org/netbeans/modules/apisupport/hints/UseNbBundleMessagesTest.java
similarity index 100%
rename from apisupport.refactoring/test/unit/src/org/netbeans/modules/apisupport/hints/UseNbBundleMessagesTest.java
rename to apisupport/apisupport.refactoring/test/unit/src/org/netbeans/modules/apisupport/hints/UseNbBundleMessagesTest.java
diff --git a/apisupport.wizards/build.xml b/apisupport/apisupport.wizards/build.xml
similarity index 87%
rename from apisupport.wizards/build.xml
rename to apisupport/apisupport.wizards/build.xml
index 204f691841..c82c46b225 100644
--- a/apisupport.wizards/build.xml
+++ b/apisupport/apisupport.wizards/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="apisupport.wizards">
+<project basedir="." default="build" name="apisupport/apisupport.wizards">
     <description>Builds, tests, and runs the project org.netbeans.modules.apisupport.wizards</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/apisupport.wizards/licenseinfo.xml b/apisupport/apisupport.wizards/licenseinfo.xml
similarity index 100%
rename from apisupport.wizards/licenseinfo.xml
rename to apisupport/apisupport.wizards/licenseinfo.xml
diff --git a/apisupport.wizards/manifest.mf b/apisupport/apisupport.wizards/manifest.mf
similarity index 100%
rename from apisupport.wizards/manifest.mf
rename to apisupport/apisupport.wizards/manifest.mf
diff --git a/apisupport.wizards/nbproject/project.properties b/apisupport/apisupport.wizards/nbproject/project.properties
similarity index 100%
rename from apisupport.wizards/nbproject/project.properties
rename to apisupport/apisupport.wizards/nbproject/project.properties
diff --git a/apisupport.wizards/nbproject/project.xml b/apisupport/apisupport.wizards/nbproject/project.xml
similarity index 100%
rename from apisupport.wizards/nbproject/project.xml
rename to apisupport/apisupport.wizards/nbproject/project.xml
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/ActionTypePanel.form b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/ActionTypePanel.form
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/ActionTypePanel.form
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/ActionTypePanel.form
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/ActionTypePanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/ActionTypePanel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/ActionTypePanel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/ActionTypePanel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/Bundle.properties b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/Bundle.properties
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/Bundle.properties
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/Bundle.properties
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/DataModel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/DataModel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/DataModel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/DataModel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/GUIRegistrationPanel.form b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/GUIRegistrationPanel.form
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/GUIRegistrationPanel.form
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/GUIRegistrationPanel.form
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/GUIRegistrationPanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/GUIRegistrationPanel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/GUIRegistrationPanel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/GUIRegistrationPanel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/NameIconLocationPanel.form b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/NameIconLocationPanel.form
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/NameIconLocationPanel.form
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/NameIconLocationPanel.form
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/NameIconLocationPanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/NameIconLocationPanel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/NameIconLocationPanel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/NameIconLocationPanel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/NewActionIterator.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/NewActionIterator.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/NewActionIterator.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/NewActionIterator.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/ShortcutEnterPanel.form b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/ShortcutEnterPanel.form
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/ShortcutEnterPanel.form
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/ShortcutEnterPanel.form
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/ShortcutEnterPanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/ShortcutEnterPanel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/ShortcutEnterPanel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/ShortcutEnterPanel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/actionListener.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/actionListener.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/actionListener.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/actionListener.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/callableSystemAction.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/callableSystemAction.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/callableSystemAction.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/callableSystemAction.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/contextAction.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/contextAction.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/contextAction.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/contextAction.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/cookieAction.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/cookieAction.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/cookieAction.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/cookieAction.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/newAction.html b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/newAction.html
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/newAction.html
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/newAction.html
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/newAction.png b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/newAction.png
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/newAction.png
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/newAction.png
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/Bundle.properties b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/Bundle.properties
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/Bundle.properties
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/Bundle.properties
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/CodeGeneratorPanel.form b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/CodeGeneratorPanel.form
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/CodeGeneratorPanel.form
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/CodeGeneratorPanel.form
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/CodeGeneratorPanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/CodeGeneratorPanel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/CodeGeneratorPanel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/CodeGeneratorPanel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/NewCodeGeneratorIterator.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/NewCodeGeneratorIterator.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/NewCodeGeneratorIterator.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/NewCodeGeneratorIterator.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/codeGenerator.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/codeGenerator.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/codeGenerator.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/codeGenerator.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/contextProvider.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/contextProvider.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/contextProvider.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/contextProvider.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/newCodeGenerator.html b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/newCodeGenerator.html
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/newCodeGenerator.html
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/newCodeGenerator.html
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/newCodeGenerator.png b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/newCodeGenerator.png
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/newCodeGenerator.png
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/newCodeGenerator.png
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/common/BasicWizardIterator.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/common/BasicWizardIterator.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/common/BasicWizardIterator.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/common/BasicWizardIterator.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/common/Bundle.properties b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/common/Bundle.properties
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/common/Bundle.properties
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/common/Bundle.properties
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/common/CreatedModifiedFiles.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/common/CreatedModifiedFiles.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/common/CreatedModifiedFiles.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/common/CreatedModifiedFiles.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/common/WizardUtils.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/common/WizardUtils.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/common/WizardUtils.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/common/WizardUtils.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/common/layer.xml b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/common/layer.xml
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/common/layer.xml
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/common/layer.xml
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/Bundle.properties b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/Bundle.properties
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/Bundle.properties
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/Bundle.properties
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/HTML.htmx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/HTML.htmx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/HTML.htmx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/HTML.htmx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/HTML.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/HTML.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/HTML.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/HTML.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/HTMLIterator.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/HTMLIterator.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/HTMLIterator.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/HTMLIterator.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/NameAndLocationPanel.form b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/NameAndLocationPanel.form
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/NameAndLocationPanel.form
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/NameAndLocationPanel.form
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/NameAndLocationPanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/NameAndLocationPanel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/NameAndLocationPanel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/NameAndLocationPanel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/newHTML.html b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/newHTML.html
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/newHTML.html
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/newHTML.html
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/newHTML.png b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/newHTML.png
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/newHTML.png
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/newHTML.png
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/Bundle.properties b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/Bundle.properties
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/Bundle.properties
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/Bundle.properties
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/JavaHelpPanel.form b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/JavaHelpPanel.form
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/JavaHelpPanel.form
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/JavaHelpPanel.form
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/JavaHelpPanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/JavaHelpPanel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/JavaHelpPanel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/JavaHelpPanel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/NewJavaHelpIterator.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/NewJavaHelpIterator.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/NewJavaHelpIterator.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/NewJavaHelpIterator.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/newJavaHelp.html b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/newJavaHelp.html
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/newJavaHelp.html
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/newJavaHelp.html
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/newJavaHelp.png b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/newJavaHelp.png
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/newJavaHelp.png
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/newJavaHelp.png
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-about.html b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-about.html
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-about.html
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-about.html
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-helpset.xml b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-helpset.xml
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-helpset.xml
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-helpset.xml
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-idx.xml b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-idx.xml
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-idx.xml
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-idx.xml
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-map.jhm b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-map.jhm
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-map.jhm
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-map.jhm
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-toc.xml b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-toc.xml
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-toc.xml
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-toc.xml
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin.hs b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin.hs
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin.hs
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin.hs
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/Bundle.properties b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/Bundle.properties
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/Bundle.properties
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/Bundle.properties
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/JavaHintDataPanel.form b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/JavaHintDataPanel.form
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/JavaHintDataPanel.form
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/JavaHintDataPanel.form
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/JavaHintDataPanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/JavaHintDataPanel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/JavaHintDataPanel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/JavaHintDataPanel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/JavaHintLocationPanel.form b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/JavaHintLocationPanel.form
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/JavaHintLocationPanel.form
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/JavaHintLocationPanel.form
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/JavaHintLocationPanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/JavaHintLocationPanel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/JavaHintLocationPanel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/JavaHintLocationPanel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/NewJavaHintIterator.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/NewJavaHintIterator.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/NewJavaHintIterator.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/NewJavaHintIterator.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHint.html b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHint.html
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHint.html
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHint.html
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHint.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHint.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHint.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHint.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHintTest.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHintTest.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHintTest.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHintTest.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHintTestApp.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHintTestApp.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHintTestApp.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHintTestApp.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/suggestion.png b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/suggestion.png
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/suggestion.png
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/suggestion.png
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/layer/Bundle.properties b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/layer/Bundle.properties
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/layer/Bundle.properties
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/layer/Bundle.properties
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/layer/LayerPanel.form b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/layer/LayerPanel.form
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/layer/LayerPanel.form
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/layer/LayerPanel.form
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/layer/LayerPanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/layer/LayerPanel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/layer/LayerPanel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/layer/LayerPanel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/layer/NewLayerIterator.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/layer/NewLayerIterator.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/layer/NewLayerIterator.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/layer/NewLayerIterator.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/layer/newLayer.html b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/layer/newLayer.html
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/layer/newLayer.html
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/layer/newLayer.html
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/Bundle.properties b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/Bundle.properties
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/Bundle.properties
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/Bundle.properties
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/CreatedModifiedFilesProvider.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/CreatedModifiedFilesProvider.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/CreatedModifiedFilesProvider.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/CreatedModifiedFilesProvider.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/NameAndLocationPanel.form b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/NameAndLocationPanel.form
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/NameAndLocationPanel.form
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/NameAndLocationPanel.form
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/NameAndLocationPanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/NameAndLocationPanel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/NameAndLocationPanel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/NameAndLocationPanel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/NewLibraryDescriptor.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/NewLibraryDescriptor.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/NewLibraryDescriptor.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/NewLibraryDescriptor.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/SelectLibraryPanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/SelectLibraryPanel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/SelectLibraryPanel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/SelectLibraryPanel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/emptyLibraryDescriptor.html b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/emptyLibraryDescriptor.html
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/emptyLibraryDescriptor.html
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/emptyLibraryDescriptor.html
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/libdescriptemplate.xml b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/libdescriptemplate.xml
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/libdescriptemplate.xml
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/libdescriptemplate.xml
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/Bundle.properties b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/Bundle.properties
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/Bundle.properties
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/Bundle.properties
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/FileRecognitionPanel.form b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/FileRecognitionPanel.form
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/FileRecognitionPanel.form
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/FileRecognitionPanel.form
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/FileRecognitionPanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/FileRecognitionPanel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/FileRecognitionPanel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/FileRecognitionPanel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/NameAndLocationPanel.form b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/NameAndLocationPanel.form
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/NameAndLocationPanel.form
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/NameAndLocationPanel.form
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/NameAndLocationPanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/NameAndLocationPanel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/NameAndLocationPanel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/NameAndLocationPanel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/NewLoaderIterator.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/NewLoaderIterator.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/NewLoaderIterator.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/NewLoaderIterator.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/newLoader.html b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/newLoader.html
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/newLoader.html
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/newLoader.html
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/newLoader.png b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/newLoader.png
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/newLoader.png
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/newLoader.png
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataLoader.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataLoader.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataLoader.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataLoader.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataLoaderBeanInfo.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataLoaderBeanInfo.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataLoaderBeanInfo.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataLoaderBeanInfo.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataNode.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataNode.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataNode.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataNode.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObject.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObject.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObject.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObject.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectAnno.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectAnno.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectAnno.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectAnno.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectInLayer.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectInLayer.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectInLayer.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectInLayer.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectMulti.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectMulti.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectMulti.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectMulti.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectMultiVisual.forx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectMultiVisual.forx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectMultiVisual.forx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectMultiVisual.forx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectMultiVisual.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectMultiVisual.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectMultiVisual.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectMultiVisual.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectWithLookup.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectWithLookup.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectWithLookup.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectWithLookup.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateNew1 b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateNew1
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateNew1
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateNew1
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateNew2 b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateNew2
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateNew2
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateNew2
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateresolver.xml b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateresolver.xml
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateresolver.xml
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateresolver.xml
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/Bundle.properties b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/Bundle.properties
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/Bundle.properties
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/Bundle.properties
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/DataModel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/DataModel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/DataModel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/DataModel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/ModuleInstallPanel.form b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/ModuleInstallPanel.form
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/ModuleInstallPanel.form
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/ModuleInstallPanel.form
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/ModuleInstallPanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/ModuleInstallPanel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/ModuleInstallPanel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/ModuleInstallPanel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/NewModuleInstallIterator.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/NewModuleInstallIterator.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/NewModuleInstallIterator.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/NewModuleInstallIterator.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/module.png b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/module.png
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/module.png
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/module.png
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/moduleActivator.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/moduleActivator.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/moduleActivator.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/moduleActivator.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/moduleInstall.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/moduleInstall.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/moduleInstall.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/moduleInstall.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/newModuleInstall.html b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/newModuleInstall.html
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/newModuleInstall.html
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/newModuleInstall.html
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/Bundle.properties b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/Bundle.properties
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/Bundle.properties
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/Bundle.properties
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/NewOptionsIterator.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/NewOptionsIterator.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/NewOptionsIterator.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/NewOptionsIterator.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/OptionsPanel.form b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/OptionsPanel.form
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/OptionsPanel.form
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/OptionsPanel.form
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/OptionsPanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/OptionsPanel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/OptionsPanel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/OptionsPanel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/OptionsPanel0.form b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/OptionsPanel0.form
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/OptionsPanel0.form
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/OptionsPanel0.form
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/OptionsPanel0.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/OptionsPanel0.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/OptionsPanel0.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/OptionsPanel0.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/newOptions.html b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/newOptions.html
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/newOptions.html
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/newOptions.html
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/newOptions.png b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/newOptions.png
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/newOptions.png
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/newOptions.png
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/template_mypluginOptionsPanelController b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/template_mypluginOptionsPanelController
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/template_mypluginOptionsPanelController
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/template_mypluginOptionsPanelController
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/template_mypluginPanel b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/template_mypluginPanel
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/template_mypluginPanel
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/template_mypluginPanel
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/template_myplugin_formPanel b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/template_myplugin_formPanel
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/template_myplugin_formPanel
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/template_myplugin_formPanel
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/Bundle.properties b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/Bundle.properties
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/Bundle.properties
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/Bundle.properties
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/NameAndLocationPanel.form b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/NameAndLocationPanel.form
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/NameAndLocationPanel.form
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/NameAndLocationPanel.form
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/NameAndLocationPanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/NameAndLocationPanel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/NameAndLocationPanel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/NameAndLocationPanel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/NewProjectIterator.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/NewProjectIterator.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/NewProjectIterator.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/NewProjectIterator.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/SelectProjectPanel.form b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/SelectProjectPanel.form
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/SelectProjectPanel.form
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/SelectProjectPanel.form
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/SelectProjectPanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/SelectProjectPanel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/SelectProjectPanel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/SelectProjectPanel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/newProject.html b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/newProject.html
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/newProject.html
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/newProject.html
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/newProject.png b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/newProject.png
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/newProject.png
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/newProject.png
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templateDescription.html b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templateDescription.html
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templateDescription.html
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templateDescription.html
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templatePanelVisual.frmx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templatePanelVisual.frmx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templatePanelVisual.frmx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templatePanelVisual.frmx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templatePanelVisual.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templatePanelVisual.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templatePanelVisual.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templatePanelVisual.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templateWizardIterator.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templateWizardIterator.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templateWizardIterator.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templateWizardIterator.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templateWizardPanel.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templateWizardPanel.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templateWizardPanel.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templateWizardPanel.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/Bundle.properties b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/Bundle.properties
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/Bundle.properties
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/Bundle.properties
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/NewQuickSearchIterator.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/NewQuickSearchIterator.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/NewQuickSearchIterator.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/NewQuickSearchIterator.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/QuickSearchPanel.form b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/QuickSearchPanel.form
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/QuickSearchPanel.form
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/QuickSearchPanel.form
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/QuickSearchPanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/QuickSearchPanel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/QuickSearchPanel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/QuickSearchPanel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/newQuickSearch.html b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/newQuickSearch.html
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/newQuickSearch.html
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/newQuickSearch.html
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/newQuickSearch.png b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/newQuickSearch.png
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/newQuickSearch.png
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/newQuickSearch.png
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/quickSearch.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/quickSearch.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/quickSearch.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/quickSearch.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/Bundle.properties b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/Bundle.properties
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/Bundle.properties
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/Bundle.properties
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/DataModel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/DataModel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/DataModel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/DataModel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/NewUpdateCenterIterator.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/NewUpdateCenterIterator.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/NewUpdateCenterIterator.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/NewUpdateCenterIterator.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/UpdateCenterRegistrationPanel.form b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/UpdateCenterRegistrationPanel.form
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/UpdateCenterRegistrationPanel.form
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/UpdateCenterRegistrationPanel.form
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/UpdateCenterRegistrationPanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/UpdateCenterRegistrationPanel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/UpdateCenterRegistrationPanel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/UpdateCenterRegistrationPanel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/newUpdateCenter.html b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/newUpdateCenter.html
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/newUpdateCenter.html
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/newUpdateCenter.html
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/newUpdateCenter.png b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/newUpdateCenter.png
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/newUpdateCenter.png
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/newUpdateCenter.png
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/update_center.xml b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/update_center.xml
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/update_center.xml
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/update_center.xml
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/BasicSettingsPanel.form b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/BasicSettingsPanel.form
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/BasicSettingsPanel.form
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/BasicSettingsPanel.form
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/BasicSettingsPanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/BasicSettingsPanel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/BasicSettingsPanel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/BasicSettingsPanel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/Bundle.properties b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/Bundle.properties
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/Bundle.properties
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/Bundle.properties
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/DesignSupport.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/DesignSupport.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/DesignSupport.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/DesignSupport.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutIterator.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutIterator.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutIterator.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutIterator.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutLaunchingPanel.form b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutLaunchingPanel.form
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutLaunchingPanel.form
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutLaunchingPanel.form
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutLaunchingPanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutLaunchingPanel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutLaunchingPanel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutLaunchingPanel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutSummaryPanel.form b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutSummaryPanel.form
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutSummaryPanel.form
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutSummaryPanel.form
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutSummaryPanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutSummaryPanel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutSummaryPanel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutSummaryPanel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutWarningPanel.form b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutWarningPanel.form
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutWarningPanel.form
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutWarningPanel.form
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutWarningPanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutWarningPanel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutWarningPanel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutWarningPanel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/NameAndLocationPanel.form b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/NameAndLocationPanel.form
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/NameAndLocationPanel.form
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/NameAndLocationPanel.form
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/NameAndLocationPanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/NameAndLocationPanel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/NameAndLocationPanel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/NameAndLocationPanel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/NewTCIterator.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/NewTCIterator.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/NewTCIterator.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/NewTCIterator.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/newLayout.html b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/newLayout.html
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/newLayout.html
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/newLayout.html
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/newLayout.png b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/newLayout.png
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/newLayout.png
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/newLayout.png
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/newTC.html b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/newTC.html
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/newTC.html
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/newTC.html
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/newTC.png b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/newTC.png
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/newTC.png
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/newTC.png
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/polishing.xsl b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/polishing.xsl
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/polishing.xsl
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/polishing.xsl
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateAction.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateAction.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateAction.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateAction.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateSettings.xml b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateSettings.xml
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateSettings.xml
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateSettings.xml
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponent.frmx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponent.frmx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponent.frmx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponent.frmx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponent.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponent.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponent.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponent.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponent637.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponent637.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponent637.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponent637.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponentAnno.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponentAnno.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponentAnno.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponentAnno.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateWstcref.xml b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateWstcref.xml
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateWstcref.xml
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateWstcref.xml
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/Bundle.properties b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/Bundle.properties
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/Bundle.properties
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/Bundle.properties
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/DataModel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/DataModel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/DataModel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/DataModel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/NameIconLocationPanel.form b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/NameIconLocationPanel.form
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/NameIconLocationPanel.form
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/NameIconLocationPanel.form
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/NameIconLocationPanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/NameIconLocationPanel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/NameIconLocationPanel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/NameIconLocationPanel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/NewWizardIterator.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/NewWizardIterator.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/NewWizardIterator.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/NewWizardIterator.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/WizardTypePanel.form b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/WizardTypePanel.form
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/WizardTypePanel.form
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/WizardTypePanel.form
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/WizardTypePanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/WizardTypePanel.java
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/WizardTypePanel.java
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/WizardTypePanel.java
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/instantiatingIterator.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/instantiatingIterator.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/instantiatingIterator.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/instantiatingIterator.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/newWizard.html b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/newWizard.html
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/newWizard.html
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/newWizard.html
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/newWizard.png b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/newWizard.png
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/newWizard.png
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/newWizard.png
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/sampleAction.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/sampleAction.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/sampleAction.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/sampleAction.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/visualPanel.forx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/visualPanel.forx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/visualPanel.forx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/visualPanel.forx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/visualPanel.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/visualPanel.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/visualPanel.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/visualPanel.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardDescription.html b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardDescription.html
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardDescription.html
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardDescription.html
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML.fmk b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML.fmk
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML.fmk
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML.fmk
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML.html b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML.html
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML.html
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML.html
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardIterator.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardIterator.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardIterator.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardIterator.javx
diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardPanel.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardPanel.javx
similarity index 100%
rename from apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardPanel.javx
rename to apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardPanel.javx
diff --git a/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/action/DataModelTest.java b/apisupport/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/action/DataModelTest.java
similarity index 100%
rename from apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/action/DataModelTest.java
rename to apisupport/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/action/DataModelTest.java
diff --git a/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/common/WizardUtilsTest.java b/apisupport/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/common/WizardUtilsTest.java
similarity index 100%
rename from apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/common/WizardUtilsTest.java
rename to apisupport/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/common/WizardUtilsTest.java
diff --git a/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/DataModelTest.java b/apisupport/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/DataModelTest.java
similarity index 100%
rename from apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/DataModelTest.java
rename to apisupport/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/DataModelTest.java
diff --git a/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/FileRecognitionPanelTest.java b/apisupport/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/FileRecognitionPanelTest.java
similarity index 100%
rename from apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/FileRecognitionPanelTest.java
rename to apisupport/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/FileRecognitionPanelTest.java
diff --git a/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/DataModelTest.java b/apisupport/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/DataModelTest.java
similarity index 100%
rename from apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/DataModelTest.java
rename to apisupport/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/DataModelTest.java
diff --git a/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/DesignSupportTest.java b/apisupport/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/DesignSupportTest.java
similarity index 100%
rename from apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/DesignSupportTest.java
rename to apisupport/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/DesignSupportTest.java
diff --git a/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/testWsmode.xml b/apisupport/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/testWsmode.xml
similarity index 100%
rename from apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/testWsmode.xml
rename to apisupport/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/testWsmode.xml
diff --git a/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/DataModelTest.java b/apisupport/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/DataModelTest.java
similarity index 100%
rename from apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/DataModelTest.java
rename to apisupport/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/DataModelTest.java
diff --git a/maven.apisupport/build.xml b/apisupport/maven.apisupport/build.xml
similarity index 87%
rename from maven.apisupport/build.xml
rename to apisupport/maven.apisupport/build.xml
index 2c64a8ca60..d8cb6cbf02 100644
--- a/maven.apisupport/build.xml
+++ b/apisupport/maven.apisupport/build.xml
@@ -20,7 +20,7 @@
 
 -->
 
-<project basedir="." default="build" name="maven.apisupport">
+<project basedir="." default="build" name="apisupport/maven.apisupport">
     <description>Builds, tests, and runs the project org.netbeans.modules.maven.apisupport</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/maven.apisupport/licenseinfo.xml b/apisupport/maven.apisupport/licenseinfo.xml
similarity index 100%
rename from maven.apisupport/licenseinfo.xml
rename to apisupport/maven.apisupport/licenseinfo.xml
diff --git a/maven.apisupport/manifest.mf b/apisupport/maven.apisupport/manifest.mf
similarity index 100%
rename from maven.apisupport/manifest.mf
rename to apisupport/maven.apisupport/manifest.mf
diff --git a/maven.apisupport/nbproject/project.properties b/apisupport/maven.apisupport/nbproject/project.properties
similarity index 100%
rename from maven.apisupport/nbproject/project.properties
rename to apisupport/maven.apisupport/nbproject/project.properties
diff --git a/maven.apisupport/nbproject/project.xml b/apisupport/maven.apisupport/nbproject/project.xml
similarity index 100%
rename from maven.apisupport/nbproject/project.xml
rename to apisupport/maven.apisupport/nbproject/project.xml
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/AccessQueryImpl.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/AccessQueryImpl.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/AccessQueryImpl.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/AccessQueryImpl.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/AdaptNbVersion.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/AdaptNbVersion.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/AdaptNbVersion.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/AdaptNbVersion.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/AddOSGiParamToNbmPluginConfiguration.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/AddOSGiParamToNbmPluginConfiguration.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/AddOSGiParamToNbmPluginConfiguration.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/AddOSGiParamToNbmPluginConfiguration.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/AnnotatedNode.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/AnnotatedNode.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/AnnotatedNode.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/AnnotatedNode.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/ApisupportOutputProcessorFactory.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/ApisupportOutputProcessorFactory.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/ApisupportOutputProcessorFactory.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/ApisupportOutputProcessorFactory.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/ApisupportRecoPrivTemplates.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/ApisupportRecoPrivTemplates.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/ApisupportRecoPrivTemplates.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/ApisupportRecoPrivTemplates.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/Bundle.properties b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/Bundle.properties
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/Bundle.properties
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/Bundle.properties
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/CoSApplicationLateBoundChecker.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/CoSApplicationLateBoundChecker.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/CoSApplicationLateBoundChecker.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/CoSApplicationLateBoundChecker.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/ExamineManifest.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/ExamineManifest.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/ExamineManifest.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/ExamineManifest.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/ExecutionChecker.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/ExecutionChecker.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/ExecutionChecker.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/ExecutionChecker.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/IDEOutputListenerProvider.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/IDEOutputListenerProvider.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/IDEOutputListenerProvider.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/IDEOutputListenerProvider.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/ImportantFilesNodeFactory.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/ImportantFilesNodeFactory.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/ImportantFilesNodeFactory.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/ImportantFilesNodeFactory.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/InstallerPanel.form b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/InstallerPanel.form
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/InstallerPanel.form
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/InstallerPanel.form
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/InstallerPanel.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/InstallerPanel.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/InstallerPanel.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/InstallerPanel.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenExecProject.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenExecProject.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenExecProject.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenExecProject.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenNbModuleImpl.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenNbModuleImpl.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenNbModuleImpl.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenNbModuleImpl.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenPackageModifierImpl.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenPackageModifierImpl.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenPackageModifierImpl.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenPackageModifierImpl.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenPlatformJarProvider.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenPlatformJarProvider.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenPlatformJarProvider.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenPlatformJarProvider.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenRefactoringProviderImpl.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenRefactoringProviderImpl.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenRefactoringProviderImpl.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenRefactoringProviderImpl.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenWhiteListQueryImpl.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenWhiteListQueryImpl.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenWhiteListQueryImpl.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenWhiteListQueryImpl.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MissingNbInstallationProblemProvider.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MissingNbInstallationProblemProvider.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/MissingNbInstallationProblemProvider.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MissingNbInstallationProblemProvider.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/ModuleJarAccessibilityQueryImpl.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/ModuleJarAccessibilityQueryImpl.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/ModuleJarAccessibilityQueryImpl.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/ModuleJarAccessibilityQueryImpl.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NBMNativeMWI.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NBMNativeMWI.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/NBMNativeMWI.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NBMNativeMWI.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbAppDescription.html b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbAppDescription.html
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbAppDescription.html
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbAppDescription.html
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbModuleDescription.html b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbModuleDescription.html
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbModuleDescription.html
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbModuleDescription.html
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmActionGoalProvider.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmActionGoalProvider.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmActionGoalProvider.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmActionGoalProvider.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmIcons.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmIcons.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmIcons.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmIcons.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmWizardIterator.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmWizardIterator.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmWizardIterator.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmWizardIterator.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmWizardPanel.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmWizardPanel.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmWizardPanel.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmWizardPanel.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmWizardPanelVisual.form b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmWizardPanelVisual.form
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmWizardPanelVisual.form
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmWizardPanelVisual.form
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmWizardPanelVisual.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmWizardPanelVisual.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmWizardPanelVisual.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmWizardPanelVisual.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NetBeansRunParamsIDEChecker.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NetBeansRunParamsIDEChecker.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/NetBeansRunParamsIDEChecker.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NetBeansRunParamsIDEChecker.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NetBeansStartupArgs.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NetBeansStartupArgs.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/NetBeansStartupArgs.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NetBeansStartupArgs.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/OpenBrandingEditorAction.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/OpenBrandingEditorAction.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/OpenBrandingEditorAction.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/OpenBrandingEditorAction.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/PackagesPanelProvider.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/PackagesPanelProvider.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/PackagesPanelProvider.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/PackagesPanelProvider.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/PublicPackagesPanel.form b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/PublicPackagesPanel.form
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/PublicPackagesPanel.form
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/PublicPackagesPanel.form
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/PublicPackagesPanel.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/PublicPackagesPanel.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/PublicPackagesPanel.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/PublicPackagesPanel.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/RunIDEInstallationChecker.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/RunIDEInstallationChecker.java
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/RunIDEInstallationChecker.java
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/RunIDEInstallationChecker.java
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/config-badge.gif b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/config-badge.gif
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/config-badge.gif
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/config-badge.gif
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/ideActionMappings.xml b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/ideActionMappings.xml
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/ideActionMappings.xml
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/ideActionMappings.xml
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/module-badge.png b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/module-badge.png
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/module-badge.png
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/module-badge.png
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/nbmicon.png b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/nbmicon.png
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/nbmicon.png
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/nbmicon.png
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/platformActionMappings.xml b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/platformActionMappings.xml
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/platformActionMappings.xml
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/platformActionMappings.xml
diff --git a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/suiteicon.png b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/suiteicon.png
similarity index 100%
rename from maven.apisupport/src/org/netbeans/modules/maven/apisupport/suiteicon.png
rename to apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/suiteicon.png
diff --git a/maven.apisupport/test/org/netbeans/modules/maven/apisupport/AccessQueryImplTest.java b/apisupport/maven.apisupport/test/org/netbeans/modules/maven/apisupport/AccessQueryImplTest.java
similarity index 100%
rename from maven.apisupport/test/org/netbeans/modules/maven/apisupport/AccessQueryImplTest.java
rename to apisupport/maven.apisupport/test/org/netbeans/modules/maven/apisupport/AccessQueryImplTest.java
diff --git a/maven.apisupport/test/unit/src/org/netbeans/modules/maven/apisupport/PublicPackagesPanelTest.java b/apisupport/maven.apisupport/test/unit/src/org/netbeans/modules/maven/apisupport/PublicPackagesPanelTest.java
similarity index 100%
rename from maven.apisupport/test/unit/src/org/netbeans/modules/maven/apisupport/PublicPackagesPanelTest.java
rename to apisupport/maven.apisupport/test/unit/src/org/netbeans/modules/maven/apisupport/PublicPackagesPanelTest.java
diff --git a/timers/arch.xml b/apisupport/timers/arch.xml
similarity index 99%
rename from timers/arch.xml
rename to apisupport/timers/arch.xml
index dabef8f672..ed2a7dd679 100644
--- a/timers/arch.xml
+++ b/apisupport/timers/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/timers/build.xml b/apisupport/timers/build.xml
similarity index 88%
rename from timers/build.xml
rename to apisupport/timers/build.xml
index f7ecd86200..e35187eabc 100644
--- a/timers/build.xml
+++ b/apisupport/timers/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="timers">
+<project basedir="." default="build" name="apisupport/timers">
     <description>Builds, tests, and runs the project org.netbeans.modules.timers</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/timers/licenseinfo.xml b/apisupport/timers/licenseinfo.xml
similarity index 100%
rename from timers/licenseinfo.xml
rename to apisupport/timers/licenseinfo.xml
diff --git a/timers/manifest.mf b/apisupport/timers/manifest.mf
similarity index 100%
rename from timers/manifest.mf
rename to apisupport/timers/manifest.mf
diff --git a/timers/nbproject/project.properties b/apisupport/timers/nbproject/project.properties
similarity index 100%
rename from timers/nbproject/project.properties
rename to apisupport/timers/nbproject/project.properties
diff --git a/timers/nbproject/project.xml b/apisupport/timers/nbproject/project.xml
similarity index 100%
rename from timers/nbproject/project.xml
rename to apisupport/timers/nbproject/project.xml
diff --git a/timers/src/org/netbeans/modules/timers/Bundle.properties b/apisupport/timers/src/org/netbeans/modules/timers/Bundle.properties
similarity index 100%
rename from timers/src/org/netbeans/modules/timers/Bundle.properties
rename to apisupport/timers/src/org/netbeans/modules/timers/Bundle.properties
diff --git a/timers/src/org/netbeans/modules/timers/Install.java b/apisupport/timers/src/org/netbeans/modules/timers/Install.java
similarity index 100%
rename from timers/src/org/netbeans/modules/timers/Install.java
rename to apisupport/timers/src/org/netbeans/modules/timers/Install.java
diff --git a/timers/src/org/netbeans/modules/timers/InstanceWatcher.java b/apisupport/timers/src/org/netbeans/modules/timers/InstanceWatcher.java
similarity index 100%
rename from timers/src/org/netbeans/modules/timers/InstanceWatcher.java
rename to apisupport/timers/src/org/netbeans/modules/timers/InstanceWatcher.java
diff --git a/timers/src/org/netbeans/modules/timers/ObjectListRenderer.java b/apisupport/timers/src/org/netbeans/modules/timers/ObjectListRenderer.java
similarity index 100%
rename from timers/src/org/netbeans/modules/timers/ObjectListRenderer.java
rename to apisupport/timers/src/org/netbeans/modules/timers/ObjectListRenderer.java
diff --git a/timers/src/org/netbeans/modules/timers/OpenTimeComponentAction.java b/apisupport/timers/src/org/netbeans/modules/timers/OpenTimeComponentAction.java
similarity index 100%
rename from timers/src/org/netbeans/modules/timers/OpenTimeComponentAction.java
rename to apisupport/timers/src/org/netbeans/modules/timers/OpenTimeComponentAction.java
diff --git a/timers/src/org/netbeans/modules/timers/TimeComponent.java b/apisupport/timers/src/org/netbeans/modules/timers/TimeComponent.java
similarity index 100%
rename from timers/src/org/netbeans/modules/timers/TimeComponent.java
rename to apisupport/timers/src/org/netbeans/modules/timers/TimeComponent.java
diff --git a/timers/src/org/netbeans/modules/timers/TimeComponentPanel.form b/apisupport/timers/src/org/netbeans/modules/timers/TimeComponentPanel.form
similarity index 100%
rename from timers/src/org/netbeans/modules/timers/TimeComponentPanel.form
rename to apisupport/timers/src/org/netbeans/modules/timers/TimeComponentPanel.form
diff --git a/timers/src/org/netbeans/modules/timers/TimeComponentPanel.java b/apisupport/timers/src/org/netbeans/modules/timers/TimeComponentPanel.java
similarity index 100%
rename from timers/src/org/netbeans/modules/timers/TimeComponentPanel.java
rename to apisupport/timers/src/org/netbeans/modules/timers/TimeComponentPanel.java
diff --git a/timers/src/org/netbeans/modules/timers/TimesCollectorPeer.java b/apisupport/timers/src/org/netbeans/modules/timers/TimesCollectorPeer.java
similarity index 100%
rename from timers/src/org/netbeans/modules/timers/TimesCollectorPeer.java
rename to apisupport/timers/src/org/netbeans/modules/timers/TimesCollectorPeer.java
diff --git a/timers/src/org/netbeans/modules/timers/resources/Timers.xml b/apisupport/timers/src/org/netbeans/modules/timers/resources/Timers.xml
similarity index 100%
rename from timers/src/org/netbeans/modules/timers/resources/Timers.xml
rename to apisupport/timers/src/org/netbeans/modules/timers/resources/Timers.xml
diff --git a/timers/src/org/netbeans/modules/timers/resources/TimersRef.xml b/apisupport/timers/src/org/netbeans/modules/timers/resources/TimersRef.xml
similarity index 100%
rename from timers/src/org/netbeans/modules/timers/resources/TimersRef.xml
rename to apisupport/timers/src/org/netbeans/modules/timers/resources/TimersRef.xml
diff --git a/timers/src/org/netbeans/modules/timers/resources/TimersSettings.xml b/apisupport/timers/src/org/netbeans/modules/timers/resources/TimersSettings.xml
similarity index 100%
rename from timers/src/org/netbeans/modules/timers/resources/TimersSettings.xml
rename to apisupport/timers/src/org/netbeans/modules/timers/resources/TimersSettings.xml
diff --git a/timers/src/org/netbeans/modules/timers/resources/layer.xml b/apisupport/timers/src/org/netbeans/modules/timers/resources/layer.xml
similarity index 100%
rename from timers/src/org/netbeans/modules/timers/resources/layer.xml
rename to apisupport/timers/src/org/netbeans/modules/timers/resources/layer.xml
diff --git a/timers/src/org/netbeans/modules/timers/resources/timer.png b/apisupport/timers/src/org/netbeans/modules/timers/resources/timer.png
similarity index 100%
rename from timers/src/org/netbeans/modules/timers/resources/timer.png
rename to apisupport/timers/src/org/netbeans/modules/timers/resources/timer.png
diff --git a/timers/test/unit/src/org/netbeans/modules/timers/HandlerTest.java b/apisupport/timers/test/unit/src/org/netbeans/modules/timers/HandlerTest.java
similarity index 100%
rename from timers/test/unit/src/org/netbeans/modules/timers/HandlerTest.java
rename to apisupport/timers/test/unit/src/org/netbeans/modules/timers/HandlerTest.java
diff --git a/timers/test/unit/src/org/netbeans/modules/timers/HandlerTest.properties b/apisupport/timers/test/unit/src/org/netbeans/modules/timers/HandlerTest.properties
similarity index 100%
rename from timers/test/unit/src/org/netbeans/modules/timers/HandlerTest.properties
rename to apisupport/timers/test/unit/src/org/netbeans/modules/timers/HandlerTest.properties
diff --git a/timers/test/unit/src/org/netbeans/modules/timers/InstanceWatcherTest.java b/apisupport/timers/test/unit/src/org/netbeans/modules/timers/InstanceWatcherTest.java
similarity index 100%
rename from timers/test/unit/src/org/netbeans/modules/timers/InstanceWatcherTest.java
rename to apisupport/timers/test/unit/src/org/netbeans/modules/timers/InstanceWatcherTest.java
diff --git a/timers/test/unit/src/org/netbeans/modules/timers/ObjectListRendererTest.java b/apisupport/timers/test/unit/src/org/netbeans/modules/timers/ObjectListRendererTest.java
similarity index 100%
rename from timers/test/unit/src/org/netbeans/modules/timers/ObjectListRendererTest.java
rename to apisupport/timers/test/unit/src/org/netbeans/modules/timers/ObjectListRendererTest.java
diff --git a/timers/test/unit/src/org/netbeans/modules/timers/TimesCollectorPeerTest.java b/apisupport/timers/test/unit/src/org/netbeans/modules/timers/TimesCollectorPeerTest.java
similarity index 100%
rename from timers/test/unit/src/org/netbeans/modules/timers/TimesCollectorPeerTest.java
rename to apisupport/timers/test/unit/src/org/netbeans/modules/timers/TimesCollectorPeerTest.java
diff --git a/nbbuild/rat-exclusions.txt b/nbbuild/rat-exclusions.txt
index fd7da6c026..e99cbedc92 100644
--- a/nbbuild/rat-exclusions.txt
+++ b/nbbuild/rat-exclusions.txt
@@ -104,8 +104,8 @@ xml/test/unit/src/org/netbeans/modules/xml/resources/*
 xsl/test/unit/src/org/netbeans/modules/xsl/utils/data/*
 
 ###### template file
-apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/license-*.txt
-apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/layer_template.xml
+apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/license-*.txt
+apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/layer_template.xml
 java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/resources/templates/*
 editor/demosrc/base/org/netbeans/editor/example/res/template.html_
 editor/demosrc/base/org/netbeans/editor/example/res/template.java_
@@ -166,7 +166,7 @@ websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl/*
 java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLine.tokens
 
 ###### license files 
-apisupport.installer/src/org/netbeans/modules/apisupport/installer/resources/licenses/**
+apisupport/apisupport.installer/src/org/netbeans/modules/apisupport/installer/resources/licenses/**
 ### companion files for CDDL licensed binaries
 lib.profiler/release/lib/deployed/**/*.map
 platform/o.n.core/licenses/**


 

----------------------------------------------------------------
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