[GitHub] geertjanw closed pull request #765: [NETBEANS-1170] Move profiler cluster

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

geertjanw closed pull request #765: [NETBEANS-1170] Move profiler cluster
URL: https://github.com/apache/incubator-netbeans/pull/765
 
 
   

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/nbbuild/rat-exclusions.txt b/nbbuild/rat-exclusions.txt
index 0300aaaeaa..9a2626aa77 100644
--- a/nbbuild/rat-exclusions.txt
+++ b/nbbuild/rat-exclusions.txt
@@ -168,7 +168,7 @@ java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customi
 ###### license files 
 apisupport/apisupport.installer/src/org/netbeans/modules/apisupport/installer/resources/licenses/**
 ### companion files for CDDL licensed binaries
-lib.profiler/release/lib/deployed/**/*.map
+profiler/lib.profiler/release/lib/deployed/**/*.map
 platform/o.n.core/licenses/**
 ### A prefix that is added to license file
 nbbuild/license-dialog-stub.txt
diff --git a/debugger.jpda.heapwalk/build.xml b/profiler/debugger.jpda.heapwalk/build.xml
similarity index 86%
rename from debugger.jpda.heapwalk/build.xml
rename to profiler/debugger.jpda.heapwalk/build.xml
index f49c1f3f22..f6a7b26595 100644
--- a/debugger.jpda.heapwalk/build.xml
+++ b/profiler/debugger.jpda.heapwalk/build.xml
@@ -19,6 +19,6 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="debugger.jpda.heapwalk">
-    <import file="../nbbuild/templates/projectized.xml"/>
+<project basedir="." default="build" name="profiler/debugger.jpda.heapwalk">
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/debugger.jpda.heapwalk/manifest.mf b/profiler/debugger.jpda.heapwalk/manifest.mf
similarity index 100%
rename from debugger.jpda.heapwalk/manifest.mf
rename to profiler/debugger.jpda.heapwalk/manifest.mf
diff --git a/debugger.jpda.heapwalk/nbproject/project.properties b/profiler/debugger.jpda.heapwalk/nbproject/project.properties
similarity index 100%
rename from debugger.jpda.heapwalk/nbproject/project.properties
rename to profiler/debugger.jpda.heapwalk/nbproject/project.properties
diff --git a/debugger.jpda.heapwalk/nbproject/project.xml b/profiler/debugger.jpda.heapwalk/nbproject/project.xml
similarity index 100%
rename from debugger.jpda.heapwalk/nbproject/project.xml
rename to profiler/debugger.jpda.heapwalk/nbproject/project.xml
diff --git a/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/ArrayItemValueImpl.java b/profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/ArrayItemValueImpl.java
similarity index 100%
rename from debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/ArrayItemValueImpl.java
rename to profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/ArrayItemValueImpl.java
diff --git a/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/Bundle.properties b/profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/Bundle.properties
similarity index 100%
rename from debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/Bundle.properties
rename to profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/Bundle.properties
diff --git a/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/FieldImpl.java b/profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/FieldImpl.java
similarity index 100%
rename from debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/FieldImpl.java
rename to profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/FieldImpl.java
diff --git a/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/FieldValueImpl.java b/profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/FieldValueImpl.java
similarity index 100%
rename from debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/FieldValueImpl.java
rename to profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/FieldValueImpl.java
diff --git a/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/HeapImpl.java b/profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/HeapImpl.java
similarity index 100%
rename from debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/HeapImpl.java
rename to profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/HeapImpl.java
diff --git a/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/InstanceImpl.java b/profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/InstanceImpl.java
similarity index 100%
rename from debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/InstanceImpl.java
rename to profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/InstanceImpl.java
diff --git a/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/JavaClassImpl.java b/profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/JavaClassImpl.java
similarity index 100%
rename from debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/JavaClassImpl.java
rename to profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/JavaClassImpl.java
diff --git a/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/ObjectArrayInstanceImpl.java b/profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/ObjectArrayInstanceImpl.java
similarity index 100%
rename from debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/ObjectArrayInstanceImpl.java
rename to profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/ObjectArrayInstanceImpl.java
diff --git a/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/ObjectFieldValueImpl.java b/profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/ObjectFieldValueImpl.java
similarity index 100%
rename from debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/ObjectFieldValueImpl.java
rename to profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/ObjectFieldValueImpl.java
diff --git a/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/PrimitiveArrayInstanceImpl.java b/profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/PrimitiveArrayInstanceImpl.java
similarity index 100%
rename from debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/PrimitiveArrayInstanceImpl.java
rename to profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/PrimitiveArrayInstanceImpl.java
diff --git a/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/TypeImpl.java b/profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/TypeImpl.java
similarity index 100%
rename from debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/TypeImpl.java
rename to profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/TypeImpl.java
diff --git a/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/actions/Bundle.properties b/profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/actions/Bundle.properties
similarity index 100%
rename from debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/actions/Bundle.properties
rename to profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/actions/Bundle.properties
diff --git a/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/actions/ClassesCountsViewAction.java b/profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/actions/ClassesCountsViewAction.java
similarity index 100%
rename from debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/actions/ClassesCountsViewAction.java
rename to profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/actions/ClassesCountsViewAction.java
diff --git a/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/models/Bundle.properties b/profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/models/Bundle.properties
similarity index 100%
rename from debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/models/Bundle.properties
rename to profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/models/Bundle.properties
diff --git a/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/models/HeapActionsFilter.java b/profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/models/HeapActionsFilter.java
similarity index 100%
rename from debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/models/HeapActionsFilter.java
rename to profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/models/HeapActionsFilter.java
diff --git a/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/classesCounts.settings b/profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/classesCounts.settings
similarity index 100%
rename from debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/classesCounts.settings
rename to profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/classesCounts.settings
diff --git a/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/classesCounts.wstcgrp b/profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/classesCounts.wstcgrp
similarity index 100%
rename from debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/classesCounts.wstcgrp
rename to profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/classesCounts.wstcgrp
diff --git a/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/classesCounts.wstcref b/profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/classesCounts.wstcref
similarity index 100%
rename from debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/classesCounts.wstcref
rename to profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/classesCounts.wstcref
diff --git a/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/dbgInstances.settings b/profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/dbgInstances.settings
similarity index 100%
rename from debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/dbgInstances.settings
rename to profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/dbgInstances.settings
diff --git a/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/dbgInstances.wstcgrp b/profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/dbgInstances.wstcgrp
similarity index 100%
rename from debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/dbgInstances.wstcgrp
rename to profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/dbgInstances.wstcgrp
diff --git a/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/dbgInstances.wstcref b/profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/dbgInstances.wstcref
similarity index 100%
rename from debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/dbgInstances.wstcref
rename to profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/dbgInstances.wstcref
diff --git a/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/mf-layer.xml b/profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/mf-layer.xml
similarity index 100%
rename from debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/mf-layer.xml
rename to profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/resources/mf-layer.xml
diff --git a/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/views/Bundle.properties b/profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/views/Bundle.properties
similarity index 100%
rename from debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/views/Bundle.properties
rename to profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/views/Bundle.properties
diff --git a/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/views/ClassesCountsView.java b/profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/views/ClassesCountsView.java
similarity index 100%
rename from debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/views/ClassesCountsView.java
rename to profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/views/ClassesCountsView.java
diff --git a/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/views/DebuggerHeapFragmentWalker.java b/profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/views/DebuggerHeapFragmentWalker.java
similarity index 100%
rename from debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/views/DebuggerHeapFragmentWalker.java
rename to profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/views/DebuggerHeapFragmentWalker.java
diff --git a/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/views/InstancesView.java b/profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/views/InstancesView.java
similarity index 100%
rename from debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/views/InstancesView.java
rename to profiler/debugger.jpda.heapwalk/src/org/netbeans/modules/debugger/jpda/heapwalk/views/InstancesView.java
diff --git a/lib.profiler.charts/build.xml b/profiler/lib.profiler.charts/build.xml
similarity index 87%
rename from lib.profiler.charts/build.xml
rename to profiler/lib.profiler.charts/build.xml
index 5e9ddfb72b..499773bb89 100644
--- a/lib.profiler.charts/build.xml
+++ b/profiler/lib.profiler.charts/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="lib.profiler.charts">
+<project basedir="." default="build" name="profiler/lib.profiler.charts">
     <description>Builds, tests, and runs the project org.netbeans.lib.profiler.charts</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/lib.profiler.charts/manifest.mf b/profiler/lib.profiler.charts/manifest.mf
similarity index 100%
rename from lib.profiler.charts/manifest.mf
rename to profiler/lib.profiler.charts/manifest.mf
diff --git a/lib.profiler.charts/nbproject/project.properties b/profiler/lib.profiler.charts/nbproject/project.properties
similarity index 100%
rename from lib.profiler.charts/nbproject/project.properties
rename to profiler/lib.profiler.charts/nbproject/project.properties
diff --git a/lib.profiler.charts/nbproject/project.xml b/profiler/lib.profiler.charts/nbproject/project.xml
similarity index 100%
rename from lib.profiler.charts/nbproject/project.xml
rename to profiler/lib.profiler.charts/nbproject/project.xml
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/Bundle.properties b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/Bundle.properties
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/Bundle.properties
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/Bundle.properties
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartComponent.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartComponent.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartComponent.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartComponent.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartConfigurationListener.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartConfigurationListener.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartConfigurationListener.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartConfigurationListener.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartContext.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartContext.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartContext.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartContext.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartDecorator.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartDecorator.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartDecorator.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartDecorator.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartItem.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartItem.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartItem.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartItem.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartItemChange.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartItemChange.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartItemChange.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartItemChange.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartItemListener.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartItemListener.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartItemListener.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartItemListener.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartOverlay.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartOverlay.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartOverlay.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartOverlay.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartSelectionListener.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartSelectionListener.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartSelectionListener.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartSelectionListener.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartSelectionManager.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartSelectionManager.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartSelectionManager.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartSelectionManager.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartSelectionModel.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartSelectionModel.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartSelectionModel.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartSelectionModel.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/CompoundItemPainter.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/CompoundItemPainter.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/CompoundItemPainter.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/CompoundItemPainter.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ItemPainter.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ItemPainter.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ItemPainter.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ItemPainter.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ItemSelection.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ItemSelection.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ItemSelection.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ItemSelection.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ItemsListener.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ItemsListener.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ItemsListener.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ItemsListener.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ItemsModel.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ItemsModel.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ItemsModel.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ItemsModel.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/PaintersListener.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/PaintersListener.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/PaintersListener.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/PaintersListener.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/PaintersModel.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/PaintersModel.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/PaintersModel.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/PaintersModel.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/Timeline.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/Timeline.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/Timeline.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/Timeline.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisComponent.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisComponent.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisComponent.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisComponent.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisMark.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisMark.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisMark.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisMark.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisMarksComputer.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisMarksComputer.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisMarksComputer.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisMarksComputer.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisMarksPainter.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisMarksPainter.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisMarksPainter.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisMarksPainter.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/Bundle.properties b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/Bundle.properties
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/Bundle.properties
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/Bundle.properties
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/BytesAxisUtils.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/BytesAxisUtils.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/BytesAxisUtils.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/BytesAxisUtils.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/BytesMark.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/BytesMark.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/BytesMark.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/BytesMark.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/BytesMarksPainter.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/BytesMarksPainter.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/BytesMarksPainter.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/BytesMarksPainter.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/DecimalAxisUtils.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/DecimalAxisUtils.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/DecimalAxisUtils.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/DecimalAxisUtils.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/LongMark.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/LongMark.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/LongMark.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/LongMark.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/PercentLongMarksPainter.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/PercentLongMarksPainter.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/PercentLongMarksPainter.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/PercentLongMarksPainter.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/SimpleLongMarksPainter.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/SimpleLongMarksPainter.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/SimpleLongMarksPainter.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/SimpleLongMarksPainter.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/TimeAxisUtils.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/TimeAxisUtils.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/TimeAxisUtils.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/TimeAxisUtils.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/TimeMark.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/TimeMark.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/TimeMark.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/TimeMark.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/TimeMarksPainter.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/TimeMarksPainter.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/TimeMarksPainter.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/TimeMarksPainter.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/TimelineMarksComputer.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/TimelineMarksComputer.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/TimelineMarksComputer.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/TimelineMarksComputer.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/canvas/BufferedCanvasComponent.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/canvas/BufferedCanvasComponent.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/canvas/BufferedCanvasComponent.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/canvas/BufferedCanvasComponent.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/canvas/InteractiveCanvasComponent.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/canvas/InteractiveCanvasComponent.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/canvas/InteractiveCanvasComponent.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/canvas/InteractiveCanvasComponent.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/canvas/TransformableCanvasComponent.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/canvas/TransformableCanvasComponent.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/canvas/TransformableCanvasComponent.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/canvas/TransformableCanvasComponent.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/swing/CrossBorderLayout.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/swing/CrossBorderLayout.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/swing/CrossBorderLayout.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/swing/CrossBorderLayout.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/swing/LongRect.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/swing/LongRect.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/swing/LongRect.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/swing/LongRect.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/swing/RoundBorder.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/swing/RoundBorder.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/swing/RoundBorder.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/swing/RoundBorder.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/swing/Utils.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/swing/Utils.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/swing/Utils.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/swing/Utils.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/BytesXYItemMarksComputer.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/BytesXYItemMarksComputer.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/BytesXYItemMarksComputer.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/BytesXYItemMarksComputer.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/CompoundXYItemPainter.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/CompoundXYItemPainter.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/CompoundXYItemPainter.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/CompoundXYItemPainter.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/DecimalXYItemMarksComputer.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/DecimalXYItemMarksComputer.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/DecimalXYItemMarksComputer.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/DecimalXYItemMarksComputer.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/XYItem.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/XYItem.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/XYItem.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/XYItem.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/XYItemChange.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/XYItemChange.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/XYItemChange.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/XYItemChange.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/XYItemMarksComputer.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/XYItemMarksComputer.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/XYItemMarksComputer.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/XYItemMarksComputer.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/XYItemPainter.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/XYItemPainter.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/XYItemPainter.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/XYItemPainter.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/XYItemSelection.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/XYItemSelection.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/XYItemSelection.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/XYItemSelection.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/synchronous/SynchronousXYChart.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/synchronous/SynchronousXYChart.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/synchronous/SynchronousXYChart.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/synchronous/SynchronousXYChart.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/synchronous/SynchronousXYChartContext.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/synchronous/SynchronousXYChartContext.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/synchronous/SynchronousXYChartContext.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/synchronous/SynchronousXYChartContext.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/synchronous/SynchronousXYItem.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/synchronous/SynchronousXYItem.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/synchronous/SynchronousXYItem.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/synchronous/SynchronousXYItem.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/synchronous/SynchronousXYItemMarker.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/synchronous/SynchronousXYItemMarker.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/synchronous/SynchronousXYItemMarker.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/synchronous/SynchronousXYItemMarker.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/synchronous/SynchronousXYItemPainter.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/synchronous/SynchronousXYItemPainter.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/synchronous/SynchronousXYItemPainter.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/synchronous/SynchronousXYItemPainter.java
diff --git a/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/synchronous/SynchronousXYItemsModel.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/synchronous/SynchronousXYItemsModel.java
similarity index 100%
rename from lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/synchronous/SynchronousXYItemsModel.java
rename to profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/synchronous/SynchronousXYItemsModel.java
diff --git a/lib.profiler.common/build.xml b/profiler/lib.profiler.common/build.xml
similarity index 87%
rename from lib.profiler.common/build.xml
rename to profiler/lib.profiler.common/build.xml
index 902a113220..6e4cf7a56d 100644
--- a/lib.profiler.common/build.xml
+++ b/profiler/lib.profiler.common/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="lib.profiler.common">
+<project basedir="." default="build" name="profiler/lib.profiler.common">
     <description>Builds, tests, and runs the project org.netbeans.lib.profiler.common</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/lib.profiler.common/manifest.mf b/profiler/lib.profiler.common/manifest.mf
similarity index 100%
rename from lib.profiler.common/manifest.mf
rename to profiler/lib.profiler.common/manifest.mf
diff --git a/lib.profiler.common/nbproject/project.properties b/profiler/lib.profiler.common/nbproject/project.properties
similarity index 100%
rename from lib.profiler.common/nbproject/project.properties
rename to profiler/lib.profiler.common/nbproject/project.properties
diff --git a/lib.profiler.common/nbproject/project.xml b/profiler/lib.profiler.common/nbproject/project.xml
similarity index 100%
rename from lib.profiler.common/nbproject/project.xml
rename to profiler/lib.profiler.common/nbproject/project.xml
diff --git a/lib.profiler.common/src/org/netbeans/lib/profiler/common/AttachSettings.java b/profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/AttachSettings.java
similarity index 100%
rename from lib.profiler.common/src/org/netbeans/lib/profiler/common/AttachSettings.java
rename to profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/AttachSettings.java
diff --git a/lib.profiler.common/src/org/netbeans/lib/profiler/common/Bundle.properties b/profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/Bundle.properties
similarity index 100%
rename from lib.profiler.common/src/org/netbeans/lib/profiler/common/Bundle.properties
rename to profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/Bundle.properties
diff --git a/lib.profiler.common/src/org/netbeans/lib/profiler/common/CommonUtils.java b/profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/CommonUtils.java
similarity index 100%
rename from lib.profiler.common/src/org/netbeans/lib/profiler/common/CommonUtils.java
rename to profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/CommonUtils.java
diff --git a/lib.profiler.common/src/org/netbeans/lib/profiler/common/GlobalProfilingSettings.java b/profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/GlobalProfilingSettings.java
similarity index 100%
rename from lib.profiler.common/src/org/netbeans/lib/profiler/common/GlobalProfilingSettings.java
rename to profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/GlobalProfilingSettings.java
diff --git a/lib.profiler.common/src/org/netbeans/lib/profiler/common/Profiler.java b/profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/Profiler.java
similarity index 100%
rename from lib.profiler.common/src/org/netbeans/lib/profiler/common/Profiler.java
rename to profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/Profiler.java
diff --git a/lib.profiler.common/src/org/netbeans/lib/profiler/common/ProfilingSettings.java b/profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/ProfilingSettings.java
similarity index 100%
rename from lib.profiler.common/src/org/netbeans/lib/profiler/common/ProfilingSettings.java
rename to profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/ProfilingSettings.java
diff --git a/lib.profiler.common/src/org/netbeans/lib/profiler/common/ProfilingSettingsPresets.java b/profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/ProfilingSettingsPresets.java
similarity index 100%
rename from lib.profiler.common/src/org/netbeans/lib/profiler/common/ProfilingSettingsPresets.java
rename to profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/ProfilingSettingsPresets.java
diff --git a/lib.profiler.common/src/org/netbeans/lib/profiler/common/SessionSettings.java b/profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/SessionSettings.java
similarity index 100%
rename from lib.profiler.common/src/org/netbeans/lib/profiler/common/SessionSettings.java
rename to profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/SessionSettings.java
diff --git a/lib.profiler.common/src/org/netbeans/lib/profiler/common/event/ProfilingStateAdapter.java b/profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/event/ProfilingStateAdapter.java
similarity index 100%
rename from lib.profiler.common/src/org/netbeans/lib/profiler/common/event/ProfilingStateAdapter.java
rename to profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/event/ProfilingStateAdapter.java
diff --git a/lib.profiler.common/src/org/netbeans/lib/profiler/common/event/ProfilingStateEvent.java b/profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/event/ProfilingStateEvent.java
similarity index 100%
rename from lib.profiler.common/src/org/netbeans/lib/profiler/common/event/ProfilingStateEvent.java
rename to profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/event/ProfilingStateEvent.java
diff --git a/lib.profiler.common/src/org/netbeans/lib/profiler/common/event/ProfilingStateListener.java b/profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/event/ProfilingStateListener.java
similarity index 100%
rename from lib.profiler.common/src/org/netbeans/lib/profiler/common/event/ProfilingStateListener.java
rename to profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/event/ProfilingStateListener.java
diff --git a/lib.profiler.common/src/org/netbeans/lib/profiler/common/event/SimpleProfilingStateAdapter.java b/profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/event/SimpleProfilingStateAdapter.java
similarity index 100%
rename from lib.profiler.common/src/org/netbeans/lib/profiler/common/event/SimpleProfilingStateAdapter.java
rename to profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/event/SimpleProfilingStateAdapter.java
diff --git a/lib.profiler.common/src/org/netbeans/lib/profiler/common/integration/Bundle.properties b/profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/integration/Bundle.properties
similarity index 100%
rename from lib.profiler.common/src/org/netbeans/lib/profiler/common/integration/Bundle.properties
rename to profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/integration/Bundle.properties
diff --git a/lib.profiler.common/src/org/netbeans/lib/profiler/common/integration/IntegrationUtils.java b/profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/integration/IntegrationUtils.java
similarity index 100%
rename from lib.profiler.common/src/org/netbeans/lib/profiler/common/integration/IntegrationUtils.java
rename to profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/integration/IntegrationUtils.java
diff --git a/lib.profiler.ui/build.xml b/profiler/lib.profiler.ui/build.xml
similarity index 88%
rename from lib.profiler.ui/build.xml
rename to profiler/lib.profiler.ui/build.xml
index b71782800e..de9cfb2ea1 100644
--- a/lib.profiler.ui/build.xml
+++ b/profiler/lib.profiler.ui/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="lib.profiler.ui">
+<project basedir="." default="build" name="profiler/lib.profiler.ui">
     <description>Builds, tests, and runs the project org.netbeans.lib.profiler.ui</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/lib.profiler.ui/manifest.mf b/profiler/lib.profiler.ui/manifest.mf
similarity index 100%
rename from lib.profiler.ui/manifest.mf
rename to profiler/lib.profiler.ui/manifest.mf
diff --git a/lib.profiler.ui/nbproject/project.properties b/profiler/lib.profiler.ui/nbproject/project.properties
similarity index 100%
rename from lib.profiler.ui/nbproject/project.properties
rename to profiler/lib.profiler.ui/nbproject/project.properties
diff --git a/lib.profiler.ui/nbproject/project.xml b/profiler/lib.profiler.ui/nbproject/project.xml
similarity index 100%
rename from lib.profiler.ui/nbproject/project.xml
rename to profiler/lib.profiler.ui/nbproject/project.xml
diff --git a/lib.profiler.ui/src/META-INF/services/org.netbeans.lib.profiler.ui.cpu.statistics.StatisticalModuleContainer b/profiler/lib.profiler.ui/src/META-INF/services/org.netbeans.lib.profiler.ui.cpu.statistics.StatisticalModuleContainer
similarity index 100%
rename from lib.profiler.ui/src/META-INF/services/org.netbeans.lib.profiler.ui.cpu.statistics.StatisticalModuleContainer
rename to profiler/lib.profiler.ui/src/META-INF/services/org.netbeans.lib.profiler.ui.cpu.statistics.StatisticalModuleContainer
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/AppearanceController.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/AppearanceController.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/AppearanceController.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/AppearanceController.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/Bundle.properties b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/Bundle.properties
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/Bundle.properties
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/Bundle.properties
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/Formatters.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/Formatters.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/Formatters.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/Formatters.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/LiveResultsPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/LiveResultsPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/LiveResultsPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/LiveResultsPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/LiveResultsWindowContributor.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/LiveResultsWindowContributor.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/LiveResultsWindowContributor.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/LiveResultsWindowContributor.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/ResultsPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/ResultsPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/ResultsPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/ResultsPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/ResultsView.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/ResultsView.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/ResultsView.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/ResultsView.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/StringDecorator.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/StringDecorator.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/StringDecorator.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/StringDecorator.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/SwingWorker.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/SwingWorker.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/SwingWorker.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/SwingWorker.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/UIConstants.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/UIConstants.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/UIConstants.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/UIConstants.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/UIUtils.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/UIUtils.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/UIUtils.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/UIUtils.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/AbstractBarChartModel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/AbstractBarChartModel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/AbstractBarChartModel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/AbstractBarChartModel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/AbstractPieChartModel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/AbstractPieChartModel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/AbstractPieChartModel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/AbstractPieChartModel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/BarChart.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/BarChart.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/BarChart.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/BarChart.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/BarChartModel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/BarChartModel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/BarChartModel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/BarChartModel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/Bundle.properties b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/Bundle.properties
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/Bundle.properties
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/Bundle.properties
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/ChartActionListener.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/ChartActionListener.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/ChartActionListener.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/ChartActionListener.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/ChartModelListener.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/ChartModelListener.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/ChartModelListener.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/ChartModelListener.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/DateTimeAxisUtils.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/DateTimeAxisUtils.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/DateTimeAxisUtils.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/DateTimeAxisUtils.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/DecimalAxisUtils.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/DecimalAxisUtils.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/DecimalAxisUtils.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/DecimalAxisUtils.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/DynamicPieChartModel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/DynamicPieChartModel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/DynamicPieChartModel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/DynamicPieChartModel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/PieChart.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/PieChart.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/PieChart.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/PieChart.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/PieChartModel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/PieChartModel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/PieChartModel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/PieChartModel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/Bundle.properties b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/Bundle.properties
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/Bundle.properties
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/Bundle.properties
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerGCXYItem.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerGCXYItem.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerGCXYItem.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerGCXYItem.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerGCXYItemPainter.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerGCXYItemPainter.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerGCXYItemPainter.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerGCXYItemPainter.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerXYChart.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerXYChart.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerXYChart.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerXYChart.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerXYItemPainter.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerXYItemPainter.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerXYItemPainter.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerXYItemPainter.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerXYSelectionOverlay.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerXYSelectionOverlay.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerXYSelectionOverlay.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerXYSelectionOverlay.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerXYTooltipModel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerXYTooltipModel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerXYTooltipModel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerXYTooltipModel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerXYTooltipOverlay.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerXYTooltipOverlay.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerXYTooltipOverlay.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerXYTooltipOverlay.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerXYTooltipPainter.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerXYTooltipPainter.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerXYTooltipPainter.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/xy/ProfilerXYTooltipPainter.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/AnimatedContainer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/AnimatedContainer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/AnimatedContainer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/AnimatedContainer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/AnimationLayout.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/AnimationLayout.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/AnimationLayout.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/AnimationLayout.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/Animator.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/Animator.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/Animator.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/Animator.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/Bundle.properties b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/Bundle.properties
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/Bundle.properties
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/Bundle.properties
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/CellTipAware.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/CellTipAware.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/CellTipAware.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/CellTipAware.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/CellTipManager.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/CellTipManager.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/CellTipManager.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/CellTipManager.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/CloseButton.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/CloseButton.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/CloseButton.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/CloseButton.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ColorIcon.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ColorIcon.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ColorIcon.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ColorIcon.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ComponentMorpher.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ComponentMorpher.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ComponentMorpher.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ComponentMorpher.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ComponentMorpher2.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ComponentMorpher2.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ComponentMorpher2.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ComponentMorpher2.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/CustomTaskButtonBorder.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/CustomTaskButtonBorder.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/CustomTaskButtonBorder.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/CustomTaskButtonBorder.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/DiscreteProgress.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/DiscreteProgress.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/DiscreteProgress.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/DiscreteProgress.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/EqualFlowLayout.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/EqualFlowLayout.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/EqualFlowLayout.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/EqualFlowLayout.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/FilterComponent.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/FilterComponent.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/FilterComponent.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/FilterComponent.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/FlatToolBar.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/FlatToolBar.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/FlatToolBar.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/FlatToolBar.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/HTMLLabel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/HTMLLabel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/HTMLLabel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/HTMLLabel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/HTMLTextArea.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/HTMLTextArea.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/HTMLTextArea.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/HTMLTextArea.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ImageBlenderPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ImageBlenderPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ImageBlenderPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ImageBlenderPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ImagePanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ImagePanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ImagePanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ImagePanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JAntiLabel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JAntiLabel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JAntiLabel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JAntiLabel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JCheckTree.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JCheckTree.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JCheckTree.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JCheckTree.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JCompoundSplitPane.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JCompoundSplitPane.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JCompoundSplitPane.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JCompoundSplitPane.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JExtendedComboBox.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JExtendedComboBox.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JExtendedComboBox.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JExtendedComboBox.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JExtendedRadioButton.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JExtendedRadioButton.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JExtendedRadioButton.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JExtendedRadioButton.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JExtendedSpinner.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JExtendedSpinner.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JExtendedSpinner.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JExtendedSpinner.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JExtendedSplitPane.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JExtendedSplitPane.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JExtendedSplitPane.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JExtendedSplitPane.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JExtendedTable.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JExtendedTable.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JExtendedTable.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JExtendedTable.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JExtendedTree.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JExtendedTree.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JExtendedTree.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JExtendedTree.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JTitledPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JTitledPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JTitledPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JTitledPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JTreeTable.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JTreeTable.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JTreeTable.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/JTreeTable.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/LazyComboBox.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/LazyComboBox.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/LazyComboBox.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/LazyComboBox.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/NoCaret.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/NoCaret.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/NoCaret.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/NoCaret.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ProfilerToolbar.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ProfilerToolbar.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ProfilerToolbar.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ProfilerToolbar.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/SnippetPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/SnippetPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/SnippetPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/SnippetPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ThinBevelBorder.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ThinBevelBorder.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ThinBevelBorder.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ThinBevelBorder.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/VerticalLayout.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/VerticalLayout.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/VerticalLayout.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/VerticalLayout.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/XPStyleBorder.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/XPStyleBorder.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/XPStyleBorder.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/XPStyleBorder.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/BooleanTableCellRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/BooleanTableCellRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/BooleanTableCellRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/BooleanTableCellRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/ClassNameTableCellRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/ClassNameTableCellRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/ClassNameTableCellRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/ClassNameTableCellRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/CustomBarCellRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/CustomBarCellRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/CustomBarCellRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/CustomBarCellRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/CustomSortableHeaderRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/CustomSortableHeaderRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/CustomSortableHeaderRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/CustomSortableHeaderRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/DiffBarCellRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/DiffBarCellRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/DiffBarCellRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/DiffBarCellRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/EnhancedTableCellRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/EnhancedTableCellRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/EnhancedTableCellRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/EnhancedTableCellRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/ExtendedTableModel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/ExtendedTableModel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/ExtendedTableModel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/ExtendedTableModel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/HTMLLabelTableCellRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/HTMLLabelTableCellRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/HTMLLabelTableCellRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/HTMLLabelTableCellRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/JExtendedTablePanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/JExtendedTablePanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/JExtendedTablePanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/JExtendedTablePanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/LabelBracketTableCellRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/LabelBracketTableCellRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/LabelBracketTableCellRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/LabelBracketTableCellRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/LabelTableCellRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/LabelTableCellRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/LabelTableCellRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/LabelTableCellRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/MethodNameTableCellRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/MethodNameTableCellRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/MethodNameTableCellRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/MethodNameTableCellRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/SortableTableModel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/SortableTableModel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/SortableTableModel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/SortableTableModel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/TableCellRendererPersistent.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/TableCellRendererPersistent.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/TableCellRendererPersistent.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/table/TableCellRendererPersistent.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/tree/CheckTreeCellRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/tree/CheckTreeCellRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/tree/CheckTreeCellRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/tree/CheckTreeCellRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/tree/CheckTreeNode.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/tree/CheckTreeNode.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/tree/CheckTreeNode.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/tree/CheckTreeNode.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/tree/EnhancedTreeCellRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/tree/EnhancedTreeCellRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/tree/EnhancedTreeCellRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/tree/EnhancedTreeCellRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/tree/MethodNameTreeCellRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/tree/MethodNameTreeCellRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/tree/MethodNameTreeCellRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/tree/MethodNameTreeCellRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/tree/TreeCellRendererPersistent.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/tree/TreeCellRendererPersistent.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/tree/TreeCellRendererPersistent.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/tree/TreeCellRendererPersistent.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/treetable/AbstractTreeTableModel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/treetable/AbstractTreeTableModel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/treetable/AbstractTreeTableModel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/treetable/AbstractTreeTableModel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/treetable/ExtendedTreeTableModel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/treetable/ExtendedTreeTableModel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/treetable/ExtendedTreeTableModel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/treetable/ExtendedTreeTableModel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/treetable/JTreeTablePanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/treetable/JTreeTablePanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/treetable/JTreeTablePanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/treetable/JTreeTablePanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/treetable/TreeTableModel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/treetable/TreeTableModel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/treetable/TreeTableModel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/treetable/TreeTableModel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/treetable/TreeTableModelAdapter.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/treetable/TreeTableModelAdapter.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/treetable/TreeTableModelAdapter.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/treetable/TreeTableModelAdapter.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/Bundle.properties b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/Bundle.properties
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/Bundle.properties
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/Bundle.properties
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CCTDisplay.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CCTDisplay.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CCTDisplay.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CCTDisplay.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUJavaNameRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUJavaNameRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUJavaNameRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUJavaNameRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUResUserActionsHandler.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUResUserActionsHandler.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUResUserActionsHandler.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUResUserActionsHandler.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUResultsPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUResultsPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUResultsPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUResultsPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUSelectionHandler.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUSelectionHandler.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUSelectionHandler.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUSelectionHandler.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUTableView.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUTableView.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUTableView.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUTableView.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUTreeTableView.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUTreeTableView.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUTreeTableView.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUTreeTableView.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUView.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUView.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUView.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CPUView.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CodeRegionLivePanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CodeRegionLivePanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CodeRegionLivePanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CodeRegionLivePanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CodeRegionSnapshotPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CodeRegionSnapshotPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CodeRegionSnapshotPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CodeRegionSnapshotPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CombinedPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CombinedPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CombinedPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/CombinedPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/DiffCCTDisplay.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/DiffCCTDisplay.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/DiffCCTDisplay.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/DiffCCTDisplay.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/DiffFlatProfilePanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/DiffFlatProfilePanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/DiffFlatProfilePanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/DiffFlatProfilePanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/FlatProfilePanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/FlatProfilePanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/FlatProfilePanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/FlatProfilePanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/LiveCPUView.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/LiveCPUView.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/LiveCPUView.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/LiveCPUView.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/LiveCPUViewUpdater.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/LiveCPUViewUpdater.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/LiveCPUViewUpdater.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/LiveCPUViewUpdater.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/LiveFlatProfileCollectorPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/LiveFlatProfileCollectorPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/LiveFlatProfileCollectorPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/LiveFlatProfileCollectorPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/LiveFlatProfilePanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/LiveFlatProfilePanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/LiveFlatProfilePanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/LiveFlatProfilePanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/ReverseCallGraphPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/ReverseCallGraphPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/ReverseCallGraphPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/ReverseCallGraphPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/ScreenshotProvider.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/ScreenshotProvider.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/ScreenshotProvider.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/ScreenshotProvider.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/SnapshotCPUResultsPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/SnapshotCPUResultsPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/SnapshotCPUResultsPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/SnapshotCPUResultsPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/SnapshotCPUView.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/SnapshotCPUView.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/SnapshotCPUView.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/SnapshotCPUView.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/SnapshotFlatProfilePanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/SnapshotFlatProfilePanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/SnapshotFlatProfilePanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/SnapshotFlatProfilePanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/StatisticsPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/StatisticsPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/StatisticsPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/StatisticsPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/SubtreeCallGraphPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/SubtreeCallGraphPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/SubtreeCallGraphPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/SubtreeCallGraphPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/ThreadsSelector.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/ThreadsSelector.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/ThreadsSelector.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/ThreadsSelector.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/statistics/StatisticalModule.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/statistics/StatisticalModule.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/statistics/StatisticalModule.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/statistics/StatisticalModule.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/statistics/StatisticalModuleContainer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/statistics/StatisticalModuleContainer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/statistics/StatisticalModuleContainer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/statistics/StatisticalModuleContainer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/statistics/TimingData.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/statistics/TimingData.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/statistics/TimingData.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/statistics/TimingData.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/AllocationsHistoryGraphPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/AllocationsHistoryGraphPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/AllocationsHistoryGraphPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/AllocationsHistoryGraphPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/Bundle.properties b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/Bundle.properties
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/Bundle.properties
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/Bundle.properties
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/CPUGraphPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/CPUGraphPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/CPUGraphPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/CPUGraphPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/ColorFactory.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/ColorFactory.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/ColorFactory.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/ColorFactory.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/GraphPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/GraphPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/GraphPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/GraphPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/GraphsUI.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/GraphsUI.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/GraphsUI.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/GraphsUI.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/LivenessHistoryGraphPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/LivenessHistoryGraphPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/LivenessHistoryGraphPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/LivenessHistoryGraphPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/MemoryGraphPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/MemoryGraphPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/MemoryGraphPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/MemoryGraphPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/SurvivingGenerationsGraphPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/SurvivingGenerationsGraphPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/SurvivingGenerationsGraphPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/SurvivingGenerationsGraphPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/ThreadsGraphPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/ThreadsGraphPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/ThreadsGraphPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/ThreadsGraphPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/XYBackground.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/XYBackground.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/XYBackground.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/graphs/XYBackground.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/Bundle.properties b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/Bundle.properties
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/Bundle.properties
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/Bundle.properties
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/JDBCJavaNameRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/JDBCJavaNameRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/JDBCJavaNameRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/JDBCJavaNameRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/JDBCTreeTableView.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/JDBCTreeTableView.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/JDBCTreeTableView.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/JDBCTreeTableView.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/JDBCView.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/JDBCView.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/JDBCView.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/JDBCView.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/LiveJDBCView.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/LiveJDBCView.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/LiveJDBCView.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/LiveJDBCView.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/LiveJDBCViewUpdater.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/LiveJDBCViewUpdater.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/LiveJDBCViewUpdater.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/LiveJDBCViewUpdater.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/SQLFilterPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/SQLFilterPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/SQLFilterPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/SQLFilterPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/SQLFormatter.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/SQLFormatter.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/SQLFormatter.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/SQLFormatter.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/SnapshotJDBCView.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/SnapshotJDBCView.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/SnapshotJDBCView.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/SnapshotJDBCView.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/TablesSelector.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/TablesSelector.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/TablesSelector.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/jdbc/TablesSelector.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/locks/Bundle.properties b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/locks/Bundle.properties
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/locks/Bundle.properties
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/locks/Bundle.properties
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/locks/LockContentionPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/locks/LockContentionPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/locks/LockContentionPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/locks/LockContentionPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/locks/LockContentionRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/locks/LockContentionRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/locks/LockContentionRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/locks/LockContentionRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/locks/LockContentionTreeCellRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/locks/LockContentionTreeCellRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/locks/LockContentionTreeCellRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/locks/LockContentionTreeCellRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/ActionsHandler.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/ActionsHandler.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/ActionsHandler.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/ActionsHandler.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/AllocResultsPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/AllocResultsPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/AllocResultsPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/AllocResultsPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/AllocTableView.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/AllocTableView.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/AllocTableView.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/AllocTableView.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/AllocTreeTableView.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/AllocTreeTableView.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/AllocTreeTableView.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/AllocTreeTableView.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/Bundle.properties b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/Bundle.properties
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/Bundle.properties
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/Bundle.properties
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/ClassHistoryActionsHandler.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/ClassHistoryActionsHandler.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/ClassHistoryActionsHandler.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/ClassHistoryActionsHandler.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/ClassHistoryModels.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/ClassHistoryModels.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/ClassHistoryModels.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/ClassHistoryModels.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/DiffAllocResultsPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/DiffAllocResultsPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/DiffAllocResultsPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/DiffAllocResultsPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/DiffLivenessResultsPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/DiffLivenessResultsPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/DiffLivenessResultsPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/DiffLivenessResultsPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/DiffSampledResultsPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/DiffSampledResultsPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/DiffSampledResultsPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/DiffSampledResultsPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveAllocResultsPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveAllocResultsPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveAllocResultsPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveAllocResultsPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveLivenessResultsPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveLivenessResultsPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveLivenessResultsPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveLivenessResultsPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveMemoryView.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveMemoryView.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveMemoryView.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveMemoryView.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveMemoryViewUpdater.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveMemoryViewUpdater.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveMemoryViewUpdater.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveMemoryViewUpdater.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveReverseMemCallGraphPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveReverseMemCallGraphPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveReverseMemCallGraphPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveReverseMemCallGraphPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveSampledResultsPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveSampledResultsPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveSampledResultsPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveSampledResultsPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LivenessResultsPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LivenessResultsPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LivenessResultsPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LivenessResultsPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LivenessTableView.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LivenessTableView.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LivenessTableView.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LivenessTableView.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LivenessTreeTableView.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LivenessTreeTableView.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LivenessTreeTableView.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LivenessTreeTableView.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/MemoryCCTTreeModel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/MemoryCCTTreeModel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/MemoryCCTTreeModel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/MemoryCCTTreeModel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/MemoryJavaNameRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/MemoryJavaNameRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/MemoryJavaNameRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/MemoryJavaNameRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/MemoryResUserActionsHandler.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/MemoryResUserActionsHandler.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/MemoryResUserActionsHandler.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/MemoryResUserActionsHandler.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/MemoryResultsPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/MemoryResultsPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/MemoryResultsPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/MemoryResultsPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/MemoryView.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/MemoryView.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/MemoryView.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/MemoryView.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/ReverseMemCallGraphPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/ReverseMemCallGraphPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/ReverseMemCallGraphPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/ReverseMemCallGraphPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SampledResultsPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SampledResultsPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SampledResultsPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SampledResultsPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SampledTableView.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SampledTableView.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SampledTableView.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SampledTableView.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SnapshotAllocResultsPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SnapshotAllocResultsPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SnapshotAllocResultsPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SnapshotAllocResultsPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SnapshotLivenessResultsPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SnapshotLivenessResultsPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SnapshotLivenessResultsPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SnapshotLivenessResultsPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SnapshotMemoryView.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SnapshotMemoryView.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SnapshotMemoryView.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SnapshotMemoryView.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SnapshotReverseMemCallGraphPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SnapshotReverseMemCallGraphPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SnapshotReverseMemCallGraphPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SnapshotReverseMemCallGraphPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SnapshotSampledResultsPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SnapshotSampledResultsPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SnapshotSampledResultsPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SnapshotSampledResultsPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/monitor/MonitorView.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/monitor/MonitorView.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/monitor/MonitorView.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/monitor/MonitorView.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/monitor/VMTelemetryModels.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/monitor/VMTelemetryModels.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/monitor/VMTelemetryModels.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/monitor/VMTelemetryModels.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/results/Bundle.properties b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/results/Bundle.properties
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/results/Bundle.properties
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/results/Bundle.properties
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/results/ColoredFilter.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/results/ColoredFilter.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/results/ColoredFilter.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/results/ColoredFilter.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/results/DataView.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/results/DataView.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/results/DataView.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/results/DataView.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/results/PackageColorer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/results/PackageColorer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/results/PackageColorer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/results/PackageColorer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ActionPopupButton.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ActionPopupButton.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ActionPopupButton.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ActionPopupButton.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/Bundle.properties b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/Bundle.properties
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/Bundle.properties
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/Bundle.properties
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/EditableHistoryCombo.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/EditableHistoryCombo.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/EditableHistoryCombo.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/EditableHistoryCombo.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ExportUtils.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ExportUtils.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ExportUtils.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ExportUtils.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/FilterUtils.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/FilterUtils.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/FilterUtils.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/FilterUtils.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/FilteringToolbar.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/FilteringToolbar.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/FilteringToolbar.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/FilteringToolbar.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/GenericToolbar.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/GenericToolbar.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/GenericToolbar.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/GenericToolbar.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/GrayLabel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/GrayLabel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/GrayLabel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/GrayLabel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/HeaderComponent.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/HeaderComponent.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/HeaderComponent.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/HeaderComponent.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/InvisibleToolbar.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/InvisibleToolbar.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/InvisibleToolbar.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/InvisibleToolbar.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/MultiButtonGroup.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/MultiButtonGroup.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/MultiButtonGroup.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/MultiButtonGroup.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/PopupButton.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/PopupButton.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/PopupButton.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/PopupButton.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerColumnModel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerColumnModel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerColumnModel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerColumnModel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerPopup.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerPopup.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerPopup.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerPopup.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerPopupMenu.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerPopupMenu.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerPopupMenu.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerPopupMenu.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerRowSorter.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerRowSorter.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerRowSorter.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerRowSorter.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTable.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTable.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTable.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTable.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTableActions.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTableActions.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTableActions.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTableActions.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTableContainer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTableContainer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTableContainer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTableContainer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTableHover.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTableHover.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTableHover.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTableHover.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTableHovers.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTableHovers.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTableHovers.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTableHovers.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTreeTable.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTreeTable.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTreeTable.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTreeTable.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTreeTableModel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTreeTableModel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTreeTableModel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTreeTableModel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/SearchUtils.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/SearchUtils.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/SearchUtils.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/SearchUtils.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/SmallButton.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/SmallButton.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/SmallButton.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/SmallButton.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/StayOpenPopupMenu.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/StayOpenPopupMenu.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/StayOpenPopupMenu.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/StayOpenPopupMenu.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/TextArea.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/TextArea.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/TextArea.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/TextArea.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/BarRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/BarRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/BarRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/BarRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/BaseRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/BaseRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/BaseRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/BaseRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/CheckBoxRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/CheckBoxRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/CheckBoxRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/CheckBoxRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/FormattedLabelRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/FormattedLabelRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/FormattedLabelRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/FormattedLabelRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/HideableBarRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/HideableBarRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/HideableBarRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/HideableBarRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/JavaNameRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/JavaNameRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/JavaNameRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/JavaNameRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/LabelRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/LabelRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/LabelRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/LabelRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/McsTimeRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/McsTimeRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/McsTimeRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/McsTimeRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/Movable.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/Movable.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/Movable.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/Movable.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/MultiRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/MultiRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/MultiRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/MultiRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/NormalBoldGrayRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/NormalBoldGrayRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/NormalBoldGrayRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/NormalBoldGrayRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/NumberPercentRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/NumberPercentRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/NumberPercentRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/NumberPercentRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/NumberRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/NumberRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/NumberRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/NumberRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/PercentRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/PercentRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/PercentRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/PercentRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/ProfilerRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/ProfilerRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/ProfilerRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/ProfilerRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/RelativeRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/RelativeRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/RelativeRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/renderer/RelativeRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/Bundle.properties b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/Bundle.properties
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/Bundle.properties
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/Bundle.properties
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/NameStateRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/NameStateRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/NameStateRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/NameStateRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ThreadStateIcon.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ThreadStateIcon.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ThreadStateIcon.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ThreadStateIcon.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ThreadTimeRelRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ThreadTimeRelRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ThreadTimeRelRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ThreadTimeRelRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ThreadsPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ThreadsPanel.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ThreadsPanel.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ThreadsPanel.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/TimelineHeaderRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/TimelineHeaderRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/TimelineHeaderRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/TimelineHeaderRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/TimelineRenderer.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/TimelineRenderer.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/TimelineRenderer.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/TimelineRenderer.java
diff --git a/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ViewManager.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ViewManager.java
similarity index 100%
rename from lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ViewManager.java
rename to profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ViewManager.java
diff --git a/lib.profiler.ui/test/unit/src/org/netbeans/lib/profiler/ui/SwingWorkerTest.java b/profiler/lib.profiler.ui/test/unit/src/org/netbeans/lib/profiler/ui/SwingWorkerTest.java
similarity index 100%
rename from lib.profiler.ui/test/unit/src/org/netbeans/lib/profiler/ui/SwingWorkerTest.java
rename to profiler/lib.profiler.ui/test/unit/src/org/netbeans/lib/profiler/ui/SwingWorkerTest.java
diff --git a/lib.profiler/build.xml b/profiler/lib.profiler/build.xml
similarity index 97%
rename from lib.profiler/build.xml
rename to profiler/lib.profiler/build.xml
index e6c6d8b3d7..dad25f86f0 100644
--- a/lib.profiler/build.xml
+++ b/profiler/lib.profiler/build.xml
@@ -19,9 +19,9 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="lib.profiler">
+<project basedir="." default="build" name="profiler/lib.profiler">
     <description>Builds, tests, and runs the project org.netbeans.lib.profiler</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 
     <property name="profiler.cluster" value="./release"/>
     <target name="-process.release.files">
diff --git a/lib.profiler/external/binaries-list b/profiler/lib.profiler/external/binaries-list
similarity index 100%
rename from lib.profiler/external/binaries-list
rename to profiler/lib.profiler/external/binaries-list
diff --git a/lib.profiler/external/profiler-external-binaries-8.2-license.txt b/profiler/lib.profiler/external/profiler-external-binaries-8.2-license.txt
similarity index 100%
rename from lib.profiler/external/profiler-external-binaries-8.2-license.txt
rename to profiler/lib.profiler/external/profiler-external-binaries-8.2-license.txt
diff --git a/lib.profiler/licenseinfo.xml b/profiler/lib.profiler/licenseinfo.xml
similarity index 100%
rename from lib.profiler/licenseinfo.xml
rename to profiler/lib.profiler/licenseinfo.xml
diff --git a/lib.profiler/manifest.mf b/profiler/lib.profiler/manifest.mf
similarity index 100%
rename from lib.profiler/manifest.mf
rename to profiler/lib.profiler/manifest.mf
diff --git a/lib.profiler/native/build/buildnative-hpux.sh b/profiler/lib.profiler/native/build/buildnative-hpux.sh
similarity index 100%
rename from lib.profiler/native/build/buildnative-hpux.sh
rename to profiler/lib.profiler/native/build/buildnative-hpux.sh
diff --git a/lib.profiler/native/build/buildnative-hpux64.sh b/profiler/lib.profiler/native/build/buildnative-hpux64.sh
similarity index 100%
rename from lib.profiler/native/build/buildnative-hpux64.sh
rename to profiler/lib.profiler/native/build/buildnative-hpux64.sh
diff --git a/lib.profiler/native/build/buildnative-linux-cvm.sh b/profiler/lib.profiler/native/build/buildnative-linux-cvm.sh
similarity index 100%
rename from lib.profiler/native/build/buildnative-linux-cvm.sh
rename to profiler/lib.profiler/native/build/buildnative-linux-cvm.sh
diff --git a/lib.profiler/native/build/buildnative-linux.sh b/profiler/lib.profiler/native/build/buildnative-linux.sh
similarity index 100%
rename from lib.profiler/native/build/buildnative-linux.sh
rename to profiler/lib.profiler/native/build/buildnative-linux.sh
diff --git a/lib.profiler/native/build/buildnative-linux64.sh b/profiler/lib.profiler/native/build/buildnative-linux64.sh
similarity index 100%
rename from lib.profiler/native/build/buildnative-linux64.sh
rename to profiler/lib.profiler/native/build/buildnative-linux64.sh
diff --git a/lib.profiler/native/build/buildnative-linuxarm.sh b/profiler/lib.profiler/native/build/buildnative-linuxarm.sh
similarity index 100%
rename from lib.profiler/native/build/buildnative-linuxarm.sh
rename to profiler/lib.profiler/native/build/buildnative-linuxarm.sh
diff --git a/lib.profiler/native/build/buildnative-mac.sh b/profiler/lib.profiler/native/build/buildnative-mac.sh
similarity index 100%
rename from lib.profiler/native/build/buildnative-mac.sh
rename to profiler/lib.profiler/native/build/buildnative-mac.sh
diff --git a/lib.profiler/native/build/buildnative-solaris-cvm.sh b/profiler/lib.profiler/native/build/buildnative-solaris-cvm.sh
similarity index 100%
rename from lib.profiler/native/build/buildnative-solaris-cvm.sh
rename to profiler/lib.profiler/native/build/buildnative-solaris-cvm.sh
diff --git a/lib.profiler/native/build/buildnative-solaris.sh b/profiler/lib.profiler/native/build/buildnative-solaris.sh
similarity index 100%
rename from lib.profiler/native/build/buildnative-solaris.sh
rename to profiler/lib.profiler/native/build/buildnative-solaris.sh
diff --git a/lib.profiler/native/build/buildnative-solaris64.sh b/profiler/lib.profiler/native/build/buildnative-solaris64.sh
similarity index 100%
rename from lib.profiler/native/build/buildnative-solaris64.sh
rename to profiler/lib.profiler/native/build/buildnative-solaris64.sh
diff --git a/lib.profiler/native/build/buildnative-windows-15.bat b/profiler/lib.profiler/native/build/buildnative-windows-15.bat
similarity index 100%
rename from lib.profiler/native/build/buildnative-windows-15.bat
rename to profiler/lib.profiler/native/build/buildnative-windows-15.bat
diff --git a/lib.profiler/native/build/buildnative-windows-16.bat b/profiler/lib.profiler/native/build/buildnative-windows-16.bat
similarity index 100%
rename from lib.profiler/native/build/buildnative-windows-16.bat
rename to profiler/lib.profiler/native/build/buildnative-windows-16.bat
diff --git a/lib.profiler/native/build/buildnative-windows-cvm-arm.bat b/profiler/lib.profiler/native/build/buildnative-windows-cvm-arm.bat
similarity index 100%
rename from lib.profiler/native/build/buildnative-windows-cvm-arm.bat
rename to profiler/lib.profiler/native/build/buildnative-windows-cvm-arm.bat
diff --git a/lib.profiler/native/build/buildnative-windows-cvm.bat b/profiler/lib.profiler/native/build/buildnative-windows-cvm.bat
similarity index 100%
rename from lib.profiler/native/build/buildnative-windows-cvm.bat
rename to profiler/lib.profiler/native/build/buildnative-windows-cvm.bat
diff --git a/lib.profiler/native/build/buildnative-windows64-15.bat b/profiler/lib.profiler/native/build/buildnative-windows64-15.bat
similarity index 100%
rename from lib.profiler/native/build/buildnative-windows64-15.bat
rename to profiler/lib.profiler/native/build/buildnative-windows64-15.bat
diff --git a/lib.profiler/native/build/buildnative-windows64-16.bat b/profiler/lib.profiler/native/build/buildnative-windows64-16.bat
similarity index 100%
rename from lib.profiler/native/build/buildnative-windows64-16.bat
rename to profiler/lib.profiler/native/build/buildnative-windows64-16.bat
diff --git a/lib.profiler/native/build/generate-headers-15.bat b/profiler/lib.profiler/native/build/generate-headers-15.bat
similarity index 100%
rename from lib.profiler/native/build/generate-headers-15.bat
rename to profiler/lib.profiler/native/build/generate-headers-15.bat
diff --git a/lib.profiler/native/src-jdk15/Classes.c b/profiler/lib.profiler/native/src-jdk15/Classes.c
similarity index 100%
rename from lib.profiler/native/src-jdk15/Classes.c
rename to profiler/lib.profiler/native/src-jdk15/Classes.c
diff --git a/lib.profiler/native/src-jdk15/GC.c b/profiler/lib.profiler/native/src-jdk15/GC.c
similarity index 100%
rename from lib.profiler/native/src-jdk15/GC.c
rename to profiler/lib.profiler/native/src-jdk15/GC.c
diff --git a/lib.profiler/native/src-jdk15/HeapDump.c b/profiler/lib.profiler/native/src-jdk15/HeapDump.c
similarity index 100%
rename from lib.profiler/native/src-jdk15/HeapDump.c
rename to profiler/lib.profiler/native/src-jdk15/HeapDump.c
diff --git a/lib.profiler/native/src-jdk15/Stacks.c b/profiler/lib.profiler/native/src-jdk15/Stacks.c
similarity index 100%
rename from lib.profiler/native/src-jdk15/Stacks.c
rename to profiler/lib.profiler/native/src-jdk15/Stacks.c
diff --git a/lib.profiler/native/src-jdk15/Threads.c b/profiler/lib.profiler/native/src-jdk15/Threads.c
similarity index 100%
rename from lib.profiler/native/src-jdk15/Threads.c
rename to profiler/lib.profiler/native/src-jdk15/Threads.c
diff --git a/lib.profiler/native/src-jdk15/Threads.h b/profiler/lib.profiler/native/src-jdk15/Threads.h
similarity index 100%
rename from lib.profiler/native/src-jdk15/Threads.h
rename to profiler/lib.profiler/native/src-jdk15/Threads.h
diff --git a/lib.profiler/native/src-jdk15/Timers.c b/profiler/lib.profiler/native/src-jdk15/Timers.c
similarity index 100%
rename from lib.profiler/native/src-jdk15/Timers.c
rename to profiler/lib.profiler/native/src-jdk15/Timers.c
diff --git a/lib.profiler/native/src-jdk15/attach.c b/profiler/lib.profiler/native/src-jdk15/attach.c
similarity index 100%
rename from lib.profiler/native/src-jdk15/attach.c
rename to profiler/lib.profiler/native/src-jdk15/attach.c
diff --git a/lib.profiler/native/src-jdk15/class_file_cache.c b/profiler/lib.profiler/native/src-jdk15/class_file_cache.c
similarity index 100%
rename from lib.profiler/native/src-jdk15/class_file_cache.c
rename to profiler/lib.profiler/native/src-jdk15/class_file_cache.c
diff --git a/lib.profiler/native/src-jdk15/common_functions.c b/profiler/lib.profiler/native/src-jdk15/common_functions.c
similarity index 100%
rename from lib.profiler/native/src-jdk15/common_functions.c
rename to profiler/lib.profiler/native/src-jdk15/common_functions.c
diff --git a/lib.profiler/native/src-jdk15/common_functions.h b/profiler/lib.profiler/native/src-jdk15/common_functions.h
similarity index 100%
rename from lib.profiler/native/src-jdk15/common_functions.h
rename to profiler/lib.profiler/native/src-jdk15/common_functions.h
diff --git a/lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_Classes.h b/profiler/lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_Classes.h
similarity index 100%
rename from lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_Classes.h
rename to profiler/lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_Classes.h
diff --git a/lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_Classes_RedefineException.h b/profiler/lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_Classes_RedefineException.h
similarity index 100%
rename from lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_Classes_RedefineException.h
rename to profiler/lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_Classes_RedefineException.h
diff --git a/lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_GC.h b/profiler/lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_GC.h
similarity index 100%
rename from lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_GC.h
rename to profiler/lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_GC.h
diff --git a/lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_HeapDump.h b/profiler/lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_HeapDump.h
similarity index 100%
rename from lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_HeapDump.h
rename to profiler/lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_HeapDump.h
diff --git a/lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_Stacks.h b/profiler/lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_Stacks.h
similarity index 100%
rename from lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_Stacks.h
rename to profiler/lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_Stacks.h
diff --git a/lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_Threads.h b/profiler/lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_Threads.h
similarity index 100%
rename from lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_Threads.h
rename to profiler/lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_Threads.h
diff --git a/lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_Timers.h b/profiler/lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_Timers.h
similarity index 100%
rename from lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_Timers.h
rename to profiler/lib.profiler/native/src-jdk15/org_netbeans_lib_profiler_server_system_Timers.h
diff --git a/lib.profiler/native/src-jdk15/windows/version.h b/profiler/lib.profiler/native/src-jdk15/windows/version.h
similarity index 100%
rename from lib.profiler/native/src-jdk15/windows/version.h
rename to profiler/lib.profiler/native/src-jdk15/windows/version.h
diff --git a/lib.profiler/native/src-jdk15/windows/version.rc b/profiler/lib.profiler/native/src-jdk15/windows/version.rc
similarity index 100%
rename from lib.profiler/native/src-jdk15/windows/version.rc
rename to profiler/lib.profiler/native/src-jdk15/windows/version.rc
diff --git a/lib.profiler/nbproject/project.properties b/profiler/lib.profiler/nbproject/project.properties
similarity index 100%
rename from lib.profiler/nbproject/project.properties
rename to profiler/lib.profiler/nbproject/project.properties
diff --git a/lib.profiler/nbproject/project.xml b/profiler/lib.profiler/nbproject/project.xml
similarity index 100%
rename from lib.profiler/nbproject/project.xml
rename to profiler/lib.profiler/nbproject/project.xml
diff --git a/lib.profiler/release/remote-pack-defs/README.txt b/profiler/lib.profiler/release/remote-pack-defs/README.txt
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/README.txt
rename to profiler/lib.profiler/release/remote-pack-defs/README.txt
diff --git a/lib.profiler/release/remote-pack-defs/build.xml b/profiler/lib.profiler/release/remote-pack-defs/build.xml
similarity index 99%
rename from lib.profiler/release/remote-pack-defs/build.xml
rename to profiler/lib.profiler/release/remote-pack-defs/build.xml
index 1c549ca081..b1974b8625 100644
--- a/lib.profiler/release/remote-pack-defs/build.xml
+++ b/profiler/lib.profiler/release/remote-pack-defs/build.xml
@@ -23,7 +23,7 @@
 
 <project name="remote-packs" basedir="." default="profiler-server-all">
   <!--
-  <import file="../../../nbbuild/templates/projectized.xml"/>
+  <import file="../../../../nbbuild/templates/projectized.xml"/>
   -->
   
   <property name="lib.dir" value="${cluster}/lib"/>
diff --git a/lib.profiler/release/remote-pack-defs/calibrate-15.bat b/profiler/lib.profiler/release/remote-pack-defs/calibrate-15.bat
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/calibrate-15.bat
rename to profiler/lib.profiler/release/remote-pack-defs/calibrate-15.bat
diff --git a/lib.profiler/release/remote-pack-defs/calibrate-15.sh b/profiler/lib.profiler/release/remote-pack-defs/calibrate-15.sh
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/calibrate-15.sh
rename to profiler/lib.profiler/release/remote-pack-defs/calibrate-15.sh
diff --git a/lib.profiler/release/remote-pack-defs/calibrate-16.sh b/profiler/lib.profiler/release/remote-pack-defs/calibrate-16.sh
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/calibrate-16.sh
rename to profiler/lib.profiler/release/remote-pack-defs/calibrate-16.sh
diff --git a/lib.profiler/release/remote-pack-defs/calibrate-linux-cvm.sh b/profiler/lib.profiler/release/remote-pack-defs/calibrate-linux-cvm.sh
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/calibrate-linux-cvm.sh
rename to profiler/lib.profiler/release/remote-pack-defs/calibrate-linux-cvm.sh
diff --git a/lib.profiler/release/remote-pack-defs/calibrate-mac-15.sh b/profiler/lib.profiler/release/remote-pack-defs/calibrate-mac-15.sh
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/calibrate-mac-15.sh
rename to profiler/lib.profiler/release/remote-pack-defs/calibrate-mac-15.sh
diff --git a/lib.profiler/release/remote-pack-defs/calibrate-solaris64-15.sh b/profiler/lib.profiler/release/remote-pack-defs/calibrate-solaris64-15.sh
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/calibrate-solaris64-15.sh
rename to profiler/lib.profiler/release/remote-pack-defs/calibrate-solaris64-15.sh
diff --git a/lib.profiler/release/remote-pack-defs/calibrate-win-cvm.bat b/profiler/lib.profiler/release/remote-pack-defs/calibrate-win-cvm.bat
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/calibrate-win-cvm.bat
rename to profiler/lib.profiler/release/remote-pack-defs/calibrate-win-cvm.bat
diff --git a/lib.profiler/release/remote-pack-defs/nb-profile-15.bat b/profiler/lib.profiler/release/remote-pack-defs/nb-profile-15.bat
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/nb-profile-15.bat
rename to profiler/lib.profiler/release/remote-pack-defs/nb-profile-15.bat
diff --git a/lib.profiler/release/remote-pack-defs/nb-profile-amd64-15.bat b/profiler/lib.profiler/release/remote-pack-defs/nb-profile-amd64-15.bat
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/nb-profile-amd64-15.bat
rename to profiler/lib.profiler/release/remote-pack-defs/nb-profile-amd64-15.bat
diff --git a/lib.profiler/release/remote-pack-defs/profile-linux-15.sh b/profiler/lib.profiler/release/remote-pack-defs/profile-linux-15.sh
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/profile-linux-15.sh
rename to profiler/lib.profiler/release/remote-pack-defs/profile-linux-15.sh
diff --git a/lib.profiler/release/remote-pack-defs/profile-linux-16.sh b/profiler/lib.profiler/release/remote-pack-defs/profile-linux-16.sh
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/profile-linux-16.sh
rename to profiler/lib.profiler/release/remote-pack-defs/profile-linux-16.sh
diff --git a/lib.profiler/release/remote-pack-defs/profile-linux-cvm.sh b/profiler/lib.profiler/release/remote-pack-defs/profile-linux-cvm.sh
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/profile-linux-cvm.sh
rename to profiler/lib.profiler/release/remote-pack-defs/profile-linux-cvm.sh
diff --git a/lib.profiler/release/remote-pack-defs/profile-linuxamd64-15.sh b/profiler/lib.profiler/release/remote-pack-defs/profile-linuxamd64-15.sh
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/profile-linuxamd64-15.sh
rename to profiler/lib.profiler/release/remote-pack-defs/profile-linuxamd64-15.sh
diff --git a/lib.profiler/release/remote-pack-defs/profile-linuxamd64-16.sh b/profiler/lib.profiler/release/remote-pack-defs/profile-linuxamd64-16.sh
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/profile-linuxamd64-16.sh
rename to profiler/lib.profiler/release/remote-pack-defs/profile-linuxamd64-16.sh
diff --git a/lib.profiler/release/remote-pack-defs/profile-linuxarm-16.sh b/profiler/lib.profiler/release/remote-pack-defs/profile-linuxarm-16.sh
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/profile-linuxarm-16.sh
rename to profiler/lib.profiler/release/remote-pack-defs/profile-linuxarm-16.sh
diff --git a/lib.profiler/release/remote-pack-defs/profile-linuxarmvfphflt-16.sh b/profiler/lib.profiler/release/remote-pack-defs/profile-linuxarmvfphflt-16.sh
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/profile-linuxarmvfphflt-16.sh
rename to profiler/lib.profiler/release/remote-pack-defs/profile-linuxarmvfphflt-16.sh
diff --git a/lib.profiler/release/remote-pack-defs/profile-mac-15.sh b/profiler/lib.profiler/release/remote-pack-defs/profile-mac-15.sh
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/profile-mac-15.sh
rename to profiler/lib.profiler/release/remote-pack-defs/profile-mac-15.sh
diff --git a/lib.profiler/release/remote-pack-defs/profile-mac-16.sh b/profiler/lib.profiler/release/remote-pack-defs/profile-mac-16.sh
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/profile-mac-16.sh
rename to profiler/lib.profiler/release/remote-pack-defs/profile-mac-16.sh
diff --git a/lib.profiler/release/remote-pack-defs/profile-solamd64-15.sh b/profiler/lib.profiler/release/remote-pack-defs/profile-solamd64-15.sh
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/profile-solamd64-15.sh
rename to profiler/lib.profiler/release/remote-pack-defs/profile-solamd64-15.sh
diff --git a/lib.profiler/release/remote-pack-defs/profile-solamd64-16.sh b/profiler/lib.profiler/release/remote-pack-defs/profile-solamd64-16.sh
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/profile-solamd64-16.sh
rename to profiler/lib.profiler/release/remote-pack-defs/profile-solamd64-16.sh
diff --git a/lib.profiler/release/remote-pack-defs/profile-solsparc-15.sh b/profiler/lib.profiler/release/remote-pack-defs/profile-solsparc-15.sh
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/profile-solsparc-15.sh
rename to profiler/lib.profiler/release/remote-pack-defs/profile-solsparc-15.sh
diff --git a/lib.profiler/release/remote-pack-defs/profile-solsparc-16.sh b/profiler/lib.profiler/release/remote-pack-defs/profile-solsparc-16.sh
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/profile-solsparc-16.sh
rename to profiler/lib.profiler/release/remote-pack-defs/profile-solsparc-16.sh
diff --git a/lib.profiler/release/remote-pack-defs/profile-solsparcv9-15.sh b/profiler/lib.profiler/release/remote-pack-defs/profile-solsparcv9-15.sh
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/profile-solsparcv9-15.sh
rename to profiler/lib.profiler/release/remote-pack-defs/profile-solsparcv9-15.sh
diff --git a/lib.profiler/release/remote-pack-defs/profile-solsparcv9-16.sh b/profiler/lib.profiler/release/remote-pack-defs/profile-solsparcv9-16.sh
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/profile-solsparcv9-16.sh
rename to profiler/lib.profiler/release/remote-pack-defs/profile-solsparcv9-16.sh
diff --git a/lib.profiler/release/remote-pack-defs/profile-solx86-15.sh b/profiler/lib.profiler/release/remote-pack-defs/profile-solx86-15.sh
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/profile-solx86-15.sh
rename to profiler/lib.profiler/release/remote-pack-defs/profile-solx86-15.sh
diff --git a/lib.profiler/release/remote-pack-defs/profile-solx86-16.sh b/profiler/lib.profiler/release/remote-pack-defs/profile-solx86-16.sh
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/profile-solx86-16.sh
rename to profiler/lib.profiler/release/remote-pack-defs/profile-solx86-16.sh
diff --git a/lib.profiler/release/remote-pack-defs/profile-win-15.bat b/profiler/lib.profiler/release/remote-pack-defs/profile-win-15.bat
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/profile-win-15.bat
rename to profiler/lib.profiler/release/remote-pack-defs/profile-win-15.bat
diff --git a/lib.profiler/release/remote-pack-defs/profile-win-16.bat b/profiler/lib.profiler/release/remote-pack-defs/profile-win-16.bat
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/profile-win-16.bat
rename to profiler/lib.profiler/release/remote-pack-defs/profile-win-16.bat
diff --git a/lib.profiler/release/remote-pack-defs/profile-win-cvm.bat b/profiler/lib.profiler/release/remote-pack-defs/profile-win-cvm.bat
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/profile-win-cvm.bat
rename to profiler/lib.profiler/release/remote-pack-defs/profile-win-cvm.bat
diff --git a/lib.profiler/release/remote-pack-defs/profile-winamd64-15.bat b/profiler/lib.profiler/release/remote-pack-defs/profile-winamd64-15.bat
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/profile-winamd64-15.bat
rename to profiler/lib.profiler/release/remote-pack-defs/profile-winamd64-15.bat
diff --git a/lib.profiler/release/remote-pack-defs/profile-winamd64-16.bat b/profiler/lib.profiler/release/remote-pack-defs/profile-winamd64-16.bat
similarity index 100%
rename from lib.profiler/release/remote-pack-defs/profile-winamd64-16.bat
rename to profiler/lib.profiler/release/remote-pack-defs/profile-winamd64-16.bat
diff --git a/lib.profiler/src-cvm/manifest.mf b/profiler/lib.profiler/src-cvm/manifest.mf
similarity index 100%
rename from lib.profiler/src-cvm/manifest.mf
rename to profiler/lib.profiler/src-cvm/manifest.mf
diff --git a/lib.profiler/src-cvm/org/netbeans/lib/profiler/server/system/Classes.java b/profiler/lib.profiler/src-cvm/org/netbeans/lib/profiler/server/system/Classes.java
similarity index 100%
rename from lib.profiler/src-cvm/org/netbeans/lib/profiler/server/system/Classes.java
rename to profiler/lib.profiler/src-cvm/org/netbeans/lib/profiler/server/system/Classes.java
diff --git a/lib.profiler/src-cvm/org/netbeans/lib/profiler/server/system/HeapDump.java b/profiler/lib.profiler/src-cvm/org/netbeans/lib/profiler/server/system/HeapDump.java
similarity index 100%
rename from lib.profiler/src-cvm/org/netbeans/lib/profiler/server/system/HeapDump.java
rename to profiler/lib.profiler/src-cvm/org/netbeans/lib/profiler/server/system/HeapDump.java
diff --git a/lib.profiler/src-cvm/org/netbeans/lib/profiler/server/system/Histogram.java b/profiler/lib.profiler/src-cvm/org/netbeans/lib/profiler/server/system/Histogram.java
similarity index 100%
rename from lib.profiler/src-cvm/org/netbeans/lib/profiler/server/system/Histogram.java
rename to profiler/lib.profiler/src-cvm/org/netbeans/lib/profiler/server/system/Histogram.java
diff --git a/lib.profiler/src-cvm/org/netbeans/lib/profiler/server/system/ThreadDump.java b/profiler/lib.profiler/src-cvm/org/netbeans/lib/profiler/server/system/ThreadDump.java
similarity index 100%
rename from lib.profiler/src-cvm/org/netbeans/lib/profiler/server/system/ThreadDump.java
rename to profiler/lib.profiler/src-cvm/org/netbeans/lib/profiler/server/system/ThreadDump.java
diff --git a/lib.profiler/src-cvm/org/netbeans/lib/profiler/server/system/Timers.java b/profiler/lib.profiler/src-cvm/org/netbeans/lib/profiler/server/system/Timers.java
similarity index 100%
rename from lib.profiler/src-cvm/org/netbeans/lib/profiler/server/system/Timers.java
rename to profiler/lib.profiler/src-cvm/org/netbeans/lib/profiler/server/system/Timers.java
diff --git a/lib.profiler/src-jdk15/manifest.mf b/profiler/lib.profiler/src-jdk15/manifest.mf
similarity index 100%
rename from lib.profiler/src-jdk15/manifest.mf
rename to profiler/lib.profiler/src-jdk15/manifest.mf
diff --git a/lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/ProfilerActivate15.java b/profiler/lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/ProfilerActivate15.java
similarity index 100%
rename from lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/ProfilerActivate15.java
rename to profiler/lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/ProfilerActivate15.java
diff --git a/lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/Classes.java b/profiler/lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/Classes.java
similarity index 100%
rename from lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/Classes.java
rename to profiler/lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/Classes.java
diff --git a/lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/HeapDump.java b/profiler/lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/HeapDump.java
similarity index 100%
rename from lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/HeapDump.java
rename to profiler/lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/HeapDump.java
diff --git a/lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/Histogram.java b/profiler/lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/Histogram.java
similarity index 100%
rename from lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/Histogram.java
rename to profiler/lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/Histogram.java
diff --git a/lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/Histogram18.java b/profiler/lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/Histogram18.java
similarity index 100%
rename from lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/Histogram18.java
rename to profiler/lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/Histogram18.java
diff --git a/lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/Histogram19.java b/profiler/lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/Histogram19.java
similarity index 100%
rename from lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/Histogram19.java
rename to profiler/lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/Histogram19.java
diff --git a/lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/ThreadDump.java b/profiler/lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/ThreadDump.java
similarity index 100%
rename from lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/ThreadDump.java
rename to profiler/lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/ThreadDump.java
diff --git a/lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/Timers.java b/profiler/lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/Timers.java
similarity index 100%
rename from lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/Timers.java
rename to profiler/lib.profiler/src-jdk15/org/netbeans/lib/profiler/server/system/Timers.java
diff --git a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.CPUCCTProvider b/profiler/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.CPUCCTProvider
similarity index 100%
rename from lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.CPUCCTProvider
rename to profiler/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.CPUCCTProvider
diff --git a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.CPUCCTProvider$Listener b/profiler/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.CPUCCTProvider$Listener
similarity index 100%
rename from lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.CPUCCTProvider$Listener
rename to profiler/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.CPUCCTProvider$Listener
diff --git a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.CPUProfilingResultListener b/profiler/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.CPUProfilingResultListener
similarity index 100%
rename from lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.CPUProfilingResultListener
rename to profiler/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.CPUProfilingResultListener
diff --git a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.FlatProfileBuilder b/profiler/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.FlatProfileBuilder
similarity index 100%
rename from lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.FlatProfileBuilder
rename to profiler/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.FlatProfileBuilder
diff --git a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.cct.CCTResultsFilter b/profiler/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.cct.CCTResultsFilter
similarity index 100%
rename from lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.cct.CCTResultsFilter
rename to profiler/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.cct.CCTResultsFilter
diff --git a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.cct.TimeCollector b/profiler/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.cct.TimeCollector
similarity index 100%
rename from lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.cct.TimeCollector
rename to profiler/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.cct.TimeCollector
diff --git a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.marking.MarkingEngine$StateObserver b/profiler/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.marking.MarkingEngine$StateObserver
similarity index 100%
rename from lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.marking.MarkingEngine$StateObserver
rename to profiler/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.marking.MarkingEngine$StateObserver
diff --git a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.locks.LockProfilingResultListener b/profiler/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.locks.LockProfilingResultListener
similarity index 100%
rename from lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.locks.LockProfilingResultListener
rename to profiler/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.locks.LockProfilingResultListener
diff --git a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.memory.MemoryCCTProvider b/profiler/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.memory.MemoryCCTProvider
similarity index 100%
rename from lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.memory.MemoryCCTProvider
rename to profiler/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.memory.MemoryCCTProvider
diff --git a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.memory.MemoryProfilingResultsListener b/profiler/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.memory.MemoryProfilingResultsListener
similarity index 100%
rename from lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.memory.MemoryProfilingResultsListener
rename to profiler/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.memory.MemoryProfilingResultsListener
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/Bundle.properties b/profiler/lib.profiler/src/org/netbeans/lib/profiler/Bundle.properties
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/Bundle.properties
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/Bundle.properties
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/ProfilerClient.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/ProfilerClient.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/ProfilerClient.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/ProfilerClient.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/ProfilerClientListener.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/ProfilerClientListener.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/ProfilerClientListener.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/ProfilerClientListener.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/ProfilerEngineSettings.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/ProfilerEngineSettings.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/ProfilerEngineSettings.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/ProfilerEngineSettings.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/ProfilerLogger.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/ProfilerLogger.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/ProfilerLogger.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/ProfilerLogger.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/ProfilingEventListener.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/ProfilingEventListener.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/ProfilingEventListener.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/ProfilingEventListener.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/TargetAppRunner.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/TargetAppRunner.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/TargetAppRunner.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/TargetAppRunner.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/classfile/BaseClassInfo.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/BaseClassInfo.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/classfile/BaseClassInfo.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/BaseClassInfo.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/classfile/Bundle.properties b/profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/Bundle.properties
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/classfile/Bundle.properties
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/Bundle.properties
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassFileCache.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassFileCache.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassFileCache.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassFileCache.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassFileParser.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassFileParser.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassFileParser.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassFileParser.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassInfo.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassInfo.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassInfo.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassInfo.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassLoaderTable.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassLoaderTable.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassLoaderTable.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassLoaderTable.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassPath.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassPath.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassPath.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassPath.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassRepository.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassRepository.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassRepository.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassRepository.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/classfile/DynamicClassInfo.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/DynamicClassInfo.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/classfile/DynamicClassInfo.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/DynamicClassInfo.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/classfile/LazyDynamicClassInfo.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/LazyDynamicClassInfo.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/classfile/LazyDynamicClassInfo.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/LazyDynamicClassInfo.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/classfile/PlaceholderClassInfo.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/PlaceholderClassInfo.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/classfile/PlaceholderClassInfo.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/PlaceholderClassInfo.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/classfile/SameNameClassGroup.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/SameNameClassGroup.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/classfile/SameNameClassGroup.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/SameNameClassGroup.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/client/AppStatusHandler.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/client/AppStatusHandler.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/client/AppStatusHandler.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/client/AppStatusHandler.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/client/ClientUtils.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/client/ClientUtils.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/client/ClientUtils.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/client/ClientUtils.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/client/MonitoredData.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/client/MonitoredData.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/client/MonitoredData.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/client/MonitoredData.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/client/ProfilingPointsProcessor.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/client/ProfilingPointsProcessor.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/client/ProfilingPointsProcessor.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/client/ProfilingPointsProcessor.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/client/RuntimeProfilingPoint.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/client/RuntimeProfilingPoint.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/client/RuntimeProfilingPoint.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/client/RuntimeProfilingPoint.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/filters/GenericFilter.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/filters/GenericFilter.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/filters/GenericFilter.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/filters/GenericFilter.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/filters/InstrumentationFilter.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/filters/InstrumentationFilter.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/filters/InstrumentationFilter.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/filters/InstrumentationFilter.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/filters/JavaTypeFilter.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/filters/JavaTypeFilter.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/filters/JavaTypeFilter.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/filters/JavaTypeFilter.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/filters/TextFilter.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/filters/TextFilter.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/filters/TextFilter.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/filters/TextFilter.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/global/Bundle.properties b/profiler/lib.profiler/src/org/netbeans/lib/profiler/global/Bundle.properties
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/global/Bundle.properties
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/global/Bundle.properties
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/global/CalibrationDataFileIO.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/global/CalibrationDataFileIO.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/global/CalibrationDataFileIO.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/global/CalibrationDataFileIO.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/global/CommonConstants.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/global/CommonConstants.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/global/CommonConstants.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/global/CommonConstants.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/global/Platform.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/global/Platform.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/global/Platform.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/global/Platform.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/global/ProfilingSessionStatus.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/global/ProfilingSessionStatus.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/global/ProfilingSessionStatus.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/global/ProfilingSessionStatus.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/global/TransactionalSupport.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/global/TransactionalSupport.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/global/TransactionalSupport.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/global/TransactionalSupport.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/AbstractLongMap.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/AbstractLongMap.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/AbstractLongMap.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/AbstractLongMap.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/ArrayDump.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ArrayDump.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/ArrayDump.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ArrayDump.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/ArrayItemValue.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ArrayItemValue.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/ArrayItemValue.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ArrayItemValue.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/Bundle.properties b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/Bundle.properties
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/Bundle.properties
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/Bundle.properties
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/CacheDirectory.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/CacheDirectory.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/CacheDirectory.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/CacheDirectory.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/ClassDump.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ClassDump.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/ClassDump.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ClassDump.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/ClassDumpInstance.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ClassDumpInstance.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/ClassDumpInstance.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ClassDumpInstance.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/ClassDumpSegment.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ClassDumpSegment.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/ClassDumpSegment.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ClassDumpSegment.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/ClassLoaderFieldValue.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ClassLoaderFieldValue.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/ClassLoaderFieldValue.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ClassLoaderFieldValue.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/ComputedSummary.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ComputedSummary.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/ComputedSummary.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ComputedSummary.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/DomMap.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/DomMap.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/DomMap.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/DomMap.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/DominatorTree.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/DominatorTree.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/DominatorTree.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/DominatorTree.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/Field.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/Field.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/Field.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/Field.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/FieldValue.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/FieldValue.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/FieldValue.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/FieldValue.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/GCRoot.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/GCRoot.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/GCRoot.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/GCRoot.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/Heap.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/Heap.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/Heap.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/Heap.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/HeapFactory.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HeapFactory.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/HeapFactory.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HeapFactory.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/HeapProgress.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HeapProgress.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/HeapProgress.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HeapProgress.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/HeapSummary.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HeapSummary.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/HeapSummary.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HeapSummary.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofArrayValue.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofArrayValue.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/HprofArrayValue.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofArrayValue.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofByteBuffer.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofByteBuffer.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/HprofByteBuffer.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofByteBuffer.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofField.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofField.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/HprofField.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofField.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofFieldObjectValue.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofFieldObjectValue.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/HprofFieldObjectValue.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofFieldObjectValue.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofFieldValue.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofFieldValue.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/HprofFieldValue.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofFieldValue.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofFileBuffer.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofFileBuffer.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/HprofFileBuffer.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofFileBuffer.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofGCRoot.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofGCRoot.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/HprofGCRoot.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofGCRoot.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofGCRoots.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofGCRoots.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/HprofGCRoots.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofGCRoots.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofHeap.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofHeap.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/HprofHeap.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofHeap.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofInstanceObjectValue.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofInstanceObjectValue.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/HprofInstanceObjectValue.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofInstanceObjectValue.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofInstanceValue.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofInstanceValue.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/HprofInstanceValue.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofInstanceValue.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofLongMappedByteBuffer.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofLongMappedByteBuffer.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/HprofLongMappedByteBuffer.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofLongMappedByteBuffer.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofMappedByteBuffer.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofMappedByteBuffer.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/HprofMappedByteBuffer.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofMappedByteBuffer.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofObject.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofObject.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/HprofObject.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofObject.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofPrimitiveType.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofPrimitiveType.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/HprofPrimitiveType.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofPrimitiveType.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofProxy.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofProxy.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/HprofProxy.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofProxy.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/Instance.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/Instance.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/Instance.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/Instance.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/InstanceDump.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/InstanceDump.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/InstanceDump.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/InstanceDump.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/JavaClass.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/JavaClass.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/JavaClass.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/JavaClass.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/JavaFrameGCRoot.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/JavaFrameGCRoot.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/JavaFrameGCRoot.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/JavaFrameGCRoot.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/JavaFrameHprofGCRoot.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/JavaFrameHprofGCRoot.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/JavaFrameHprofGCRoot.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/JavaFrameHprofGCRoot.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/LoadClass.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/LoadClass.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/LoadClass.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/LoadClass.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/LoadClassSegment.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/LoadClassSegment.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/LoadClassSegment.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/LoadClassSegment.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/LongBuffer.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/LongBuffer.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/LongBuffer.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/LongBuffer.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/LongHashMap.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/LongHashMap.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/LongHashMap.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/LongHashMap.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/LongIterator.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/LongIterator.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/LongIterator.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/LongIterator.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/LongMap.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/LongMap.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/LongMap.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/LongMap.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/LongSet.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/LongSet.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/LongSet.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/LongSet.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/NearestGCRoot.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/NearestGCRoot.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/NearestGCRoot.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/NearestGCRoot.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/NumberList.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/NumberList.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/NumberList.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/NumberList.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/ObjectArrayDump.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ObjectArrayDump.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/ObjectArrayDump.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ObjectArrayDump.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/ObjectArrayInstance.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ObjectArrayInstance.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/ObjectArrayInstance.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ObjectArrayInstance.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/ObjectArrayLazyList.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ObjectArrayLazyList.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/ObjectArrayLazyList.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ObjectArrayLazyList.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/ObjectArrayValuesLazyList.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ObjectArrayValuesLazyList.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/ObjectArrayValuesLazyList.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ObjectArrayValuesLazyList.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/ObjectFieldValue.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ObjectFieldValue.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/ObjectFieldValue.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ObjectFieldValue.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/ObjectType.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ObjectType.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/ObjectType.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ObjectType.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/PrimitiveArrayDump.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/PrimitiveArrayDump.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/PrimitiveArrayDump.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/PrimitiveArrayDump.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/PrimitiveArrayInstance.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/PrimitiveArrayInstance.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/PrimitiveArrayInstance.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/PrimitiveArrayInstance.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/PrimitiveArrayLazyList.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/PrimitiveArrayLazyList.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/PrimitiveArrayLazyList.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/PrimitiveArrayLazyList.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/PrimitiveType.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/PrimitiveType.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/PrimitiveType.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/PrimitiveType.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/StackFrame.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/StackFrame.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/StackFrame.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/StackFrame.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/StackFrameSegment.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/StackFrameSegment.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/StackFrameSegment.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/StackFrameSegment.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/StackTrace.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/StackTrace.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/StackTrace.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/StackTrace.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/StackTraceSegment.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/StackTraceSegment.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/StackTraceSegment.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/StackTraceSegment.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/StringSegment.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/StringSegment.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/StringSegment.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/StringSegment.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/Summary.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/Summary.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/Summary.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/Summary.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/SyntheticClassField.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/SyntheticClassField.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/SyntheticClassField.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/SyntheticClassField.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/SyntheticClassObjectValue.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/SyntheticClassObjectValue.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/SyntheticClassObjectValue.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/SyntheticClassObjectValue.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/TagBounds.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/TagBounds.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/TagBounds.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/TagBounds.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/ThreadObjectGCRoot.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ThreadObjectGCRoot.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/ThreadObjectGCRoot.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ThreadObjectGCRoot.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/ThreadObjectHprofGCRoot.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ThreadObjectHprofGCRoot.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/ThreadObjectHprofGCRoot.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ThreadObjectHprofGCRoot.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/TreeObject.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/TreeObject.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/TreeObject.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/TreeObject.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/Type.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/Type.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/Type.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/Type.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/heap/Value.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/Value.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/heap/Value.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/Value.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/BadLocationException.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/BadLocationException.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/BadLocationException.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/BadLocationException.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/Bundle.properties b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/Bundle.properties
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/Bundle.properties
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/Bundle.properties
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/CPExtensionsRepository.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/CPExtensionsRepository.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/CPExtensionsRepository.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/CPExtensionsRepository.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/ClassManager.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/ClassManager.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/ClassManager.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/ClassManager.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/ClassRewriter.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/ClassRewriter.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/ClassRewriter.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/ClassRewriter.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/CodeRegionEntryExitCallsInjector.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/CodeRegionEntryExitCallsInjector.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/CodeRegionEntryExitCallsInjector.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/CodeRegionEntryExitCallsInjector.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/CodeRegionMethodInstrumentor.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/CodeRegionMethodInstrumentor.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/CodeRegionMethodInstrumentor.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/CodeRegionMethodInstrumentor.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/ConstantPoolExtension.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/ConstantPoolExtension.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/ConstantPoolExtension.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/ConstantPoolExtension.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/DynamicConstantPoolExtension.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/DynamicConstantPoolExtension.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/DynamicConstantPoolExtension.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/DynamicConstantPoolExtension.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/HandleReflectInvokeCallInjector.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/HandleReflectInvokeCallInjector.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/HandleReflectInvokeCallInjector.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/HandleReflectInvokeCallInjector.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/HandleServletDoMethodCallInjector.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/HandleServletDoMethodCallInjector.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/HandleServletDoMethodCallInjector.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/HandleServletDoMethodCallInjector.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/Injector.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/Injector.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/Injector.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/Injector.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/InstrumentationException.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/InstrumentationException.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/InstrumentationException.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/InstrumentationException.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/InstrumentationFactory.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/InstrumentationFactory.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/InstrumentationFactory.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/InstrumentationFactory.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/Instrumentor.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/Instrumentor.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/Instrumentor.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/Instrumentor.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/JavaClassConstants.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/JavaClassConstants.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/JavaClassConstants.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/JavaClassConstants.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/MemoryProfMethodInstrumentor.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/MemoryProfMethodInstrumentor.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/MemoryProfMethodInstrumentor.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/MemoryProfMethodInstrumentor.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/MethodEntryExitCallsInjector.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/MethodEntryExitCallsInjector.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/MethodEntryExitCallsInjector.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/MethodEntryExitCallsInjector.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/MiscInstrumentationOps.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/MiscInstrumentationOps.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/MiscInstrumentationOps.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/MiscInstrumentationOps.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/ObjLivenessInstrCallsInjector.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/ObjLivenessInstrCallsInjector.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/ObjLivenessInstrCallsInjector.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/ObjLivenessInstrCallsInjector.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/ObjLivenessMethodInstrumentor.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/ObjLivenessMethodInstrumentor.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/ObjLivenessMethodInstrumentor.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/ObjLivenessMethodInstrumentor.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/ProfilePointHitCallInjector.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/ProfilePointHitCallInjector.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/ProfilePointHitCallInjector.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/ProfilePointHitCallInjector.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/RecursiveMethodInstrumentor.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/RecursiveMethodInstrumentor.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/RecursiveMethodInstrumentor.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/RecursiveMethodInstrumentor.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/RecursiveMethodInstrumentor1.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/RecursiveMethodInstrumentor1.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/RecursiveMethodInstrumentor1.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/RecursiveMethodInstrumentor1.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/RecursiveMethodInstrumentor2.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/RecursiveMethodInstrumentor2.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/RecursiveMethodInstrumentor2.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/RecursiveMethodInstrumentor2.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/RecursiveMethodInstrumentor3.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/RecursiveMethodInstrumentor3.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/RecursiveMethodInstrumentor3.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/RecursiveMethodInstrumentor3.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/RootMethods.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/RootMethods.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/RootMethods.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/RootMethods.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/SingleMethodScaner.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/SingleMethodScaner.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/SingleMethodScaner.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/SingleMethodScaner.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/SpecialCallInjector.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/SpecialCallInjector.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/instrumentation/SpecialCallInjector.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/instrumentation/SpecialCallInjector.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/jps/JpsProxy.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/jps/JpsProxy.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/jps/JpsProxy.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/jps/JpsProxy.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/jps/RunningVM.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/jps/RunningVM.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/jps/RunningVM.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/jps/RunningVM.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/marker/ClassMarker.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/marker/ClassMarker.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/marker/ClassMarker.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/marker/ClassMarker.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/marker/CompositeMarker.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/marker/CompositeMarker.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/marker/CompositeMarker.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/marker/CompositeMarker.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/marker/Mark.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/marker/Mark.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/marker/Mark.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/marker/Mark.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/marker/Marker.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/marker/Marker.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/marker/Marker.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/marker/Marker.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/marker/MethodMarker.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/marker/MethodMarker.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/marker/MethodMarker.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/marker/MethodMarker.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/marker/PackageMarker.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/marker/PackageMarker.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/marker/PackageMarker.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/marker/PackageMarker.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/AbstractDataFrameProcessor.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/AbstractDataFrameProcessor.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/AbstractDataFrameProcessor.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/AbstractDataFrameProcessor.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/BaseCallGraphBuilder.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/BaseCallGraphBuilder.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/BaseCallGraphBuilder.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/BaseCallGraphBuilder.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/Bundle.properties b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/Bundle.properties
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/Bundle.properties
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/Bundle.properties
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/CCTNode.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/CCTNode.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/CCTNode.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/CCTNode.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/CCTProvider.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/CCTProvider.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/CCTProvider.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/CCTProvider.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/DataFrameProcessor.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/DataFrameProcessor.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/DataFrameProcessor.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/DataFrameProcessor.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/DataManager.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/DataManager.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/DataManager.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/DataManager.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/DataManagerListener.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/DataManagerListener.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/DataManagerListener.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/DataManagerListener.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/EventBufferProcessor.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/EventBufferProcessor.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/EventBufferProcessor.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/EventBufferProcessor.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/EventBufferResultsProvider.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/EventBufferResultsProvider.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/EventBufferResultsProvider.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/EventBufferResultsProvider.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/ExportDataDumper.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/ExportDataDumper.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/ExportDataDumper.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/ExportDataDumper.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/FilterSortSupport.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/FilterSortSupport.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/FilterSortSupport.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/FilterSortSupport.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/ProfilingResultListener.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/ProfilingResultListener.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/ProfilingResultListener.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/ProfilingResultListener.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/ProfilingResultsDispatcher.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/ProfilingResultsDispatcher.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/ProfilingResultsDispatcher.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/ProfilingResultsDispatcher.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/ProfilingResultsProvider.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/ProfilingResultsProvider.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/ProfilingResultsProvider.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/ProfilingResultsProvider.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/ResultsSnapshot.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/ResultsSnapshot.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/ResultsSnapshot.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/ResultsSnapshot.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/RuntimeCCTNode.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/RuntimeCCTNode.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/RuntimeCCTNode.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/RuntimeCCTNode.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/RuntimeCCTNodeProcessor.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/RuntimeCCTNodeProcessor.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/RuntimeCCTNodeProcessor.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/RuntimeCCTNodeProcessor.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/coderegion/Bundle.properties b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/coderegion/Bundle.properties
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/coderegion/Bundle.properties
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/coderegion/Bundle.properties
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/coderegion/CodeRegionResultsSnapshot.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/coderegion/CodeRegionResultsSnapshot.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/coderegion/CodeRegionResultsSnapshot.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/coderegion/CodeRegionResultsSnapshot.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/AllThreadsMergedCPUCCTContainer.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/AllThreadsMergedCPUCCTContainer.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/AllThreadsMergedCPUCCTContainer.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/AllThreadsMergedCPUCCTContainer.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/Bundle.properties b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/Bundle.properties
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/Bundle.properties
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/Bundle.properties
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUCCTClassContainer.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUCCTClassContainer.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUCCTClassContainer.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUCCTClassContainer.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUCCTContainer.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUCCTContainer.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUCCTContainer.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUCCTContainer.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUCCTProvider.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUCCTProvider.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUCCTProvider.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUCCTProvider.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUCallGraphBuilder.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUCallGraphBuilder.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUCallGraphBuilder.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUCallGraphBuilder.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUDataFrameProcessor.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUDataFrameProcessor.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUDataFrameProcessor.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUDataFrameProcessor.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUProfilingResultListener.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUProfilingResultListener.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUProfilingResultListener.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUProfilingResultListener.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUResultsDiff.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUResultsDiff.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUResultsDiff.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUResultsDiff.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUResultsSnapshot.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUResultsSnapshot.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUResultsSnapshot.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUResultsSnapshot.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUSamplingDataFrameProcessor.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUSamplingDataFrameProcessor.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUSamplingDataFrameProcessor.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUSamplingDataFrameProcessor.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/DiffCPUCCTNode.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/DiffCPUCCTNode.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/DiffCPUCCTNode.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/DiffCPUCCTNode.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/DiffFlatProfileContainer.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/DiffFlatProfileContainer.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/DiffFlatProfileContainer.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/DiffFlatProfileContainer.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/FlatProfileBuilder.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/FlatProfileBuilder.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/FlatProfileBuilder.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/FlatProfileBuilder.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/FlatProfileContainer.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/FlatProfileContainer.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/FlatProfileContainer.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/FlatProfileContainer.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/FlatProfileContainerBacked.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/FlatProfileContainerBacked.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/FlatProfileContainerBacked.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/FlatProfileContainerBacked.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/FlatProfileContainerFree.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/FlatProfileContainerFree.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/FlatProfileContainerFree.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/FlatProfileContainerFree.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/FlatProfileProvider.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/FlatProfileProvider.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/FlatProfileProvider.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/FlatProfileProvider.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/InstrTimingData.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/InstrTimingData.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/InstrTimingData.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/InstrTimingData.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/MethodIdMap.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/MethodIdMap.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/MethodIdMap.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/MethodIdMap.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/MethodInfoMapper.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/MethodInfoMapper.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/MethodInfoMapper.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/MethodInfoMapper.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/PrestimeCPUCCTNode.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/PrestimeCPUCCTNode.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/PrestimeCPUCCTNode.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/PrestimeCPUCCTNode.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/PrestimeCPUCCTNodeBacked.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/PrestimeCPUCCTNodeBacked.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/PrestimeCPUCCTNodeBacked.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/PrestimeCPUCCTNodeBacked.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/PrestimeCPUCCTNodeFree.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/PrestimeCPUCCTNodeFree.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/PrestimeCPUCCTNodeFree.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/PrestimeCPUCCTNodeFree.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/StackTraceSnapshotBuilder.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/StackTraceSnapshotBuilder.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/StackTraceSnapshotBuilder.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/StackTraceSnapshotBuilder.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/ThreadInfo.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/ThreadInfo.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/ThreadInfo.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/ThreadInfo.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/ThreadInfos.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/ThreadInfos.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/ThreadInfos.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/ThreadInfos.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/TimingAdjuster.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/TimingAdjuster.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/TimingAdjuster.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/TimingAdjuster.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/TimingAdjusterOld.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/TimingAdjusterOld.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/TimingAdjusterOld.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/TimingAdjusterOld.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/CCTFlattener.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/CCTFlattener.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/CCTFlattener.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/CCTFlattener.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/CCTResultsFilter.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/CCTResultsFilter.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/CCTResultsFilter.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/CCTResultsFilter.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/TimeCollector.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/TimeCollector.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/TimeCollector.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/TimeCollector.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/BaseCPUCCTNode.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/BaseCPUCCTNode.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/BaseCPUCCTNode.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/BaseCPUCCTNode.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/MarkedCPUCCTNode.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/MarkedCPUCCTNode.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/MarkedCPUCCTNode.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/MarkedCPUCCTNode.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/MethodCPUCCTNode.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/MethodCPUCCTNode.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/MethodCPUCCTNode.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/MethodCPUCCTNode.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/RuntimeCPUCCTNode.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/RuntimeCPUCCTNode.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/RuntimeCPUCCTNode.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/RuntimeCPUCCTNode.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/ServletRequestCPUCCTNode.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/ServletRequestCPUCCTNode.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/ServletRequestCPUCCTNode.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/ServletRequestCPUCCTNode.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/SimpleCPUCCTNode.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/SimpleCPUCCTNode.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/SimpleCPUCCTNode.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/SimpleCPUCCTNode.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/ThreadCPUCCTNode.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/ThreadCPUCCTNode.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/ThreadCPUCCTNode.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/ThreadCPUCCTNode.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/TimedCPUCCTNode.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/TimedCPUCCTNode.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/TimedCPUCCTNode.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/cct/nodes/TimedCPUCCTNode.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/marking/CharStack.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/marking/CharStack.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/marking/CharStack.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/marking/CharStack.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/marking/MarkAwareNodeProcessorPlugin.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/marking/MarkAwareNodeProcessorPlugin.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/marking/MarkAwareNodeProcessorPlugin.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/marking/MarkAwareNodeProcessorPlugin.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/marking/MarkMapper.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/marking/MarkMapper.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/marking/MarkMapper.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/marking/MarkMapper.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/marking/MarkMapping.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/marking/MarkMapping.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/marking/MarkMapping.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/marking/MarkMapping.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/marking/MarkingEngine.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/marking/MarkingEngine.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/cpu/marking/MarkingEngine.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/marking/MarkingEngine.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/JdbcCCTProvider.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/JdbcCCTProvider.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/JdbcCCTProvider.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/JdbcCCTProvider.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/JdbcGraphBuilder.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/JdbcGraphBuilder.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/JdbcGraphBuilder.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/JdbcGraphBuilder.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/JdbcResultsDiff.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/JdbcResultsDiff.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/JdbcResultsDiff.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/JdbcResultsDiff.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/JdbcResultsSnapshot.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/JdbcResultsSnapshot.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/JdbcResultsSnapshot.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/JdbcResultsSnapshot.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/SQLConnection.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/SQLConnection.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/SQLConnection.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/SQLConnection.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/SQLParser.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/SQLParser.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/SQLParser.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/SQLParser.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/SQLStatement.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/SQLStatement.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/SQLStatement.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/SQLStatement.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/StringCache.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/StringCache.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/StringCache.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/StringCache.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/locks/AbstractLockDataFrameProcessor.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/AbstractLockDataFrameProcessor.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/locks/AbstractLockDataFrameProcessor.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/AbstractLockDataFrameProcessor.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/locks/Bundle.properties b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/Bundle.properties
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/locks/Bundle.properties
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/Bundle.properties
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockCCTNode.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockCCTNode.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockCCTNode.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockCCTNode.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockCCTProvider.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockCCTProvider.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockCCTProvider.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockCCTProvider.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockDataFrameProcessor.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockDataFrameProcessor.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockDataFrameProcessor.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockDataFrameProcessor.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockGraphBuilder.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockGraphBuilder.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockGraphBuilder.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockGraphBuilder.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockProfilingResultListener.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockProfilingResultListener.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockProfilingResultListener.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockProfilingResultListener.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockRuntimeCCTNode.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockRuntimeCCTNode.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockRuntimeCCTNode.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockRuntimeCCTNode.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/locks/MonitorCCTNode.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/MonitorCCTNode.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/locks/MonitorCCTNode.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/MonitorCCTNode.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/locks/MonitorInfo.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/MonitorInfo.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/locks/MonitorInfo.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/MonitorInfo.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/locks/ThreadInfo.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/ThreadInfo.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/locks/ThreadInfo.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/ThreadInfo.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/locks/ThreadInfos.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/ThreadInfos.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/locks/ThreadInfos.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/ThreadInfos.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/locks/ThreadLockCCTNode.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/ThreadLockCCTNode.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/locks/ThreadLockCCTNode.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/ThreadLockCCTNode.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/locks/TopLockCCTNode.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/TopLockCCTNode.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/locks/TopLockCCTNode.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/TopLockCCTNode.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/memory/AllocMemoryResultsDiff.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/AllocMemoryResultsDiff.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/memory/AllocMemoryResultsDiff.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/AllocMemoryResultsDiff.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/memory/AllocMemoryResultsSnapshot.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/AllocMemoryResultsSnapshot.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/memory/AllocMemoryResultsSnapshot.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/AllocMemoryResultsSnapshot.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/memory/Bundle.properties b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/Bundle.properties
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/memory/Bundle.properties
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/Bundle.properties
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/memory/ClassHistoryDataManager.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/ClassHistoryDataManager.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/memory/ClassHistoryDataManager.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/ClassHistoryDataManager.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/memory/DiffObjAllocCCTNode.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/DiffObjAllocCCTNode.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/memory/DiffObjAllocCCTNode.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/DiffObjAllocCCTNode.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/memory/DiffObjLivenessCCTNode.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/DiffObjLivenessCCTNode.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/memory/DiffObjLivenessCCTNode.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/DiffObjLivenessCCTNode.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/memory/HeapHistogram.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/HeapHistogram.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/memory/HeapHistogram.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/HeapHistogram.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/memory/HeapHistogramManager.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/HeapHistogramManager.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/memory/HeapHistogramManager.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/HeapHistogramManager.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/memory/JMethodIdTable.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/JMethodIdTable.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/memory/JMethodIdTable.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/JMethodIdTable.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/memory/LivenessMemoryResultsDiff.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/LivenessMemoryResultsDiff.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/memory/LivenessMemoryResultsDiff.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/LivenessMemoryResultsDiff.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/memory/LivenessMemoryResultsSnapshot.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/LivenessMemoryResultsSnapshot.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/memory/LivenessMemoryResultsSnapshot.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/LivenessMemoryResultsSnapshot.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/memory/MemoryCCTManager.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/MemoryCCTManager.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/memory/MemoryCCTManager.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/MemoryCCTManager.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/memory/MemoryCCTProvider.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/MemoryCCTProvider.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/memory/MemoryCCTProvider.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/MemoryCCTProvider.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/memory/MemoryCallGraphBuilder.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/MemoryCallGraphBuilder.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/memory/MemoryCallGraphBuilder.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/MemoryCallGraphBuilder.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/memory/MemoryDataFrameProcessor.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/MemoryDataFrameProcessor.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/memory/MemoryDataFrameProcessor.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/MemoryDataFrameProcessor.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/memory/MemoryProfilingResultsListener.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/MemoryProfilingResultsListener.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/memory/MemoryProfilingResultsListener.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/MemoryProfilingResultsListener.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/memory/MemoryResultsSnapshot.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/MemoryResultsSnapshot.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/memory/MemoryResultsSnapshot.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/MemoryResultsSnapshot.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/memory/PresoObjAllocCCTNode.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/PresoObjAllocCCTNode.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/memory/PresoObjAllocCCTNode.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/PresoObjAllocCCTNode.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/memory/PresoObjLivenessCCTNode.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/PresoObjLivenessCCTNode.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/memory/PresoObjLivenessCCTNode.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/PresoObjLivenessCCTNode.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/memory/RuntimeMemoryCCTNode.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/RuntimeMemoryCCTNode.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/memory/RuntimeMemoryCCTNode.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/RuntimeMemoryCCTNode.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/memory/RuntimeObjAllocTermCCTNode.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/RuntimeObjAllocTermCCTNode.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/memory/RuntimeObjAllocTermCCTNode.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/RuntimeObjAllocTermCCTNode.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/memory/RuntimeObjLivenessTermCCTNode.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/RuntimeObjLivenessTermCCTNode.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/memory/RuntimeObjLivenessTermCCTNode.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/RuntimeObjLivenessTermCCTNode.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/memory/SampledMemoryResultsDiff.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/SampledMemoryResultsDiff.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/memory/SampledMemoryResultsDiff.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/SampledMemoryResultsDiff.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/memory/SampledMemoryResultsSnapshot.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/SampledMemoryResultsSnapshot.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/memory/SampledMemoryResultsSnapshot.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/SampledMemoryResultsSnapshot.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/memory/SurvGenSet.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/SurvGenSet.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/memory/SurvGenSet.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/SurvGenSet.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/monitor/VMTelemetryDataManager.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/monitor/VMTelemetryDataManager.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/monitor/VMTelemetryDataManager.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/monitor/VMTelemetryDataManager.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/threads/ThreadData.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/threads/ThreadData.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/threads/ThreadData.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/threads/ThreadData.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/threads/ThreadDump.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/threads/ThreadDump.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/threads/ThreadDump.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/threads/ThreadDump.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/results/threads/ThreadsDataManager.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/threads/ThreadsDataManager.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/results/threads/ThreadsDataManager.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/results/threads/ThreadsDataManager.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/Bundle.properties b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/Bundle.properties
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/Bundle.properties
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/Bundle.properties
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/ClassBytesLoader.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ClassBytesLoader.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/ClassBytesLoader.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ClassBytesLoader.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/ClassLoaderManager.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ClassLoaderManager.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/ClassLoaderManager.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ClassLoaderManager.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/EventBufferManager.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/EventBufferManager.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/EventBufferManager.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/EventBufferManager.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/HeapHistogramManager.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/HeapHistogramManager.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/HeapHistogramManager.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/HeapHistogramManager.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/InstrumentConstructorTest.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/InstrumentConstructorTest.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/InstrumentConstructorTest.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/InstrumentConstructorTest.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/Monitors.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/Monitors.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/Monitors.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/Monitors.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerAPI.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerAPI.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerAPI.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerAPI.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerCalibrator.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerCalibrator.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerCalibrator.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerCalibrator.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerInterface.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerInterface.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerInterface.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerInterface.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntime.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntime.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntime.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntime.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeCPU.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeCPU.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeCPU.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeCPU.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeCPUCodeRegion.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeCPUCodeRegion.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeCPUCodeRegion.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeCPUCodeRegion.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeCPUFullInstr.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeCPUFullInstr.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeCPUFullInstr.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeCPUFullInstr.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeCPUSampledInstr.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeCPUSampledInstr.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeCPUSampledInstr.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeCPUSampledInstr.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeMemory.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeMemory.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeMemory.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeMemory.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeObjAlloc.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeObjAlloc.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeObjAlloc.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeObjAlloc.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeObjLiveness.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeObjLiveness.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeObjLiveness.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeObjLiveness.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeSampler.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeSampler.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeSampler.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeSampler.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerServer.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerServer.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerServer.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerServer.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilingPointServerHandler.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilingPointServerHandler.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/ProfilingPointServerHandler.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilingPointServerHandler.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/ResetResultsProfilingPointHandler.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ResetResultsProfilingPointHandler.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/ResetResultsProfilingPointHandler.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ResetResultsProfilingPointHandler.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/SamplingThread.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/SamplingThread.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/SamplingThread.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/SamplingThread.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/StartProfilingPointHandler.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/StartProfilingPointHandler.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/StartProfilingPointHandler.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/StartProfilingPointHandler.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/StopProfilingPointHandler.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/StopProfilingPointHandler.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/StopProfilingPointHandler.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/StopProfilingPointHandler.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/TakeHeapdumpProfilingPointHandler.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/TakeHeapdumpProfilingPointHandler.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/TakeHeapdumpProfilingPointHandler.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/TakeHeapdumpProfilingPointHandler.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/TakeSnapshotProfilingPointHandler.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/TakeSnapshotProfilingPointHandler.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/TakeSnapshotProfilingPointHandler.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/TakeSnapshotProfilingPointHandler.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/TakeSnapshotWithResetProfilingPointHandler.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/TakeSnapshotWithResetProfilingPointHandler.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/TakeSnapshotWithResetProfilingPointHandler.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/TakeSnapshotWithResetProfilingPointHandler.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/ThreadInfo.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ThreadInfo.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/ThreadInfo.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ThreadInfo.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/system/GC.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/system/GC.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/system/GC.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/system/GC.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/system/Stacks.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/system/Stacks.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/system/Stacks.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/system/Stacks.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/server/system/Threads.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/system/Threads.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/server/system/Threads.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/server/system/Threads.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/utils/Bundle.properties b/profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/Bundle.properties
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/utils/Bundle.properties
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/Bundle.properties
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/utils/CharStack.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/CharStack.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/utils/CharStack.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/CharStack.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/utils/FileOrZipEntry.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/FileOrZipEntry.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/utils/FileOrZipEntry.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/FileOrZipEntry.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/utils/FloatSorter.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/FloatSorter.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/utils/FloatSorter.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/FloatSorter.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/utils/ImmutableList.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/ImmutableList.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/utils/ImmutableList.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/ImmutableList.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/utils/IntSorter.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/IntSorter.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/utils/IntSorter.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/IntSorter.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/utils/IntVector.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/IntVector.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/utils/IntVector.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/IntVector.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/utils/LongSorter.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/LongSorter.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/utils/LongSorter.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/LongSorter.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/utils/MiscUtils.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/MiscUtils.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/utils/MiscUtils.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/MiscUtils.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/utils/StringSorter.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/StringSorter.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/utils/StringSorter.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/StringSorter.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/utils/StringUtils.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/StringUtils.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/utils/StringUtils.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/StringUtils.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/utils/VMUtils.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/VMUtils.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/utils/VMUtils.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/VMUtils.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/utils/Wildcards.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/Wildcards.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/utils/Wildcards.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/Wildcards.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/utils/formatting/DefaultMethodNameFormatter.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/formatting/DefaultMethodNameFormatter.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/utils/formatting/DefaultMethodNameFormatter.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/formatting/DefaultMethodNameFormatter.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/utils/formatting/Formattable.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/formatting/Formattable.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/utils/formatting/Formattable.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/formatting/Formattable.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/utils/formatting/MethodNameFormatter.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/formatting/MethodNameFormatter.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/utils/formatting/MethodNameFormatter.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/formatting/MethodNameFormatter.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/utils/formatting/MethodNameFormatterFactory.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/formatting/MethodNameFormatterFactory.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/utils/formatting/MethodNameFormatterFactory.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/formatting/MethodNameFormatterFactory.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/utils/formatting/PlainFormattableMethodName.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/formatting/PlainFormattableMethodName.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/utils/formatting/PlainFormattableMethodName.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/utils/formatting/PlainFormattableMethodName.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/AsyncMessageCommand.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/AsyncMessageCommand.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/AsyncMessageCommand.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/AsyncMessageCommand.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/Bundle.properties b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/Bundle.properties
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/Bundle.properties
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/Bundle.properties
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/CalibrationDataResponse.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/CalibrationDataResponse.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/CalibrationDataResponse.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/CalibrationDataResponse.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/ClassLoadedCommand.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/ClassLoadedCommand.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/ClassLoadedCommand.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/ClassLoadedCommand.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/CodeRegionCPUResultsResponse.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/CodeRegionCPUResultsResponse.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/CodeRegionCPUResultsResponse.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/CodeRegionCPUResultsResponse.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/Command.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/Command.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/Command.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/Command.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/DefiningLoaderResponse.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/DefiningLoaderResponse.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/DefiningLoaderResponse.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/DefiningLoaderResponse.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/DumpResultsResponse.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/DumpResultsResponse.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/DumpResultsResponse.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/DumpResultsResponse.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/EventBufferDumpedCommand.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/EventBufferDumpedCommand.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/EventBufferDumpedCommand.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/EventBufferDumpedCommand.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/GetClassFileBytesCommand.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/GetClassFileBytesCommand.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/GetClassFileBytesCommand.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/GetClassFileBytesCommand.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/GetClassFileBytesResponse.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/GetClassFileBytesResponse.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/GetClassFileBytesResponse.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/GetClassFileBytesResponse.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/GetClassIdCommand.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/GetClassIdCommand.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/GetClassIdCommand.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/GetClassIdCommand.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/GetClassIdResponse.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/GetClassIdResponse.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/GetClassIdResponse.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/GetClassIdResponse.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/GetDefiningClassLoaderCommand.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/GetDefiningClassLoaderCommand.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/GetDefiningClassLoaderCommand.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/GetDefiningClassLoaderCommand.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/GetMethodNamesForJMethodIdsCommand.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/GetMethodNamesForJMethodIdsCommand.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/GetMethodNamesForJMethodIdsCommand.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/GetMethodNamesForJMethodIdsCommand.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/HeapHistogramResponse.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/HeapHistogramResponse.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/HeapHistogramResponse.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/HeapHistogramResponse.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/InitiateProfilingCommand.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/InitiateProfilingCommand.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/InitiateProfilingCommand.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/InitiateProfilingCommand.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/InstrumentMethodGroupCommand.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/InstrumentMethodGroupCommand.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/InstrumentMethodGroupCommand.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/InstrumentMethodGroupCommand.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/InstrumentMethodGroupData.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/InstrumentMethodGroupData.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/InstrumentMethodGroupData.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/InstrumentMethodGroupData.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/InstrumentMethodGroupResponse.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/InstrumentMethodGroupResponse.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/InstrumentMethodGroupResponse.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/InstrumentMethodGroupResponse.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/InternalStatsResponse.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/InternalStatsResponse.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/InternalStatsResponse.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/InternalStatsResponse.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/MethodInvokedFirstTimeCommand.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/MethodInvokedFirstTimeCommand.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/MethodInvokedFirstTimeCommand.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/MethodInvokedFirstTimeCommand.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/MethodLoadedCommand.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/MethodLoadedCommand.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/MethodLoadedCommand.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/MethodLoadedCommand.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/MethodNamesResponse.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/MethodNamesResponse.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/MethodNamesResponse.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/MethodNamesResponse.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/MonitoredNumbersResponse.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/MonitoredNumbersResponse.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/MonitoredNumbersResponse.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/MonitoredNumbersResponse.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/ObjectAllocationResultsResponse.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/ObjectAllocationResultsResponse.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/ObjectAllocationResultsResponse.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/ObjectAllocationResultsResponse.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/Response.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/Response.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/Response.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/Response.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/RootClassLoadedCommand.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/RootClassLoadedCommand.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/RootClassLoadedCommand.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/RootClassLoadedCommand.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/SetChangeableInstrParamsCommand.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/SetChangeableInstrParamsCommand.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/SetChangeableInstrParamsCommand.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/SetChangeableInstrParamsCommand.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/SetUnchangeableInstrParamsCommand.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/SetUnchangeableInstrParamsCommand.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/SetUnchangeableInstrParamsCommand.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/SetUnchangeableInstrParamsCommand.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/TakeHeapDumpCommand.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/TakeHeapDumpCommand.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/TakeHeapDumpCommand.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/TakeHeapDumpCommand.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/ThreadDumpResponse.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/ThreadDumpResponse.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/ThreadDumpResponse.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/ThreadDumpResponse.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/ThreadLivenessStatusResponse.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/ThreadLivenessStatusResponse.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/ThreadLivenessStatusResponse.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/ThreadLivenessStatusResponse.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/VMPropertiesResponse.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/VMPropertiesResponse.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/VMPropertiesResponse.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/VMPropertiesResponse.java
diff --git a/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/WireIO.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/WireIO.java
similarity index 100%
rename from lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/WireIO.java
rename to profiler/lib.profiler/src/org/netbeans/lib/profiler/wireprotocol/WireIO.java
diff --git a/lib.profiler/test/functional/src/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest.java b/profiler/lib.profiler/test/functional/src/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest.java
similarity index 100%
rename from lib.profiler/test/functional/src/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest.java
rename to profiler/lib.profiler/test/functional/src/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest.java
diff --git a/lib.profiler/test/qa-functional/coverage.txt b/profiler/lib.profiler/test/qa-functional/coverage.txt
similarity index 100%
rename from lib.profiler/test/qa-functional/coverage.txt
rename to profiler/lib.profiler/test/qa-functional/coverage.txt
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitEager.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitEager.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitEager.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitEager.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitEagerServer.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitEagerServer.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitEagerServer.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitEagerServer.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitExcludeWEager.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitExcludeWEager.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitExcludeWEager.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitExcludeWEager.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitExcludeWLazy.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitExcludeWLazy.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitExcludeWLazy.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitExcludeWLazy.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitExcludeWTotal.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitExcludeWTotal.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitExcludeWTotal.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitExcludeWTotal.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitLazy.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitLazy.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitLazy.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitLazy.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitLazyServer.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitLazyServer.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitLazyServer.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitLazyServer.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitTotal.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitTotal.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitTotal.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitTotal.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitTotalServer.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitTotalServer.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitTotalServer.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testMethodWithWaitTotalServer.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsDefault.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsDefault.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsDefault.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsDefault.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumenManyMethodsLazy.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumenManyMethodsLazy.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumenManyMethodsLazy.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumenManyMethodsLazy.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentAllEager.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentAllEager.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentAllEager.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentAllEager.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentAllEagerServer.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentAllEagerServer.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentAllEagerServer.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentAllEagerServer.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentAllLazy.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentAllLazy.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentAllLazy.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentAllLazy.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentAllLazyServer.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentAllLazyServer.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentAllLazyServer.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentAllLazyServer.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentAllTotal.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentAllTotal.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentAllTotal.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentAllTotal.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentAllTotalServer.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentAllTotalServer.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentAllTotalServer.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentAllTotalServer.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentExcludeJavas.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentExcludeJavas.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentExcludeJavas.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentExcludeJavas.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentExcludeJavasServer.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentExcludeJavasServer.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentExcludeJavasServer.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentExcludeJavasServer.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentManyMethodsEager.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentManyMethodsEager.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentManyMethodsEager.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentManyMethodsEager.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentManyMethodsTotal.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentManyMethodsTotal.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentManyMethodsTotal.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentManyMethodsTotal.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentNotSpawnedThreads.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentNotSpawnedThreads.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentNotSpawnedThreads.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentNotSpawnedThreads.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentNotSpawnedThreadsServer.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentNotSpawnedThreadsServer.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentNotSpawnedThreadsServer.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentNotSpawnedThreadsServer.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentRootMethod.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentRootMethod.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentRootMethod.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentRootMethod.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentRootMethodServer.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentRootMethodServer.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentRootMethodServer.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsInstrumentRootMethodServer.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsLimitedThreads.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsLimitedThreads.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsLimitedThreads.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsLimitedThreads.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsLimitedThreadsServer.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsLimitedThreadsServer.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsLimitedThreadsServer.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsLimitedThreadsServer.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsSampledProfilingEager.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsSampledProfilingEager.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsSampledProfilingEager.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsSampledProfilingEager.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsSampledProfilingLazy.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsSampledProfilingLazy.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsSampledProfilingLazy.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsSampledProfilingLazy.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsSampledProfilingServerEager.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsSampledProfilingServerEager.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsSampledProfilingServerEager.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsSampledProfilingServerEager.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsSampledProfilingServerLazy.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsSampledProfilingServerLazy.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsSampledProfilingServerLazy.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsSampledProfilingServerLazy.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsSampledProfilingServerTotal.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsSampledProfilingServerTotal.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsSampledProfilingServerTotal.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsSampledProfilingServerTotal.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsSampledProfilingTotal.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsSampledProfilingTotal.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsSampledProfilingTotal.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest/testSettingsSampledProfilingTotal.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testMethods.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testMethods.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testMethods.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testMethods.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testMethodsServer.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testMethodsServer.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testMethodsServer.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testMethodsServer.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testNoThreads.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testNoThreads.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testNoThreads.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testNoThreads.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testSimple.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testSimple.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testSimple.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testSimple.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testSimpleServer.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testSimpleServer.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testSimpleServer.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testSimpleServer.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testThreads.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testThreads.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testThreads.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testThreads.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testThreadsServer.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testThreadsServer.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testThreadsServer.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testThreadsServer.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testWaits.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testWaits.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testWaits.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testWaits.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testWaitsServer.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testWaitsServer.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testWaitsServer.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest/testWaitsServer.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsAllocations.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsAllocations.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsAllocations.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsAllocations.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsAllocationsServer.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsAllocationsServer.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsAllocationsServer.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsAllocationsServer.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsAllocationsStackTraces.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsAllocationsStackTraces.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsAllocationsStackTraces.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsAllocationsStackTraces.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsAllocationsStackTracesServer.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsAllocationsStackTracesServer.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsAllocationsStackTracesServer.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsAllocationsStackTracesServer.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsDefault.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsDefault.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsDefault.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsDefault.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsLiveness.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsLiveness.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsLiveness.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsLiveness.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsLivenessServer.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsLivenessServer.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsLivenessServer.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsLivenessServer.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsLivenessStackTraces.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsLivenessStackTraces.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsLivenessStackTraces.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsLivenessStackTraces.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsLivenessStackTracesServer.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsLivenessStackTracesServer.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsLivenessStackTracesServer.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest/testSettingsLivenessStackTracesServer.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsAllocations.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsAllocations.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsAllocations.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsAllocations.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsAllocationsServer.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsAllocationsServer.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsAllocationsServer.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsAllocationsServer.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsAllocationsStackTraces.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsAllocationsStackTraces.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsAllocationsStackTraces.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsAllocationsStackTraces.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsAllocationsStackTracesServer.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsAllocationsStackTracesServer.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsAllocationsStackTracesServer.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsAllocationsStackTracesServer.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsLiveness.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsLiveness.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsLiveness.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsLiveness.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsLivenessServer.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsLivenessServer.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsLivenessServer.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsLivenessServer.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsLivenessStackTraces.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsLivenessStackTraces.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsLivenessStackTraces.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsLivenessStackTraces.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsLivenessStackTracesServer.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsLivenessStackTracesServer.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsLivenessStackTracesServer.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest/testSettingsLivenessStackTracesServer.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testBasic.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testBasic.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testBasic.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testBasic.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testBasicCPU.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testBasicCPU.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testBasicCPU.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testBasicCPU.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testBasicMemory.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testBasicMemory.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testBasicMemory.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testBasicMemory.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testCascadeThreads.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testCascadeThreads.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testCascadeThreads.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testCascadeThreads.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testCascadeThreadsCPU.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testCascadeThreadsCPU.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testCascadeThreadsCPU.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testCascadeThreadsCPU.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testCascadeThreadsMemory.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testCascadeThreadsMemory.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testCascadeThreadsMemory.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testCascadeThreadsMemory.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testGUICPU.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testGUICPU.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testGUICPU.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest/testGUICPU.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testJ2SE.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testJ2SE.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testJ2SE.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testJ2SE.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testJaxb.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testJaxb.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testJaxb.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testJaxb.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testJaxbNoGettersEmpties.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testJaxbNoGettersEmpties.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testJaxbNoGettersEmpties.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testJaxbNoGettersEmpties.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testSimple.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testSimple.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testSimple.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testSimple.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testSimpleJ2SE.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testSimpleJ2SE.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testSimpleJ2SE.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testSimpleJ2SE.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testSimpleNoEmpties.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testSimpleNoEmpties.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testSimpleNoEmpties.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testSimpleNoEmpties.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testSimpleNoGetters.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testSimpleNoGetters.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testSimpleNoGetters.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest/testSimpleNoGetters.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testEmpytBlock.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testEmpytBlock.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testEmpytBlock.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testEmpytBlock.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testFirstEmptyLineEndMethod.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testFirstEmptyLineEndMethod.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testFirstEmptyLineEndMethod.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testFirstEmptyLineEndMethod.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testLinesCodeEmptyBlockEmptyLine.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testLinesCodeEmptyBlockEmptyLine.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testLinesCodeEmptyBlockEmptyLine.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testLinesCodeEmptyBlockEmptyLine.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testLinesWithWait.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testLinesWithWait.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testLinesWithWait.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testLinesWithWait.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testSimpleBlock.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testSimpleBlock.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testSimpleBlock.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testSimpleBlock.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testSimpleBlockServer.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testSimpleBlockServer.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testSimpleBlockServer.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testSimpleBlockServer.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testStartMethodMultiCommands.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testStartMethodMultiCommands.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testStartMethodMultiCommands.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testStartMethodMultiCommands.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testWholeMethod.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testWholeMethod.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testWholeMethod.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest/testWholeMethod.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/wireio/BasicTest/testComplexCommands.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/wireio/BasicTest/testComplexCommands.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/wireio/BasicTest/testComplexCommands.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/wireio/BasicTest/testComplexCommands.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/wireio/BasicTest/testComplexResponse.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/wireio/BasicTest/testComplexResponse.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/wireio/BasicTest/testComplexResponse.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/wireio/BasicTest/testComplexResponse.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/wireio/BasicTest/testSimpleCommands.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/wireio/BasicTest/testSimpleCommands.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/wireio/BasicTest/testSimpleCommands.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/wireio/BasicTest/testSimpleCommands.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/wireio/BasicTest/testSimpleResponse.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/wireio/BasicTest/testSimpleResponse.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/wireio/BasicTest/testSimpleResponse.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/wireio/BasicTest/testSimpleResponse.pass
diff --git a/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/wireio/BasicTest/testUnknownSimpleCommand.pass b/profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/wireio/BasicTest/testUnknownSimpleCommand.pass
similarity index 100%
rename from lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/wireio/BasicTest/testUnknownSimpleCommand.pass
rename to profiler/lib.profiler/test/qa-functional/data/goldenfiles/org/netbeans/lib/profiler/tests/jfluid/wireio/BasicTest/testUnknownSimpleCommand.pass
diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/build-before-profiler.xml b/profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/build-before-profiler.xml
similarity index 100%
rename from lib.profiler/test/qa-functional/data/projects/j2se-simple/build-before-profiler.xml
rename to profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/build-before-profiler.xml
diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/build.xml b/profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/build.xml
similarity index 100%
rename from lib.profiler/test/qa-functional/data/projects/j2se-simple/build.xml
rename to profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/build.xml
diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/build-impl.xml b/profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/build-impl.xml
similarity index 100%
rename from lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/build-impl.xml
rename to profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/build-impl.xml
diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/genfiles.properties b/profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/genfiles.properties
similarity index 100%
rename from lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/genfiles.properties
rename to profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/genfiles.properties
diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/profiler-build-impl.xml b/profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/profiler-build-impl.xml
similarity index 100%
rename from lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/profiler-build-impl.xml
rename to profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/profiler-build-impl.xml
diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/project.properties b/profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/project.properties
similarity index 100%
rename from lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/project.properties
rename to profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/project.properties
diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/project.xml b/profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/project.xml
similarity index 100%
rename from lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/project.xml
rename to profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/project.xml
diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/CPU.java b/profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/CPU.java
similarity index 100%
rename from lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/CPU.java
rename to profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/CPU.java
diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/Consumer.java b/profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/Consumer.java
similarity index 100%
rename from lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/Consumer.java
rename to profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/Consumer.java
diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/Data.java b/profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/Data.java
similarity index 100%
rename from lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/Data.java
rename to profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/Data.java
diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/Memory.java b/profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/Memory.java
similarity index 100%
rename from lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/Memory.java
rename to profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/Memory.java
diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/Monitor.java b/profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/Monitor.java
similarity index 100%
rename from lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/Monitor.java
rename to profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/Monitor.java
diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/Producer.java b/profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/Producer.java
similarity index 100%
rename from lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/Producer.java
rename to profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/Producer.java
diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/AnotherThread.java b/profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/AnotherThread.java
similarity index 100%
rename from lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/AnotherThread.java
rename to profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/AnotherThread.java
diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/Bean.java b/profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/Bean.java
similarity index 100%
rename from lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/Bean.java
rename to profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/Bean.java
diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/CPU1.java b/profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/CPU1.java
similarity index 100%
rename from lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/CPU1.java
rename to profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/CPU1.java
diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/CPUThread.java b/profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/CPUThread.java
similarity index 100%
rename from lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/CPUThread.java
rename to profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/CPUThread.java
diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/Measure.java b/profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/Measure.java
similarity index 100%
rename from lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/Measure.java
rename to profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/Measure.java
diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/Methods.java b/profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/Methods.java
similarity index 100%
rename from lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/Methods.java
rename to profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/Methods.java
diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/Methods2.java b/profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/Methods2.java
similarity index 100%
rename from lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/Methods2.java
rename to profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/Methods2.java
diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/Region.java b/profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/Region.java
similarity index 100%
rename from lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/Region.java
rename to profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/Region.java
diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/WaitingTest.java b/profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/WaitingTest.java
similarity index 100%
rename from lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/WaitingTest.java
rename to profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/cpu/WaitingTest.java
diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/memory/Bean.java b/profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/memory/Bean.java
similarity index 100%
rename from lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/memory/Bean.java
rename to profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/memory/Bean.java
diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/memory/Memory1.java b/profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/memory/Memory1.java
similarity index 100%
rename from lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/memory/Memory1.java
rename to profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/memory/Memory1.java
diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/monitor/CascadeThread.java b/profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/monitor/CascadeThread.java
similarity index 100%
rename from lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/monitor/CascadeThread.java
rename to profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/monitor/CascadeThread.java
diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/monitor/Monitor1.java b/profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/monitor/Monitor1.java
similarity index 100%
rename from lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/monitor/Monitor1.java
rename to profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/src/simple/monitor/Monitor1.java
diff --git a/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/BasicTest.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/BasicTest.java
similarity index 100%
rename from lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/BasicTest.java
rename to profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/BasicTest.java
diff --git a/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/CommonProfilerTestCase.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/CommonProfilerTestCase.java
similarity index 100%
rename from lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/CommonProfilerTestCase.java
rename to profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/CommonProfilerTestCase.java
diff --git a/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/ProfilerStableTestSuite.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/ProfilerStableTestSuite.java
similarity index 100%
rename from lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/ProfilerStableTestSuite.java
rename to profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/ProfilerStableTestSuite.java
diff --git a/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/benchmarks/JbbTest.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/benchmarks/JbbTest.java
similarity index 100%
rename from lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/benchmarks/JbbTest.java
rename to profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/benchmarks/JbbTest.java
diff --git a/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/benchmarks/JbbTestType.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/benchmarks/JbbTestType.java
similarity index 100%
rename from lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/benchmarks/JbbTestType.java
rename to profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/benchmarks/JbbTestType.java
diff --git a/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest.java
similarity index 100%
rename from lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest.java
rename to profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/cpu/BasicTest.java
diff --git a/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest.java
similarity index 100%
rename from lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest.java
rename to profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTest.java
diff --git a/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTestCase.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTestCase.java
similarity index 100%
rename from lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTestCase.java
rename to profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUSnapshotTestCase.java
diff --git a/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUTestCase.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUTestCase.java
similarity index 100%
rename from lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUTestCase.java
rename to profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/cpu/CPUTestCase.java
diff --git a/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest.java
similarity index 100%
rename from lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest.java
rename to profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/memory/BasicTest.java
diff --git a/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest.java
similarity index 100%
rename from lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest.java
rename to profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTest.java
diff --git a/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTestCase.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTestCase.java
similarity index 100%
rename from lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTestCase.java
rename to profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/memory/MemorySnapshotTestCase.java
diff --git a/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/memory/MemoryTestCase.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/memory/MemoryTestCase.java
similarity index 100%
rename from lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/memory/MemoryTestCase.java
rename to profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/memory/MemoryTestCase.java
diff --git a/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest.java
similarity index 100%
rename from lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest.java
rename to profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/monitor/BasicTest.java
diff --git a/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/monitor/MonitorTestCase.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/monitor/MonitorTestCase.java
similarity index 100%
rename from lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/monitor/MonitorTestCase.java
rename to profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/monitor/MonitorTestCase.java
diff --git a/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/others/MeasureDiffsTest.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/others/MeasureDiffsTest.java
similarity index 100%
rename from lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/others/MeasureDiffsTest.java
rename to profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/others/MeasureDiffsTest.java
diff --git a/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/others/MeasureDiffsTestCase.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/others/MeasureDiffsTestCase.java
similarity index 100%
rename from lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/others/MeasureDiffsTestCase.java
rename to profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/others/MeasureDiffsTestCase.java
diff --git a/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest.java
similarity index 100%
rename from lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest.java
rename to profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/perf/InstrumentationTest.java
diff --git a/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest.java
similarity index 100%
rename from lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest.java
rename to profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/BasicTest.java
diff --git a/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/ProfilingPointsTestCase.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/ProfilingPointsTestCase.java
similarity index 100%
rename from lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/ProfilingPointsTestCase.java
rename to profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/profilingpoints/ProfilingPointsTestCase.java
diff --git a/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/utils/DumpStream.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/utils/DumpStream.java
similarity index 100%
rename from lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/utils/DumpStream.java
rename to profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/utils/DumpStream.java
diff --git a/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/utils/TestAsyncDialog.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/utils/TestAsyncDialog.java
similarity index 100%
rename from lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/utils/TestAsyncDialog.java
rename to profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/utils/TestAsyncDialog.java
diff --git a/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/utils/TestProfilerAppHandler.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/utils/TestProfilerAppHandler.java
similarity index 100%
rename from lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/utils/TestProfilerAppHandler.java
rename to profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/utils/TestProfilerAppHandler.java
diff --git a/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/utils/TestProfilingPointsProcessor.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/utils/TestProfilingPointsProcessor.java
similarity index 100%
rename from lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/utils/TestProfilingPointsProcessor.java
rename to profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/utils/TestProfilingPointsProcessor.java
diff --git a/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/utils/Utils.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/utils/Utils.java
similarity index 100%
rename from lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/utils/Utils.java
rename to profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/utils/Utils.java
diff --git a/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/wireio/BasicTest.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/wireio/BasicTest.java
similarity index 100%
rename from lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/wireio/BasicTest.java
rename to profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/wireio/BasicTest.java
diff --git a/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/wireio/CommonWireIOTestCase.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/wireio/CommonWireIOTestCase.java
similarity index 100%
rename from lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/wireio/CommonWireIOTestCase.java
rename to profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/wireio/CommonWireIOTestCase.java
diff --git a/lib.profiler/test/unit/src/org/netbeans/lib/profiler/heap/HeapTest.java b/profiler/lib.profiler/test/unit/src/org/netbeans/lib/profiler/heap/HeapTest.java
similarity index 100%
rename from lib.profiler/test/unit/src/org/netbeans/lib/profiler/heap/HeapTest.java
rename to profiler/lib.profiler/test/unit/src/org/netbeans/lib/profiler/heap/HeapTest.java
diff --git a/lib.profiler/test/unit/src/org/netbeans/lib/profiler/heap/heapDumpLog.txt b/profiler/lib.profiler/test/unit/src/org/netbeans/lib/profiler/heap/heapDumpLog.txt
similarity index 100%
rename from lib.profiler/test/unit/src/org/netbeans/lib/profiler/heap/heapDumpLog.txt
rename to profiler/lib.profiler/test/unit/src/org/netbeans/lib/profiler/heap/heapDumpLog.txt
diff --git a/lib.profiler/test/unit/src/org/netbeans/lib/profiler/heap/heap_dump.bin b/profiler/lib.profiler/test/unit/src/org/netbeans/lib/profiler/heap/heap_dump.bin
similarity index 100%
rename from lib.profiler/test/unit/src/org/netbeans/lib/profiler/heap/heap_dump.bin
rename to profiler/lib.profiler/test/unit/src/org/netbeans/lib/profiler/heap/heap_dump.bin
diff --git a/lib.profiler/test/unit/src/org/netbeans/lib/profiler/results/cpu/StackTraceSnapshotBuilderTest.java b/profiler/lib.profiler/test/unit/src/org/netbeans/lib/profiler/results/cpu/StackTraceSnapshotBuilderTest.java
similarity index 100%
rename from lib.profiler/test/unit/src/org/netbeans/lib/profiler/results/cpu/StackTraceSnapshotBuilderTest.java
rename to profiler/lib.profiler/test/unit/src/org/netbeans/lib/profiler/results/cpu/StackTraceSnapshotBuilderTest.java
diff --git a/lib.profiler/test/unit/src/org/netbeans/lib/profiler/utils/VMUtilsTest.java b/profiler/lib.profiler/test/unit/src/org/netbeans/lib/profiler/utils/VMUtilsTest.java
similarity index 100%
rename from lib.profiler/test/unit/src/org/netbeans/lib/profiler/utils/VMUtilsTest.java
rename to profiler/lib.profiler/test/unit/src/org/netbeans/lib/profiler/utils/VMUtilsTest.java
diff --git a/lib.profiler/test/unit/src/org/netbeans/lib/profiler/utils/formatting/PlainFormattableMethodNameTest.java b/profiler/lib.profiler/test/unit/src/org/netbeans/lib/profiler/utils/formatting/PlainFormattableMethodNameTest.java
similarity index 100%
rename from lib.profiler/test/unit/src/org/netbeans/lib/profiler/utils/formatting/PlainFormattableMethodNameTest.java
rename to profiler/lib.profiler/test/unit/src/org/netbeans/lib/profiler/utils/formatting/PlainFormattableMethodNameTest.java
diff --git a/maven.profiler/build.xml b/profiler/maven.profiler/build.xml
similarity index 88%
rename from maven.profiler/build.xml
rename to profiler/maven.profiler/build.xml
index 4607e45222..4d4fc826d1 100644
--- a/maven.profiler/build.xml
+++ b/profiler/maven.profiler/build.xml
@@ -20,7 +20,7 @@
 
 -->
 
-<project basedir="." default="build" name="maven.profiler">
+<project basedir="." default="build" name="profiler/maven.profiler">
     <description>Builds, tests, and runs the project org.netbeans.modules.maven.profiler</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/maven.profiler/manifest.mf b/profiler/maven.profiler/manifest.mf
similarity index 100%
rename from maven.profiler/manifest.mf
rename to profiler/maven.profiler/manifest.mf
diff --git a/maven.profiler/nbproject/project.properties b/profiler/maven.profiler/nbproject/project.properties
similarity index 100%
rename from maven.profiler/nbproject/project.properties
rename to profiler/maven.profiler/nbproject/project.properties
diff --git a/maven.profiler/nbproject/project.xml b/profiler/maven.profiler/nbproject/project.xml
similarity index 100%
rename from maven.profiler/nbproject/project.xml
rename to profiler/maven.profiler/nbproject/project.xml
diff --git a/maven.profiler/src/org/netbeans/modules/maven/profiler/Bundle.properties b/profiler/maven.profiler/src/org/netbeans/modules/maven/profiler/Bundle.properties
similarity index 100%
rename from maven.profiler/src/org/netbeans/modules/maven/profiler/Bundle.properties
rename to profiler/maven.profiler/src/org/netbeans/modules/maven/profiler/Bundle.properties
diff --git a/maven.profiler/src/org/netbeans/modules/maven/profiler/MavenProjectProfilingSupportProvider.java b/profiler/maven.profiler/src/org/netbeans/modules/maven/profiler/MavenProjectProfilingSupportProvider.java
similarity index 100%
rename from maven.profiler/src/org/netbeans/modules/maven/profiler/MavenProjectProfilingSupportProvider.java
rename to profiler/maven.profiler/src/org/netbeans/modules/maven/profiler/MavenProjectProfilingSupportProvider.java
diff --git a/maven.profiler/src/org/netbeans/modules/maven/profiler/RunCheckerImpl.java b/profiler/maven.profiler/src/org/netbeans/modules/maven/profiler/RunCheckerImpl.java
similarity index 100%
rename from maven.profiler/src/org/netbeans/modules/maven/profiler/RunCheckerImpl.java
rename to profiler/maven.profiler/src/org/netbeans/modules/maven/profiler/RunCheckerImpl.java
diff --git a/profiler.api/build.xml b/profiler/profiler.api/build.xml
similarity index 88%
rename from profiler.api/build.xml
rename to profiler/profiler.api/build.xml
index b582b1266c..22d0a73c1e 100644
--- a/profiler.api/build.xml
+++ b/profiler/profiler.api/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="profiler.api">
+<project basedir="." default="build" name="profiler/profiler.api">
     <description>Builds, tests, and runs the project org.netbeans.modules.profiler.api</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/profiler.api/manifest.mf b/profiler/profiler.api/manifest.mf
similarity index 100%
rename from profiler.api/manifest.mf
rename to profiler/profiler.api/manifest.mf
diff --git a/profiler.api/nbproject/project.properties b/profiler/profiler.api/nbproject/project.properties
similarity index 100%
rename from profiler.api/nbproject/project.properties
rename to profiler/profiler.api/nbproject/project.properties
diff --git a/profiler.api/nbproject/project.xml b/profiler/profiler.api/nbproject/project.xml
similarity index 100%
rename from profiler.api/nbproject/project.xml
rename to profiler/profiler.api/nbproject/project.xml
diff --git a/profiler.api/src/org/netbeans/modules/profiler/api/ActionsSupport.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/ActionsSupport.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/api/ActionsSupport.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/api/ActionsSupport.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/api/Bundle.properties b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/Bundle.properties
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/api/Bundle.properties
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/api/Bundle.properties
diff --git a/profiler.api/src/org/netbeans/modules/profiler/api/EditorContext.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/EditorContext.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/api/EditorContext.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/api/EditorContext.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/api/EditorSupport.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/EditorSupport.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/api/EditorSupport.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/api/EditorSupport.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/api/GestureSubmitter.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/GestureSubmitter.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/api/GestureSubmitter.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/api/GestureSubmitter.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/api/GoToSource.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/GoToSource.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/api/GoToSource.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/api/GoToSource.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/api/JavaPlatform.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/JavaPlatform.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/api/JavaPlatform.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/api/JavaPlatform.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/api/ProfilerDialogs.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/ProfilerDialogs.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/api/ProfilerDialogs.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/api/ProfilerDialogs.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/api/ProfilerIDESettings.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/ProfilerIDESettings.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/api/ProfilerIDESettings.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/api/ProfilerIDESettings.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/api/ProfilerProject.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/ProfilerProject.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/api/ProfilerProject.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/api/ProfilerProject.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/api/ProfilerSource.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/ProfilerSource.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/api/ProfilerSource.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/api/ProfilerSource.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/api/ProfilerStorage.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/ProfilerStorage.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/api/ProfilerStorage.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/api/ProfilerStorage.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/api/ProgressDisplayer.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/ProgressDisplayer.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/api/ProgressDisplayer.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/api/ProgressDisplayer.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/api/ProjectUtilities.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/ProjectUtilities.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/api/ProjectUtilities.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/api/ProjectUtilities.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/api/icons/GeneralIcons.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/icons/GeneralIcons.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/api/icons/GeneralIcons.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/api/icons/GeneralIcons.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/api/icons/Icons.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/icons/Icons.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/api/icons/Icons.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/api/icons/Icons.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/api/icons/LanguageIcons.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/icons/LanguageIcons.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/api/icons/LanguageIcons.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/api/icons/LanguageIcons.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/api/icons/ProfilerIcons.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/icons/ProfilerIcons.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/api/icons/ProfilerIcons.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/api/icons/ProfilerIcons.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/api/java/ExternalPackages.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/ExternalPackages.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/api/java/ExternalPackages.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/ExternalPackages.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/api/java/JavaProfilerSource.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/JavaProfilerSource.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/api/java/JavaProfilerSource.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/JavaProfilerSource.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/api/java/ProfilerTypeUtils.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/ProfilerTypeUtils.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/api/java/ProfilerTypeUtils.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/ProfilerTypeUtils.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/api/java/SourceClassInfo.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/SourceClassInfo.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/api/java/SourceClassInfo.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/SourceClassInfo.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/api/java/SourceMethodInfo.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/SourceMethodInfo.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/api/java/SourceMethodInfo.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/SourceMethodInfo.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/api/java/SourcePackageInfo.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/SourcePackageInfo.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/api/java/SourcePackageInfo.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/SourcePackageInfo.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/api/project/ProjectContentsSupport.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/project/ProjectContentsSupport.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/api/project/ProjectContentsSupport.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/api/project/ProjectContentsSupport.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/api/project/ProjectProfilingSupport.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/project/ProjectProfilingSupport.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/api/project/ProjectProfilingSupport.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/api/project/ProjectProfilingSupport.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/spi/ActionsSupportProvider.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/ActionsSupportProvider.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/spi/ActionsSupportProvider.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/spi/ActionsSupportProvider.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/spi/EditorSupportProvider.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/EditorSupportProvider.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/spi/EditorSupportProvider.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/spi/EditorSupportProvider.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/spi/IconsProvider.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/IconsProvider.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/spi/IconsProvider.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/spi/IconsProvider.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/spi/JavaPlatformManagerProvider.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/JavaPlatformManagerProvider.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/spi/JavaPlatformManagerProvider.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/spi/JavaPlatformManagerProvider.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/spi/JavaPlatformProvider.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/JavaPlatformProvider.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/spi/JavaPlatformProvider.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/spi/JavaPlatformProvider.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/spi/LoadGenPlugin.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/LoadGenPlugin.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/spi/LoadGenPlugin.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/spi/LoadGenPlugin.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/spi/ProfilerDialogsProvider.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/ProfilerDialogsProvider.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/spi/ProfilerDialogsProvider.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/spi/ProfilerDialogsProvider.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/spi/ProfilerStorageProvider.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/ProfilerStorageProvider.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/spi/ProfilerStorageProvider.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/spi/ProfilerStorageProvider.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/spi/ProjectUtilitiesProvider.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/ProjectUtilitiesProvider.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/spi/ProjectUtilitiesProvider.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/spi/ProjectUtilitiesProvider.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/spi/SessionListener.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/SessionListener.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/spi/SessionListener.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/spi/SessionListener.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/spi/java/AbstractJavaProfilerSource.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/java/AbstractJavaProfilerSource.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/spi/java/AbstractJavaProfilerSource.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/spi/java/AbstractJavaProfilerSource.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/spi/java/GoToSourceProvider.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/java/GoToSourceProvider.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/spi/java/GoToSourceProvider.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/spi/java/GoToSourceProvider.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/spi/java/ProfilerTypeUtilsProvider.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/java/ProfilerTypeUtilsProvider.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/spi/java/ProfilerTypeUtilsProvider.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/spi/java/ProfilerTypeUtilsProvider.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/spi/project/Bundle.properties b/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/project/Bundle.properties
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/spi/project/Bundle.properties
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/spi/project/Bundle.properties
diff --git a/profiler.api/src/org/netbeans/modules/profiler/spi/project/ProjectContentsSupportProvider.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/project/ProjectContentsSupportProvider.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/spi/project/ProjectContentsSupportProvider.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/spi/project/ProjectContentsSupportProvider.java
diff --git a/profiler.api/src/org/netbeans/modules/profiler/spi/project/ProjectProfilingSupportProvider.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/project/ProjectProfilingSupportProvider.java
similarity index 100%
rename from profiler.api/src/org/netbeans/modules/profiler/spi/project/ProjectProfilingSupportProvider.java
rename to profiler/profiler.api/src/org/netbeans/modules/profiler/spi/project/ProjectProfilingSupportProvider.java
diff --git a/profiler.attach/build.xml b/profiler/profiler.attach/build.xml
similarity index 88%
rename from profiler.attach/build.xml
rename to profiler/profiler.attach/build.xml
index de4235b78d..c0827e358f 100644
--- a/profiler.attach/build.xml
+++ b/profiler/profiler.attach/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="profiler.attach">
+<project basedir="." default="build" name="profiler/profiler.attach">
     <description>Builds, tests, and runs the project org.netbeans.modules.profiler.attach</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/profiler.attach/manifest.mf b/profiler/profiler.attach/manifest.mf
similarity index 100%
rename from profiler.attach/manifest.mf
rename to profiler/profiler.attach/manifest.mf
diff --git a/profiler.attach/nbproject/project.properties b/profiler/profiler.attach/nbproject/project.properties
similarity index 100%
rename from profiler.attach/nbproject/project.properties
rename to profiler/profiler.attach/nbproject/project.properties
diff --git a/profiler.attach/nbproject/project.xml b/profiler/profiler.attach/nbproject/project.xml
similarity index 100%
rename from profiler.attach/nbproject/project.xml
rename to profiler/profiler.attach/nbproject/project.xml
diff --git a/profiler.attach/src/org/netbeans/modules/profiler/attach/AttachWizard.java b/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/AttachWizard.java
similarity index 100%
rename from profiler.attach/src/org/netbeans/modules/profiler/attach/AttachWizard.java
rename to profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/AttachWizard.java
diff --git a/profiler.attach/src/org/netbeans/modules/profiler/attach/Bundle.properties b/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/Bundle.properties
similarity index 100%
rename from profiler.attach/src/org/netbeans/modules/profiler/attach/Bundle.properties
rename to profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/Bundle.properties
diff --git a/profiler.attach/src/org/netbeans/modules/profiler/attach/dialog/AttachDialog.java b/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/dialog/AttachDialog.java
similarity index 100%
rename from profiler.attach/src/org/netbeans/modules/profiler/attach/dialog/AttachDialog.java
rename to profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/dialog/AttachDialog.java
diff --git a/profiler.attach/src/org/netbeans/modules/profiler/attach/providers/RemotePackExporter.java b/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/providers/RemotePackExporter.java
similarity index 100%
rename from profiler.attach/src/org/netbeans/modules/profiler/attach/providers/RemotePackExporter.java
rename to profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/providers/RemotePackExporter.java
diff --git a/profiler.attach/src/org/netbeans/modules/profiler/attach/providers/TargetPlatformEnum.java b/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/providers/TargetPlatformEnum.java
similarity index 100%
rename from profiler.attach/src/org/netbeans/modules/profiler/attach/providers/TargetPlatformEnum.java
rename to profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/providers/TargetPlatformEnum.java
diff --git a/profiler.attach/src/org/netbeans/modules/profiler/attach/spi/AbstractRemotePackExporter.java b/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/spi/AbstractRemotePackExporter.java
similarity index 100%
rename from profiler.attach/src/org/netbeans/modules/profiler/attach/spi/AbstractRemotePackExporter.java
rename to profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/spi/AbstractRemotePackExporter.java
diff --git a/profiler.attach/src/org/netbeans/modules/profiler/attach/spi/AttachStepsProvider.java b/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/spi/AttachStepsProvider.java
similarity index 100%
rename from profiler.attach/src/org/netbeans/modules/profiler/attach/spi/AttachStepsProvider.java
rename to profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/spi/AttachStepsProvider.java
diff --git a/profiler.attach/src/org/netbeans/modules/profiler/attach/steps/BasicAttachStepsProvider.java b/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/steps/BasicAttachStepsProvider.java
similarity index 100%
rename from profiler.attach/src/org/netbeans/modules/profiler/attach/steps/BasicAttachStepsProvider.java
rename to profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/steps/BasicAttachStepsProvider.java
diff --git a/profiler.freeform/build.xml b/profiler/profiler.freeform/build.xml
similarity index 88%
rename from profiler.freeform/build.xml
rename to profiler/profiler.freeform/build.xml
index 39ccc886ee..3c99fbd898 100644
--- a/profiler.freeform/build.xml
+++ b/profiler/profiler.freeform/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="profiler.freeform">
+<project basedir="." default="build" name="profiler/profiler.freeform">
     <description>Builds, tests, and runs the project org.netbeans.modules.profiler.freeform</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/profiler.freeform/manifest.mf b/profiler/profiler.freeform/manifest.mf
similarity index 100%
rename from profiler.freeform/manifest.mf
rename to profiler/profiler.freeform/manifest.mf
diff --git a/profiler.freeform/nbproject/project.properties b/profiler/profiler.freeform/nbproject/project.properties
similarity index 100%
rename from profiler.freeform/nbproject/project.properties
rename to profiler/profiler.freeform/nbproject/project.properties
diff --git a/profiler.freeform/nbproject/project.xml b/profiler/profiler.freeform/nbproject/project.xml
similarity index 100%
rename from profiler.freeform/nbproject/project.xml
rename to profiler/profiler.freeform/nbproject/project.xml
diff --git a/profiler.freeform/src/org/netbeans/modules/profiler/freeform/Bundle.properties b/profiler/profiler.freeform/src/org/netbeans/modules/profiler/freeform/Bundle.properties
similarity index 100%
rename from profiler.freeform/src/org/netbeans/modules/profiler/freeform/Bundle.properties
rename to profiler/profiler.freeform/src/org/netbeans/modules/profiler/freeform/Bundle.properties
diff --git a/profiler.freeform/src/org/netbeans/modules/profiler/freeform/FreeFormAntProjectSupportProvider.java b/profiler/profiler.freeform/src/org/netbeans/modules/profiler/freeform/FreeFormAntProjectSupportProvider.java
similarity index 100%
rename from profiler.freeform/src/org/netbeans/modules/profiler/freeform/FreeFormAntProjectSupportProvider.java
rename to profiler/profiler.freeform/src/org/netbeans/modules/profiler/freeform/FreeFormAntProjectSupportProvider.java
diff --git a/profiler.freeform/src/org/netbeans/modules/profiler/freeform/FreeFormProjectProfilingSupportProvider.java b/profiler/profiler.freeform/src/org/netbeans/modules/profiler/freeform/FreeFormProjectProfilingSupportProvider.java
similarity index 100%
rename from profiler.freeform/src/org/netbeans/modules/profiler/freeform/FreeFormProjectProfilingSupportProvider.java
rename to profiler/profiler.freeform/src/org/netbeans/modules/profiler/freeform/FreeFormProjectProfilingSupportProvider.java
diff --git a/profiler.freeform/src/org/netbeans/modules/profiler/freeform/FreeFormProjectsSupport.java b/profiler/profiler.freeform/src/org/netbeans/modules/profiler/freeform/FreeFormProjectsSupport.java
similarity index 100%
rename from profiler.freeform/src/org/netbeans/modules/profiler/freeform/FreeFormProjectsSupport.java
rename to profiler/profiler.freeform/src/org/netbeans/modules/profiler/freeform/FreeFormProjectsSupport.java
diff --git a/profiler.freeform/src/org/netbeans/modules/profiler/freeform/Util.java b/profiler/profiler.freeform/src/org/netbeans/modules/profiler/freeform/Util.java
similarity index 100%
rename from profiler.freeform/src/org/netbeans/modules/profiler/freeform/Util.java
rename to profiler/profiler.freeform/src/org/netbeans/modules/profiler/freeform/Util.java
diff --git a/profiler.heapwalker/build.xml b/profiler/profiler.heapwalker/build.xml
similarity index 87%
rename from profiler.heapwalker/build.xml
rename to profiler/profiler.heapwalker/build.xml
index 16bff338ed..247673ece4 100644
--- a/profiler.heapwalker/build.xml
+++ b/profiler/profiler.heapwalker/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="profiler.heapwalker">
+<project basedir="." default="build" name="profiler/profiler.heapwalker">
     <description>Builds, tests, and runs the project org.netbeans.modules.profiler.heapwalker</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/profiler.heapwalker/licenseinfo.xml b/profiler/profiler.heapwalker/licenseinfo.xml
similarity index 100%
rename from profiler.heapwalker/licenseinfo.xml
rename to profiler/profiler.heapwalker/licenseinfo.xml
diff --git a/profiler.heapwalker/manifest.mf b/profiler/profiler.heapwalker/manifest.mf
similarity index 100%
rename from profiler.heapwalker/manifest.mf
rename to profiler/profiler.heapwalker/manifest.mf
diff --git a/profiler.heapwalker/nbproject/project.properties b/profiler/profiler.heapwalker/nbproject/project.properties
similarity index 100%
rename from profiler.heapwalker/nbproject/project.properties
rename to profiler/profiler.heapwalker/nbproject/project.properties
diff --git a/profiler.heapwalker/nbproject/project.xml b/profiler/profiler.heapwalker/nbproject/project.xml
similarity index 100%
rename from profiler.heapwalker/nbproject/project.xml
rename to profiler/profiler.heapwalker/nbproject/project.xml
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/AbstractController.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/AbstractController.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/AbstractController.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/AbstractController.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/AbstractTopLevelController.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/AbstractTopLevelController.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/AbstractTopLevelController.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/AbstractTopLevelController.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/AnalysisController.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/AnalysisController.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/AnalysisController.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/AnalysisController.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/Bundle.properties b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/Bundle.properties
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/Bundle.properties
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/Bundle.properties
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ClassPresenterPanel.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ClassPresenterPanel.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ClassPresenterPanel.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ClassPresenterPanel.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ClassesController.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ClassesController.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ClassesController.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ClassesController.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ClassesListController.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ClassesListController.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ClassesListController.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ClassesListController.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/CompareSnapshotsHelper.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/CompareSnapshotsHelper.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/CompareSnapshotsHelper.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/CompareSnapshotsHelper.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/FieldsBrowserController.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/FieldsBrowserController.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/FieldsBrowserController.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/FieldsBrowserController.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapFragmentWalker.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapFragmentWalker.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapFragmentWalker.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapFragmentWalker.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapWalker.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapWalker.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapWalker.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapWalker.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapWalkerManager.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapWalkerManager.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapWalkerManager.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapWalkerManager.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HintsController.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HintsController.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HintsController.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HintsController.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/InstancesController.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/InstancesController.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/InstancesController.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/InstancesController.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/InstancesListController.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/InstancesListController.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/InstancesListController.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/InstancesListController.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/LegendPanel.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/LegendPanel.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/LegendPanel.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/LegendPanel.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/NavigationHistoryManager.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/NavigationHistoryManager.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/NavigationHistoryManager.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/NavigationHistoryManager.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OQLController.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OQLController.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OQLController.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OQLController.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OQLSupport.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OQLSupport.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OQLSupport.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OQLSupport.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OverviewController.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OverviewController.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OverviewController.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OverviewController.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ReferencesBrowserController.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ReferencesBrowserController.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ReferencesBrowserController.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ReferencesBrowserController.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/SummaryController.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/SummaryController.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/SummaryController.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/SummaryController.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/api/DetailsSupport.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/api/DetailsSupport.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/api/DetailsSupport.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/api/DetailsSupport.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/api/ExportAction.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/api/ExportAction.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/api/ExportAction.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/api/ExportAction.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/api/StringDecoder.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/api/StringDecoder.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/api/StringDecoder.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/api/StringDecoder.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/basic/ArrayDetailsProvider.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/basic/ArrayDetailsProvider.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/basic/ArrayDetailsProvider.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/basic/ArrayDetailsProvider.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/basic/ArrayValueView.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/basic/ArrayValueView.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/basic/ArrayValueView.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/basic/ArrayValueView.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/basic/PrimitiveDetailsProvider.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/basic/PrimitiveDetailsProvider.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/basic/PrimitiveDetailsProvider.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/basic/PrimitiveDetailsProvider.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/basic/StringDetailsProvider.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/basic/StringDetailsProvider.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/basic/StringDetailsProvider.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/basic/StringDetailsProvider.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/AtomicDetailsProvider.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/AtomicDetailsProvider.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/AtomicDetailsProvider.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/AtomicDetailsProvider.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/IoDetailsProvider.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/IoDetailsProvider.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/IoDetailsProvider.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/IoDetailsProvider.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/JmxDetailsProvider.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/JmxDetailsProvider.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/JmxDetailsProvider.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/JmxDetailsProvider.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/LangDetailsProvider.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/LangDetailsProvider.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/LangDetailsProvider.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/LangDetailsProvider.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/MathDetailsProvider.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/MathDetailsProvider.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/MathDetailsProvider.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/MathDetailsProvider.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/NetDetailsProvider.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/NetDetailsProvider.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/NetDetailsProvider.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/NetDetailsProvider.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ReferenceDetailsProvider.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ReferenceDetailsProvider.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ReferenceDetailsProvider.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ReferenceDetailsProvider.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ReflectionDetailsProvider.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ReflectionDetailsProvider.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ReflectionDetailsProvider.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ReflectionDetailsProvider.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ThreadDetailsProvider.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ThreadDetailsProvider.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ThreadDetailsProvider.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ThreadDetailsProvider.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/UtilDetailsProvider.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/UtilDetailsProvider.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/UtilDetailsProvider.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/UtilDetailsProvider.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/image/FieldAccessor.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/image/FieldAccessor.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/image/FieldAccessor.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/image/FieldAccessor.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/image/ImageBuilder.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/image/ImageBuilder.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/image/ImageBuilder.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/image/ImageBuilder.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/image/ImageDetailProvider.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/image/ImageDetailProvider.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/image/ImageDetailProvider.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/image/ImageDetailProvider.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/image/ImageExportAction.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/image/ImageExportAction.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/image/ImageExportAction.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/image/ImageExportAction.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/image/InstanceBuilder.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/image/InstanceBuilder.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/image/InstanceBuilder.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/image/InstanceBuilder.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/image/InstanceBuilderRegistry.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/image/InstanceBuilderRegistry.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/image/InstanceBuilderRegistry.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/image/InstanceBuilderRegistry.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/AwtDetailsProvider.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/AwtDetailsProvider.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/AwtDetailsProvider.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/AwtDetailsProvider.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/BaseBuilders.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/BaseBuilders.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/BaseBuilders.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/BaseBuilders.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/BorderBuilders.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/BorderBuilders.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/BorderBuilders.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/BorderBuilders.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/ButtonBuilders.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/ButtonBuilders.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/ButtonBuilders.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/ButtonBuilders.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/ComponentBuilders.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/ComponentBuilders.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/ComponentBuilders.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/ComponentBuilders.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/ComponentDetailsProvider.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/ComponentDetailsProvider.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/ComponentDetailsProvider.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/ComponentDetailsProvider.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/DataViewBuilders.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/DataViewBuilders.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/DataViewBuilders.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/DataViewBuilders.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/JComponentBuilders.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/JComponentBuilders.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/JComponentBuilders.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/JComponentBuilders.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/PaneBuilders.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/PaneBuilders.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/PaneBuilders.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/PaneBuilders.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/TextComponentBuilders.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/TextComponentBuilders.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/TextComponentBuilders.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/TextComponentBuilders.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/Utils.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/Utils.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/Utils.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/Utils.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/WindowBuilders.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/WindowBuilders.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/WindowBuilders.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/WindowBuilders.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/EditorDetailsProvider.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/EditorDetailsProvider.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/EditorDetailsProvider.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/EditorDetailsProvider.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/JavaDetailsProvider.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/JavaDetailsProvider.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/JavaDetailsProvider.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/JavaDetailsProvider.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/JavacDetailsProvider.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/JavacDetailsProvider.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/JavacDetailsProvider.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/JavacDetailsProvider.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/PlatformDetailsProvider.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/PlatformDetailsProvider.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/PlatformDetailsProvider.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/PlatformDetailsProvider.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/VCSDetailsProvider.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/VCSDetailsProvider.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/VCSDetailsProvider.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/VCSDetailsProvider.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/spi/DetailsProvider.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/spi/DetailsProvider.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/spi/DetailsProvider.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/spi/DetailsProvider.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/spi/DetailsUtils.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/spi/DetailsUtils.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/spi/DetailsUtils.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/spi/DetailsUtils.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/Bundle.properties b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/Bundle.properties
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/Bundle.properties
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/Bundle.properties
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/Distribution.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/Distribution.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/Distribution.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/Distribution.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/FieldAccess.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/FieldAccess.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/FieldAccess.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/FieldAccess.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/Histogram.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/Histogram.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/Histogram.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/Histogram.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/IteratingRule.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/IteratingRule.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/IteratingRule.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/IteratingRule.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/MemoryLint.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/MemoryLint.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/MemoryLint.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/MemoryLint.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/Rule.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/Rule.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/Rule.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/Rule.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/RuleRegistry.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/RuleRegistry.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/RuleRegistry.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/RuleRegistry.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/StringHelper.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/StringHelper.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/StringHelper.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/StringHelper.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/Utils.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/Utils.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/Utils.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/Utils.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/Walker.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/Walker.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/Walker.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/Walker.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/Bundle.properties b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/Bundle.properties
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/Bundle.properties
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/Bundle.properties
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/CollapsedHashMap.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/CollapsedHashMap.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/CollapsedHashMap.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/CollapsedHashMap.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/DeepSize.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/DeepSize.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/DeepSize.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/DeepSize.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/DuplicatedString.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/DuplicatedString.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/DuplicatedString.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/DuplicatedString.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/HashMapHistogram.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/HashMapHistogram.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/HashMapHistogram.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/HashMapHistogram.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/OverallocatedString.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/OverallocatedString.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/OverallocatedString.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/OverallocatedString.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/RetainedSetByClass.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/RetainedSetByClass.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/RetainedSetByClass.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/RetainedSetByClass.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/RetainedSetByInstance.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/RetainedSetByInstance.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/RetainedSetByInstance.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/RetainedSetByInstance.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/TooManyBooleans.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/TooManyBooleans.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/TooManyBooleans.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/TooManyBooleans.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/WrongWeakHashMap.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/WrongWeakHashMap.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/WrongWeakHashMap.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/WrongWeakHashMap.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/res/wrongmap.png b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/res/wrongmap.png
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/res/wrongmap.png
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/memorylint/rules/res/wrongmap.png
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/AbstractHeapWalkerNode.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/AbstractHeapWalkerNode.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/AbstractHeapWalkerNode.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/AbstractHeapWalkerNode.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ArrayItem.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ArrayItem.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ArrayItem.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ArrayItem.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ArrayNode.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ArrayNode.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ArrayNode.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ArrayNode.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/BrowserUtils.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/BrowserUtils.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/BrowserUtils.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/BrowserUtils.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/Bundle.properties b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/Bundle.properties
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/Bundle.properties
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/Bundle.properties
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ChildrenComputer.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ChildrenComputer.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ChildrenComputer.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ChildrenComputer.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ClassNode.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ClassNode.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ClassNode.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ClassNode.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/HeapPatterns.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/HeapPatterns.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/HeapPatterns.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/HeapPatterns.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/HeapWalkerFieldNode.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/HeapWalkerFieldNode.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/HeapWalkerFieldNode.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/HeapWalkerFieldNode.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/HeapWalkerInstanceNode.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/HeapWalkerInstanceNode.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/HeapWalkerInstanceNode.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/HeapWalkerInstanceNode.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/HeapWalkerNode.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/HeapWalkerNode.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/HeapWalkerNode.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/HeapWalkerNode.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/HeapWalkerNodeFactory.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/HeapWalkerNodeFactory.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/HeapWalkerNodeFactory.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/HeapWalkerNodeFactory.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/InstanceNode.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/InstanceNode.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/InstanceNode.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/InstanceNode.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/InstancesContainerNode.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/InstancesContainerNode.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/InstancesContainerNode.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/InstancesContainerNode.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ObjectArrayFieldNode.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ObjectArrayFieldNode.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ObjectArrayFieldNode.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ObjectArrayFieldNode.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ObjectArrayNode.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ObjectArrayNode.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ObjectArrayNode.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ObjectArrayNode.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ObjectFieldNode.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ObjectFieldNode.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ObjectFieldNode.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ObjectFieldNode.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ObjectNode.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ObjectNode.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ObjectNode.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/ObjectNode.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/PrimitiveArrayFieldNode.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/PrimitiveArrayFieldNode.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/PrimitiveArrayFieldNode.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/PrimitiveArrayFieldNode.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/PrimitiveArrayNode.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/PrimitiveArrayNode.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/PrimitiveArrayNode.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/PrimitiveArrayNode.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/PrimitiveFieldNode.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/PrimitiveFieldNode.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/PrimitiveFieldNode.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/PrimitiveFieldNode.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/RootNode.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/RootNode.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/RootNode.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/RootNode.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/oql/ui/OQLEditor.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/oql/ui/OQLEditor.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/oql/ui/OQLEditor.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/oql/ui/OQLEditor.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/AnalysisControllerUI.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/AnalysisControllerUI.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/AnalysisControllerUI.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/AnalysisControllerUI.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/ClassesControllerUI.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/ClassesControllerUI.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/ClassesControllerUI.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/ClassesControllerUI.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/ClassesListControllerUI.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/ClassesListControllerUI.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/ClassesListControllerUI.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/ClassesListControllerUI.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/CollapsibleSplitPane.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/CollapsibleSplitPane.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/CollapsibleSplitPane.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/CollapsibleSplitPane.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/FieldTableCellRenderer.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/FieldTableCellRenderer.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/FieldTableCellRenderer.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/FieldTableCellRenderer.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/FieldTreeCellRenderer.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/FieldTreeCellRenderer.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/FieldTreeCellRenderer.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/FieldTreeCellRenderer.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/FieldsBrowserControllerUI.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/FieldsBrowserControllerUI.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/FieldsBrowserControllerUI.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/FieldsBrowserControllerUI.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/HeapFragmentWalkerUI.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/HeapFragmentWalkerUI.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/HeapFragmentWalkerUI.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/HeapFragmentWalkerUI.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/HeapWalkerUI.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/HeapWalkerUI.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/HeapWalkerUI.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/HeapWalkerUI.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/HintsControllerUI.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/HintsControllerUI.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/HintsControllerUI.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/HintsControllerUI.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/InstancesControllerUI.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/InstancesControllerUI.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/InstancesControllerUI.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/InstancesControllerUI.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/InstancesListControllerUI.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/InstancesListControllerUI.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/InstancesListControllerUI.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/InstancesListControllerUI.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/OQLControllerUI.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/OQLControllerUI.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/OQLControllerUI.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/OQLControllerUI.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/OQLQueryCustomizer.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/OQLQueryCustomizer.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/OQLQueryCustomizer.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/OQLQueryCustomizer.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/OpenHeapWalkerAction.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/OpenHeapWalkerAction.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/OpenHeapWalkerAction.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/OpenHeapWalkerAction.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/OverviewControllerUI.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/OverviewControllerUI.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/OverviewControllerUI.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/OverviewControllerUI.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/ReferencesBrowserControllerUI.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/ReferencesBrowserControllerUI.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/ReferencesBrowserControllerUI.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/ReferencesBrowserControllerUI.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/SummaryControllerUI.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/SummaryControllerUI.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/SummaryControllerUI.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/SummaryControllerUI.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/HeapWalkerIcons.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/HeapWalkerIcons.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/HeapWalkerIcons.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/HeapWalkerIcons.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/HeapWalkerIconsProviderImpl.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/HeapWalkerIconsProviderImpl.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/HeapWalkerIconsProviderImpl.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/HeapWalkerIconsProviderImpl.java
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/biggestObjects.png b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/biggestObjects.png
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/biggestObjects.png
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/biggestObjects.png
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/classes.png b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/classes.png
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/classes.png
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/classes.png
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/data.png b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/data.png
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/data.png
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/data.png
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/gcRoot.png b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/gcRoot.png
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/gcRoot.png
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/gcRoot.png
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/gcRoots.png b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/gcRoots.png
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/gcRoots.png
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/gcRoots.png
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/incomingRef.png b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/incomingRef.png
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/incomingRef.png
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/incomingRef.png
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/instances.png b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/instances.png
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/instances.png
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/instances.png
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/loop.png b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/loop.png
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/loop.png
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/loop.png
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/memoryLint.png b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/memoryLint.png
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/memoryLint.png
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/memoryLint.png
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/oqlConsole.png b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/oqlConsole.png
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/oqlConsole.png
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/oqlConsole.png
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/progress.png b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/progress.png
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/progress.png
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/progress.png
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/properties.png b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/properties.png
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/properties.png
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/properties.png
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/rules.png b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/rules.png
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/rules.png
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/rules.png
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/savedOQL.png b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/savedOQL.png
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/savedOQL.png
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/savedOQL.png
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/snapshotDataObject.png b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/snapshotDataObject.png
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/snapshotDataObject.png
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/snapshotDataObject.png
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/snapshotDataObject32.png b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/snapshotDataObject32.png
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/snapshotDataObject32.png
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/snapshotDataObject32.png
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/static.png b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/static.png
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/static.png
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/static.png
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/sysinfo.png b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/sysinfo.png
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/sysinfo.png
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/sysinfo.png
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/window.png b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/window.png
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/window.png
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/icons/impl/window.png
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalker/Bundle.properties b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalker/Bundle.properties
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalker/Bundle.properties
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalker/Bundle.properties
diff --git a/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalker/HprofDataObject.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalker/HprofDataObject.java
similarity index 100%
rename from profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalker/HprofDataObject.java
rename to profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalker/HprofDataObject.java
diff --git a/profiler.j2se/build.xml b/profiler/profiler.j2se/build.xml
similarity index 88%
rename from profiler.j2se/build.xml
rename to profiler/profiler.j2se/build.xml
index bc09a4fb25..75484d3b5b 100644
--- a/profiler.j2se/build.xml
+++ b/profiler/profiler.j2se/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="profiler.j2se">
+<project basedir="." default="build" name="profiler/profiler.j2se">
     <description>Builds, tests, and runs the project org.netbeans.modules.profiler.j2se</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/profiler.j2se/manifest.mf b/profiler/profiler.j2se/manifest.mf
similarity index 100%
rename from profiler.j2se/manifest.mf
rename to profiler/profiler.j2se/manifest.mf
diff --git a/profiler.j2se/nbproject/project.properties b/profiler/profiler.j2se/nbproject/project.properties
similarity index 100%
rename from profiler.j2se/nbproject/project.properties
rename to profiler/profiler.j2se/nbproject/project.properties
diff --git a/profiler.j2se/nbproject/project.xml b/profiler/profiler.j2se/nbproject/project.xml
similarity index 100%
rename from profiler.j2se/nbproject/project.xml
rename to profiler/profiler.j2se/nbproject/project.xml
diff --git a/profiler.j2se/src/org/netbeans/modules/profiler/j2se/Bundle.properties b/profiler/profiler.j2se/src/org/netbeans/modules/profiler/j2se/Bundle.properties
similarity index 100%
rename from profiler.j2se/src/org/netbeans/modules/profiler/j2se/Bundle.properties
rename to profiler/profiler.j2se/src/org/netbeans/modules/profiler/j2se/Bundle.properties
diff --git a/profiler.j2se/src/org/netbeans/modules/profiler/j2se/J2SEAntProjectSupportProvider.java b/profiler/profiler.j2se/src/org/netbeans/modules/profiler/j2se/J2SEAntProjectSupportProvider.java
similarity index 100%
rename from profiler.j2se/src/org/netbeans/modules/profiler/j2se/J2SEAntProjectSupportProvider.java
rename to profiler/profiler.j2se/src/org/netbeans/modules/profiler/j2se/J2SEAntProjectSupportProvider.java
diff --git a/profiler.j2se/src/org/netbeans/modules/profiler/j2se/J2SEProjectProfilingSupportProvider.java b/profiler/profiler.j2se/src/org/netbeans/modules/profiler/j2se/J2SEProjectProfilingSupportProvider.java
similarity index 100%
rename from profiler.j2se/src/org/netbeans/modules/profiler/j2se/J2SEProjectProfilingSupportProvider.java
rename to profiler/profiler.j2se/src/org/netbeans/modules/profiler/j2se/J2SEProjectProfilingSupportProvider.java
diff --git a/profiler.j2se/src/org/netbeans/modules/profiler/j2se/JFXProjectProfilingSupportProvider.java b/profiler/profiler.j2se/src/org/netbeans/modules/profiler/j2se/JFXProjectProfilingSupportProvider.java
similarity index 100%
rename from profiler.j2se/src/org/netbeans/modules/profiler/j2se/JFXProjectProfilingSupportProvider.java
rename to profiler/profiler.j2se/src/org/netbeans/modules/profiler/j2se/JFXProjectProfilingSupportProvider.java
diff --git a/profiler.j2se/src/org/netbeans/modules/profiler/j2se/mf-layer.xml b/profiler/profiler.j2se/src/org/netbeans/modules/profiler/j2se/mf-layer.xml
similarity index 100%
rename from profiler.j2se/src/org/netbeans/modules/profiler/j2se/mf-layer.xml
rename to profiler/profiler.j2se/src/org/netbeans/modules/profiler/j2se/mf-layer.xml
diff --git a/profiler.j2se/src/org/netbeans/modules/profiler/j2se/profiler-build-impl.xsl b/profiler/profiler.j2se/src/org/netbeans/modules/profiler/j2se/profiler-build-impl.xsl
similarity index 100%
rename from profiler.j2se/src/org/netbeans/modules/profiler/j2se/profiler-build-impl.xsl
rename to profiler/profiler.j2se/src/org/netbeans/modules/profiler/j2se/profiler-build-impl.xsl
diff --git a/profiler.j2se/test/unit/data/JavaApp/build.xml b/profiler/profiler.j2se/test/unit/data/JavaApp/build.xml
similarity index 100%
rename from profiler.j2se/test/unit/data/JavaApp/build.xml
rename to profiler/profiler.j2se/test/unit/data/JavaApp/build.xml
diff --git a/profiler.j2se/test/unit/data/JavaApp/manifest.mf b/profiler/profiler.j2se/test/unit/data/JavaApp/manifest.mf
similarity index 100%
rename from profiler.j2se/test/unit/data/JavaApp/manifest.mf
rename to profiler/profiler.j2se/test/unit/data/JavaApp/manifest.mf
diff --git a/profiler.j2se/test/unit/data/JavaApp/nbproject/build-impl.xml b/profiler/profiler.j2se/test/unit/data/JavaApp/nbproject/build-impl.xml
similarity index 100%
rename from profiler.j2se/test/unit/data/JavaApp/nbproject/build-impl.xml
rename to profiler/profiler.j2se/test/unit/data/JavaApp/nbproject/build-impl.xml
diff --git a/profiler.j2se/test/unit/data/JavaApp/nbproject/project.properties b/profiler/profiler.j2se/test/unit/data/JavaApp/nbproject/project.properties
similarity index 100%
rename from profiler.j2se/test/unit/data/JavaApp/nbproject/project.properties
rename to profiler/profiler.j2se/test/unit/data/JavaApp/nbproject/project.properties
diff --git a/profiler.j2se/test/unit/data/JavaApp/nbproject/project.xml b/profiler/profiler.j2se/test/unit/data/JavaApp/nbproject/project.xml
similarity index 100%
rename from profiler.j2se/test/unit/data/JavaApp/nbproject/project.xml
rename to profiler/profiler.j2se/test/unit/data/JavaApp/nbproject/project.xml
diff --git a/profiler.j2se/test/unit/data/JavaApp/src/files/ChildTestOutputStream.java b/profiler/profiler.j2se/test/unit/data/JavaApp/src/files/ChildTestOutputStream.java
similarity index 100%
rename from profiler.j2se/test/unit/data/JavaApp/src/files/ChildTestOutputStream.java
rename to profiler/profiler.j2se/test/unit/data/JavaApp/src/files/ChildTestOutputStream.java
diff --git a/profiler.j2se/test/unit/data/JavaApp/src/files/TestFileOutputStream.java b/profiler/profiler.j2se/test/unit/data/JavaApp/src/files/TestFileOutputStream.java
similarity index 100%
rename from profiler.j2se/test/unit/data/JavaApp/src/files/TestFileOutputStream.java
rename to profiler/profiler.j2se/test/unit/data/JavaApp/src/files/TestFileOutputStream.java
diff --git a/profiler.j2se/test/unit/data/JavaApp/src/files/TestFileReader.java b/profiler/profiler.j2se/test/unit/data/JavaApp/src/files/TestFileReader.java
similarity index 100%
rename from profiler.j2se/test/unit/data/JavaApp/src/files/TestFileReader.java
rename to profiler/profiler.j2se/test/unit/data/JavaApp/src/files/TestFileReader.java
diff --git a/profiler.j2se/test/unit/data/JavaApp/src/listeners/SubTestAWTEventListener.java b/profiler/profiler.j2se/test/unit/data/JavaApp/src/listeners/SubTestAWTEventListener.java
similarity index 100%
rename from profiler.j2se/test/unit/data/JavaApp/src/listeners/SubTestAWTEventListener.java
rename to profiler/profiler.j2se/test/unit/data/JavaApp/src/listeners/SubTestAWTEventListener.java
diff --git a/profiler.j2se/test/unit/data/JavaApp/src/listeners/TestAWTEventListener.java b/profiler/profiler.j2se/test/unit/data/JavaApp/src/listeners/TestAWTEventListener.java
similarity index 100%
rename from profiler.j2se/test/unit/data/JavaApp/src/listeners/TestAWTEventListener.java
rename to profiler/profiler.j2se/test/unit/data/JavaApp/src/listeners/TestAWTEventListener.java
diff --git a/profiler.j2se/test/unit/data/JavaApp/src/listeners/TestMouseListener.java b/profiler/profiler.j2se/test/unit/data/JavaApp/src/listeners/TestMouseListener.java
similarity index 100%
rename from profiler.j2se/test/unit/data/JavaApp/src/listeners/TestMouseListener.java
rename to profiler/profiler.j2se/test/unit/data/JavaApp/src/listeners/TestMouseListener.java
diff --git a/profiler.j2se/test/unit/data/JavaApp/src/painters/TestComponent.java b/profiler/profiler.j2se/test/unit/data/JavaApp/src/painters/TestComponent.java
similarity index 100%
rename from profiler.j2se/test/unit/data/JavaApp/src/painters/TestComponent.java
rename to profiler/profiler.j2se/test/unit/data/JavaApp/src/painters/TestComponent.java
diff --git a/profiler.j2se/test/unit/data/JavaApp/src/painters/TestPanel.java b/profiler/profiler.j2se/test/unit/data/JavaApp/src/painters/TestPanel.java
similarity index 100%
rename from profiler.j2se/test/unit/data/JavaApp/src/painters/TestPanel.java
rename to profiler/profiler.j2se/test/unit/data/JavaApp/src/painters/TestPanel.java
diff --git a/profiler.j2se/test/unit/data/JavaApp/src/socket/TestSocketChanel.java b/profiler/profiler.j2se/test/unit/data/JavaApp/src/socket/TestSocketChanel.java
similarity index 100%
rename from profiler.j2se/test/unit/data/JavaApp/src/socket/TestSocketChanel.java
rename to profiler/profiler.j2se/test/unit/data/JavaApp/src/socket/TestSocketChanel.java
diff --git a/profiler.j2se/test/unit/data/JavaApp/src/streams/TestInputStream.java b/profiler/profiler.j2se/test/unit/data/JavaApp/src/streams/TestInputStream.java
similarity index 100%
rename from profiler.j2se/test/unit/data/JavaApp/src/streams/TestInputStream.java
rename to profiler/profiler.j2se/test/unit/data/JavaApp/src/streams/TestInputStream.java
diff --git a/profiler.j2se/test/unit/data/JavaApp/src/ui/TestUIManager.java b/profiler/profiler.j2se/test/unit/data/JavaApp/src/ui/TestUIManager.java
similarity index 100%
rename from profiler.j2se/test/unit/data/JavaApp/src/ui/TestUIManager.java
rename to profiler/profiler.j2se/test/unit/data/JavaApp/src/ui/TestUIManager.java
diff --git a/profiler.j2se/test/unit/src/org/netbeans/modules/profiler/categories/j2se/RepositoryImpl.java b/profiler/profiler.j2se/test/unit/src/org/netbeans/modules/profiler/categories/j2se/RepositoryImpl.java
similarity index 100%
rename from profiler.j2se/test/unit/src/org/netbeans/modules/profiler/categories/j2se/RepositoryImpl.java
rename to profiler/profiler.j2se/test/unit/src/org/netbeans/modules/profiler/categories/j2se/RepositoryImpl.java
diff --git a/profiler.j2se/test/unit/src/org/netbeans/modules/profiler/categories/j2se/TestGraphBuilder.java b/profiler/profiler.j2se/test/unit/src/org/netbeans/modules/profiler/categories/j2se/TestGraphBuilder.java
similarity index 100%
rename from profiler.j2se/test/unit/src/org/netbeans/modules/profiler/categories/j2se/TestGraphBuilder.java
rename to profiler/profiler.j2se/test/unit/src/org/netbeans/modules/profiler/categories/j2se/TestGraphBuilder.java
diff --git a/profiler.j2se/test/unit/src/org/netbeans/modules/profiler/categories/j2se/TestUtilities.java b/profiler/profiler.j2se/test/unit/src/org/netbeans/modules/profiler/categories/j2se/TestUtilities.java
similarity index 100%
rename from profiler.j2se/test/unit/src/org/netbeans/modules/profiler/categories/j2se/TestUtilities.java
rename to profiler/profiler.j2se/test/unit/src/org/netbeans/modules/profiler/categories/j2se/TestUtilities.java
diff --git a/profiler.kit/build.xml b/profiler/profiler.kit/build.xml
similarity index 88%
rename from profiler.kit/build.xml
rename to profiler/profiler.kit/build.xml
index 40f3c0619d..c71ab16358 100644
--- a/profiler.kit/build.xml
+++ b/profiler/profiler.kit/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="profiler.kit">
+<project basedir="." default="build" name="profiler/profiler.kit">
     <description>Builds, tests, and runs the project org.netbeans.modules.profiler.kit</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/profiler.kit/manifest.mf b/profiler/profiler.kit/manifest.mf
similarity index 100%
rename from profiler.kit/manifest.mf
rename to profiler/profiler.kit/manifest.mf
diff --git a/profiler.kit/nbproject/project.properties b/profiler/profiler.kit/nbproject/project.properties
similarity index 100%
rename from profiler.kit/nbproject/project.properties
rename to profiler/profiler.kit/nbproject/project.properties
diff --git a/profiler.kit/nbproject/project.xml b/profiler/profiler.kit/nbproject/project.xml
similarity index 100%
rename from profiler.kit/nbproject/project.xml
rename to profiler/profiler.kit/nbproject/project.xml
diff --git a/profiler.kit/src/org/netbeans/modules/profiler/kit/Bundle.properties b/profiler/profiler.kit/src/org/netbeans/modules/profiler/kit/Bundle.properties
similarity index 100%
rename from profiler.kit/src/org/netbeans/modules/profiler/kit/Bundle.properties
rename to profiler/profiler.kit/src/org/netbeans/modules/profiler/kit/Bundle.properties
diff --git a/profiler.nbimpl/antsrc/org/netbeans/modules/profiler/nbimpl/BuildEndListener.java b/profiler/profiler.nbimpl/antsrc/org/netbeans/modules/profiler/nbimpl/BuildEndListener.java
similarity index 100%
rename from profiler.nbimpl/antsrc/org/netbeans/modules/profiler/nbimpl/BuildEndListener.java
rename to profiler/profiler.nbimpl/antsrc/org/netbeans/modules/profiler/nbimpl/BuildEndListener.java
diff --git a/profiler.nbimpl/antsrc/org/netbeans/modules/profiler/nbimpl/NBProfileDirectTask.java b/profiler/profiler.nbimpl/antsrc/org/netbeans/modules/profiler/nbimpl/NBProfileDirectTask.java
similarity index 100%
rename from profiler.nbimpl/antsrc/org/netbeans/modules/profiler/nbimpl/NBProfileDirectTask.java
rename to profiler/profiler.nbimpl/antsrc/org/netbeans/modules/profiler/nbimpl/NBProfileDirectTask.java
diff --git a/profiler.nbimpl/antsrc/org/netbeans/modules/profiler/nbimpl/StartProfilerTask.java b/profiler/profiler.nbimpl/antsrc/org/netbeans/modules/profiler/nbimpl/StartProfilerTask.java
similarity index 100%
rename from profiler.nbimpl/antsrc/org/netbeans/modules/profiler/nbimpl/StartProfilerTask.java
rename to profiler/profiler.nbimpl/antsrc/org/netbeans/modules/profiler/nbimpl/StartProfilerTask.java
diff --git a/profiler.nbimpl/antsrc/org/netbeans/modules/profiler/nbimpl/antlib.xml b/profiler/profiler.nbimpl/antsrc/org/netbeans/modules/profiler/nbimpl/antlib.xml
similarity index 100%
rename from profiler.nbimpl/antsrc/org/netbeans/modules/profiler/nbimpl/antlib.xml
rename to profiler/profiler.nbimpl/antsrc/org/netbeans/modules/profiler/nbimpl/antlib.xml
diff --git a/profiler.nbimpl/build.xml b/profiler/profiler.nbimpl/build.xml
similarity index 93%
rename from profiler.nbimpl/build.xml
rename to profiler/profiler.nbimpl/build.xml
index 711dada559..92cf0aa8f5 100644
--- a/profiler.nbimpl/build.xml
+++ b/profiler/profiler.nbimpl/build.xml
@@ -19,9 +19,9 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="profiler.nbimpl">
+<project basedir="." default="build" name="profiler/profiler.nbimpl">
     <description>Builds, tests, and runs the project org.netbeans.modules.profiler.nbimpl</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
     
     <target name="nblib" depends="init">
         <mkdir dir="build/antclasses"/>
diff --git a/profiler.nbimpl/manifest.mf b/profiler/profiler.nbimpl/manifest.mf
similarity index 100%
rename from profiler.nbimpl/manifest.mf
rename to profiler/profiler.nbimpl/manifest.mf
diff --git a/profiler.nbimpl/nbproject/project.properties b/profiler/profiler.nbimpl/nbproject/project.properties
similarity index 100%
rename from profiler.nbimpl/nbproject/project.properties
rename to profiler/profiler.nbimpl/nbproject/project.properties
diff --git a/profiler.nbimpl/nbproject/project.xml b/profiler/profiler.nbimpl/nbproject/project.xml
similarity index 100%
rename from profiler.nbimpl/nbproject/project.xml
rename to profiler/profiler.nbimpl/nbproject/project.xml
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/Bundle.properties b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/Bundle.properties
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/Bundle.properties
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/Bundle.properties
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/NetBeansProfiler.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/NetBeansProfiler.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/NetBeansProfiler.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/NetBeansProfiler.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/AntActions.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/AntActions.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/AntActions.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/AntActions.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/Bundle.properties b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/Bundle.properties
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/Bundle.properties
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/Bundle.properties
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/FileSensitivePerformer.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/FileSensitivePerformer.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/FileSensitivePerformer.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/FileSensitivePerformer.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfileClassEditorAction.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfileClassEditorAction.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfileClassEditorAction.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfileClassEditorAction.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfileElementNavigatorAction.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfileElementNavigatorAction.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfileElementNavigatorAction.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfileElementNavigatorAction.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfileMethodEditorAction.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfileMethodEditorAction.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfileMethodEditorAction.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfileMethodEditorAction.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfilerLauncher.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfilerLauncher.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfilerLauncher.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfilerLauncher.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfilerToolbarDropdownAction.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfilerToolbarDropdownAction.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfilerToolbarDropdownAction.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfilerToolbarDropdownAction.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProjectSensitivePerformer.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProjectSensitivePerformer.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProjectSensitivePerformer.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProjectSensitivePerformer.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/Bundle.properties b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/Bundle.properties
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/Bundle.properties
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/Bundle.properties
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/ClasspathInfoFactory.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/ClasspathInfoFactory.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/ClasspathInfoFactory.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/ClasspathInfoFactory.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/ElementUtilitiesEx.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/ElementUtilitiesEx.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/ElementUtilitiesEx.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/ElementUtilitiesEx.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/JavacClassInfo.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/JavacClassInfo.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/JavacClassInfo.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/JavacClassInfo.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/JavacMethodInfo.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/JavacMethodInfo.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/JavacMethodInfo.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/JavacMethodInfo.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/JavacPackageInfo.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/JavacPackageInfo.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/JavacPackageInfo.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/JavacPackageInfo.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/ParsingUtils.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/ParsingUtils.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/ParsingUtils.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/ParsingUtils.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/ScanSensitiveTask.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/ScanSensitiveTask.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/ScanSensitiveTask.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/ScanSensitiveTask.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/layer.xml b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/layer.xml
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/layer.xml
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/layer.xml
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/AntProjectSupport.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/AntProjectSupport.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/AntProjectSupport.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/AntProjectSupport.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/AntProjectSupportProvider.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/AntProjectSupportProvider.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/AntProjectSupportProvider.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/AntProjectSupportProvider.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/Bundle.properties b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/Bundle.properties
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/Bundle.properties
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/Bundle.properties
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/JavaProjectContentsSupportProvider.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/JavaProjectContentsSupportProvider.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/JavaProjectContentsSupportProvider.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/JavaProjectContentsSupportProvider.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/JavaProjectProfilingSupportProvider.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/JavaProjectProfilingSupportProvider.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/JavaProjectProfilingSupportProvider.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/JavaProjectProfilingSupportProvider.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/ProjectUtilities.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/ProjectUtilities.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/ProjectUtilities.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/ProjectUtilities.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/AntRemotePackExporter.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/AntRemotePackExporter.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/AntRemotePackExporter.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/AntRemotePackExporter.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/BaseProfilerTypeUtilsImpl.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/BaseProfilerTypeUtilsImpl.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/BaseProfilerTypeUtilsImpl.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/BaseProfilerTypeUtilsImpl.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/Bundle.properties b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/Bundle.properties
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/Bundle.properties
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/Bundle.properties
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/DefaultProfilerArgsProvider.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/DefaultProfilerArgsProvider.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/DefaultProfilerArgsProvider.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/DefaultProfilerArgsProvider.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/FindActionProvider.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/FindActionProvider.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/FindActionProvider.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/FindActionProvider.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/GlobalProfilerTypeUtilsImpl.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/GlobalProfilerTypeUtilsImpl.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/GlobalProfilerTypeUtilsImpl.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/GlobalProfilerTypeUtilsImpl.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/GoToJavaSourceProvider.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/GoToJavaSourceProvider.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/GoToJavaSourceProvider.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/GoToJavaSourceProvider.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/JavaPlatformImpl.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/JavaPlatformImpl.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/JavaPlatformImpl.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/JavaPlatformImpl.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/JavaPlatformManagerImpl.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/JavaPlatformManagerImpl.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/JavaPlatformManagerImpl.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/JavaPlatformManagerImpl.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/JavaProfilerSourceImpl.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/JavaProfilerSourceImpl.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/JavaProfilerSourceImpl.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/JavaProfilerSourceImpl.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/ProfilerStorageProviderImpl.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/ProfilerStorageProviderImpl.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/ProfilerStorageProviderImpl.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/ProfilerStorageProviderImpl.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/ProfilingPointAnnotatorImpl.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/ProfilingPointAnnotatorImpl.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/ProfilingPointAnnotatorImpl.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/ProfilingPointAnnotatorImpl.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/ProfilingPointsUIHelperImpl.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/ProfilingPointsUIHelperImpl.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/ProfilingPointsUIHelperImpl.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/ProfilingPointsUIHelperImpl.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/ProjectEditorSupportImpl.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/ProjectEditorSupportImpl.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/ProjectEditorSupportImpl.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/ProjectEditorSupportImpl.java
diff --git a/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/ProjectProfilerTypeUtilsImpl.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/ProjectProfilerTypeUtilsImpl.java
similarity index 100%
rename from profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/ProjectProfilerTypeUtilsImpl.java
rename to profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/ProjectProfilerTypeUtilsImpl.java
diff --git a/profiler.nbimpl/test/unit/data/JavaApp/build.xml b/profiler/profiler.nbimpl/test/unit/data/JavaApp/build.xml
similarity index 100%
rename from profiler.nbimpl/test/unit/data/JavaApp/build.xml
rename to profiler/profiler.nbimpl/test/unit/data/JavaApp/build.xml
diff --git a/profiler.nbimpl/test/unit/data/JavaApp/manifest.mf b/profiler/profiler.nbimpl/test/unit/data/JavaApp/manifest.mf
similarity index 100%
rename from profiler.nbimpl/test/unit/data/JavaApp/manifest.mf
rename to profiler/profiler.nbimpl/test/unit/data/JavaApp/manifest.mf
diff --git a/profiler.nbimpl/test/unit/data/JavaApp/nbproject/build-impl.xml b/profiler/profiler.nbimpl/test/unit/data/JavaApp/nbproject/build-impl.xml
similarity index 100%
rename from profiler.nbimpl/test/unit/data/JavaApp/nbproject/build-impl.xml
rename to profiler/profiler.nbimpl/test/unit/data/JavaApp/nbproject/build-impl.xml
diff --git a/profiler.nbimpl/test/unit/data/JavaApp/nbproject/project.properties b/profiler/profiler.nbimpl/test/unit/data/JavaApp/nbproject/project.properties
similarity index 100%
rename from profiler.nbimpl/test/unit/data/JavaApp/nbproject/project.properties
rename to profiler/profiler.nbimpl/test/unit/data/JavaApp/nbproject/project.properties
diff --git a/profiler.nbimpl/test/unit/data/JavaApp/nbproject/project.xml b/profiler/profiler.nbimpl/test/unit/data/JavaApp/nbproject/project.xml
similarity index 100%
rename from profiler.nbimpl/test/unit/data/JavaApp/nbproject/project.xml
rename to profiler/profiler.nbimpl/test/unit/data/JavaApp/nbproject/project.xml
diff --git a/profiler.nbimpl/test/unit/data/JavaApp/src/classinfo/ClassInfoTest.java b/profiler/profiler.nbimpl/test/unit/data/JavaApp/src/classinfo/ClassInfoTest.java
similarity index 100%
rename from profiler.nbimpl/test/unit/data/JavaApp/src/classinfo/ClassInfoTest.java
rename to profiler/profiler.nbimpl/test/unit/data/JavaApp/src/classinfo/ClassInfoTest.java
diff --git a/profiler.nbimpl/test/unit/data/JavaApp/src/files/ChildTestOutputStream.java b/profiler/profiler.nbimpl/test/unit/data/JavaApp/src/files/ChildTestOutputStream.java
similarity index 100%
rename from profiler.nbimpl/test/unit/data/JavaApp/src/files/ChildTestOutputStream.java
rename to profiler/profiler.nbimpl/test/unit/data/JavaApp/src/files/ChildTestOutputStream.java
diff --git a/profiler.nbimpl/test/unit/data/JavaApp/src/files/TestFileInputStream.java b/profiler/profiler.nbimpl/test/unit/data/JavaApp/src/files/TestFileInputStream.java
similarity index 100%
rename from profiler.nbimpl/test/unit/data/JavaApp/src/files/TestFileInputStream.java
rename to profiler/profiler.nbimpl/test/unit/data/JavaApp/src/files/TestFileInputStream.java
diff --git a/profiler.nbimpl/test/unit/data/JavaApp/src/files/TestFileOutputStream.java b/profiler/profiler.nbimpl/test/unit/data/JavaApp/src/files/TestFileOutputStream.java
similarity index 100%
rename from profiler.nbimpl/test/unit/data/JavaApp/src/files/TestFileOutputStream.java
rename to profiler/profiler.nbimpl/test/unit/data/JavaApp/src/files/TestFileOutputStream.java
diff --git a/profiler.nbimpl/test/unit/data/JavaApp/src/listeners/TestAWTEventListener.java b/profiler/profiler.nbimpl/test/unit/data/JavaApp/src/listeners/TestAWTEventListener.java
similarity index 100%
rename from profiler.nbimpl/test/unit/data/JavaApp/src/listeners/TestAWTEventListener.java
rename to profiler/profiler.nbimpl/test/unit/data/JavaApp/src/listeners/TestAWTEventListener.java
diff --git a/profiler.nbimpl/test/unit/data/JavaApp/src/listeners/TestMouseListener.java b/profiler/profiler.nbimpl/test/unit/data/JavaApp/src/listeners/TestMouseListener.java
similarity index 100%
rename from profiler.nbimpl/test/unit/data/JavaApp/src/listeners/TestMouseListener.java
rename to profiler/profiler.nbimpl/test/unit/data/JavaApp/src/listeners/TestMouseListener.java
diff --git a/profiler.nbimpl/test/unit/data/JavaApp/src/listeners/sub/SubTestAWTEventListener.java b/profiler/profiler.nbimpl/test/unit/data/JavaApp/src/listeners/sub/SubTestAWTEventListener.java
similarity index 100%
rename from profiler.nbimpl/test/unit/data/JavaApp/src/listeners/sub/SubTestAWTEventListener.java
rename to profiler/profiler.nbimpl/test/unit/data/JavaApp/src/listeners/sub/SubTestAWTEventListener.java
diff --git a/profiler.nbimpl/test/unit/data/JavaApp/src/painters/TestComponent.java b/profiler/profiler.nbimpl/test/unit/data/JavaApp/src/painters/TestComponent.java
similarity index 100%
rename from profiler.nbimpl/test/unit/data/JavaApp/src/painters/TestComponent.java
rename to profiler/profiler.nbimpl/test/unit/data/JavaApp/src/painters/TestComponent.java
diff --git a/profiler.nbimpl/test/unit/data/JavaApp/src/painters/TestPanel.java b/profiler/profiler.nbimpl/test/unit/data/JavaApp/src/painters/TestPanel.java
similarity index 100%
rename from profiler.nbimpl/test/unit/data/JavaApp/src/painters/TestPanel.java
rename to profiler/profiler.nbimpl/test/unit/data/JavaApp/src/painters/TestPanel.java
diff --git a/profiler.nbimpl/test/unit/data/JavaApp/src/socket/TestSocketChanel.java b/profiler/profiler.nbimpl/test/unit/data/JavaApp/src/socket/TestSocketChanel.java
similarity index 100%
rename from profiler.nbimpl/test/unit/data/JavaApp/src/socket/TestSocketChanel.java
rename to profiler/profiler.nbimpl/test/unit/data/JavaApp/src/socket/TestSocketChanel.java
diff --git a/profiler.nbimpl/test/unit/data/JavaApp/src/streams/TestInputStream.java b/profiler/profiler.nbimpl/test/unit/data/JavaApp/src/streams/TestInputStream.java
similarity index 100%
rename from profiler.nbimpl/test/unit/data/JavaApp/src/streams/TestInputStream.java
rename to profiler/profiler.nbimpl/test/unit/data/JavaApp/src/streams/TestInputStream.java
diff --git a/profiler.nbimpl/test/unit/data/JavaApp/src/ui/TestUIManager.java b/profiler/profiler.nbimpl/test/unit/data/JavaApp/src/ui/TestUIManager.java
similarity index 100%
rename from profiler.nbimpl/test/unit/data/JavaApp/src/ui/TestUIManager.java
rename to profiler/profiler.nbimpl/test/unit/data/JavaApp/src/ui/TestUIManager.java
diff --git a/profiler.nbimpl/test/unit/src/org/netbeans/modules/profiler/nbimpl/BaseProjectTest.java b/profiler/profiler.nbimpl/test/unit/src/org/netbeans/modules/profiler/nbimpl/BaseProjectTest.java
similarity index 100%
rename from profiler.nbimpl/test/unit/src/org/netbeans/modules/profiler/nbimpl/BaseProjectTest.java
rename to profiler/profiler.nbimpl/test/unit/src/org/netbeans/modules/profiler/nbimpl/BaseProjectTest.java
diff --git a/profiler.nbimpl/test/unit/src/org/netbeans/modules/profiler/nbimpl/TestUtilities.java b/profiler/profiler.nbimpl/test/unit/src/org/netbeans/modules/profiler/nbimpl/TestUtilities.java
similarity index 100%
rename from profiler.nbimpl/test/unit/src/org/netbeans/modules/profiler/nbimpl/TestUtilities.java
rename to profiler/profiler.nbimpl/test/unit/src/org/netbeans/modules/profiler/nbimpl/TestUtilities.java
diff --git a/profiler.nbimpl/test/unit/src/org/netbeans/modules/profiler/nbimpl/javac/JavacClassInfoTest.java b/profiler/profiler.nbimpl/test/unit/src/org/netbeans/modules/profiler/nbimpl/javac/JavacClassInfoTest.java
similarity index 100%
rename from profiler.nbimpl/test/unit/src/org/netbeans/modules/profiler/nbimpl/javac/JavacClassInfoTest.java
rename to profiler/profiler.nbimpl/test/unit/src/org/netbeans/modules/profiler/nbimpl/javac/JavacClassInfoTest.java
diff --git a/profiler.nbmodule/build.xml b/profiler/profiler.nbmodule/build.xml
similarity index 88%
rename from profiler.nbmodule/build.xml
rename to profiler/profiler.nbmodule/build.xml
index 6197150019..72e41dc7ee 100644
--- a/profiler.nbmodule/build.xml
+++ b/profiler/profiler.nbmodule/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="profiler.nbmodule">
+<project basedir="." default="build" name="profiler/profiler.nbmodule">
     <description>Builds, tests, and runs the project org.netbeans.modules.profiler.nbmodule</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/profiler.nbmodule/manifest.mf b/profiler/profiler.nbmodule/manifest.mf
similarity index 100%
rename from profiler.nbmodule/manifest.mf
rename to profiler/profiler.nbmodule/manifest.mf
diff --git a/profiler.nbmodule/nbproject/project.properties b/profiler/profiler.nbmodule/nbproject/project.properties
similarity index 100%
rename from profiler.nbmodule/nbproject/project.properties
rename to profiler/profiler.nbmodule/nbproject/project.properties
diff --git a/profiler.nbmodule/nbproject/project.xml b/profiler/profiler.nbmodule/nbproject/project.xml
similarity index 100%
rename from profiler.nbmodule/nbproject/project.xml
rename to profiler/profiler.nbmodule/nbproject/project.xml
diff --git a/profiler.nbmodule/src/org/netbeans/modules/profiler/nbmodule/Bundle.properties b/profiler/profiler.nbmodule/src/org/netbeans/modules/profiler/nbmodule/Bundle.properties
similarity index 100%
rename from profiler.nbmodule/src/org/netbeans/modules/profiler/nbmodule/Bundle.properties
rename to profiler/profiler.nbmodule/src/org/netbeans/modules/profiler/nbmodule/Bundle.properties
diff --git a/profiler.nbmodule/src/org/netbeans/modules/profiler/nbmodule/NbModuleAntProjectSupportProvider.java b/profiler/profiler.nbmodule/src/org/netbeans/modules/profiler/nbmodule/NbModuleAntProjectSupportProvider.java
similarity index 100%
rename from profiler.nbmodule/src/org/netbeans/modules/profiler/nbmodule/NbModuleAntProjectSupportProvider.java
rename to profiler/profiler.nbmodule/src/org/netbeans/modules/profiler/nbmodule/NbModuleAntProjectSupportProvider.java
diff --git a/profiler.nbmodule/src/org/netbeans/modules/profiler/nbmodule/NbModuleProjectProfilingSupportProvider.java b/profiler/profiler.nbmodule/src/org/netbeans/modules/profiler/nbmodule/NbModuleProjectProfilingSupportProvider.java
similarity index 100%
rename from profiler.nbmodule/src/org/netbeans/modules/profiler/nbmodule/NbModuleProjectProfilingSupportProvider.java
rename to profiler/profiler.nbmodule/src/org/netbeans/modules/profiler/nbmodule/NbModuleProjectProfilingSupportProvider.java
diff --git a/profiler.nbmodule/src/org/netbeans/modules/profiler/nbmodule/mf-layer.xml b/profiler/profiler.nbmodule/src/org/netbeans/modules/profiler/nbmodule/mf-layer.xml
similarity index 100%
rename from profiler.nbmodule/src/org/netbeans/modules/profiler/nbmodule/mf-layer.xml
rename to profiler/profiler.nbmodule/src/org/netbeans/modules/profiler/nbmodule/mf-layer.xml
diff --git a/profiler.options/build.xml b/profiler/profiler.options/build.xml
similarity index 88%
rename from profiler.options/build.xml
rename to profiler/profiler.options/build.xml
index 36a9991d46..0b01570262 100644
--- a/profiler.options/build.xml
+++ b/profiler/profiler.options/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="profiler.options">
+<project basedir="." default="build" name="profiler/profiler.options">
     <description>Builds, tests, and runs the project org.netbeans.modules.profiler.options</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/profiler.options/manifest.mf b/profiler/profiler.options/manifest.mf
similarity index 100%
rename from profiler.options/manifest.mf
rename to profiler/profiler.options/manifest.mf
diff --git a/profiler.options/nbproject/project.properties b/profiler/profiler.options/nbproject/project.properties
similarity index 100%
rename from profiler.options/nbproject/project.properties
rename to profiler/profiler.options/nbproject/project.properties
diff --git a/profiler.options/nbproject/project.xml b/profiler/profiler.options/nbproject/project.xml
similarity index 100%
rename from profiler.options/nbproject/project.xml
rename to profiler/profiler.options/nbproject/project.xml
diff --git a/profiler.options/src/org/netbeans/modules/profiler/options/Bundle.properties b/profiler/profiler.options/src/org/netbeans/modules/profiler/options/Bundle.properties
similarity index 100%
rename from profiler.options/src/org/netbeans/modules/profiler/options/Bundle.properties
rename to profiler/profiler.options/src/org/netbeans/modules/profiler/options/Bundle.properties
diff --git a/profiler.options/src/org/netbeans/modules/profiler/options/ProfilerOptionsCategory.java b/profiler/profiler.options/src/org/netbeans/modules/profiler/options/ProfilerOptionsCategory.java
similarity index 100%
rename from profiler.options/src/org/netbeans/modules/profiler/options/ProfilerOptionsCategory.java
rename to profiler/profiler.options/src/org/netbeans/modules/profiler/options/ProfilerOptionsCategory.java
diff --git a/profiler.options/src/org/netbeans/modules/profiler/options/ui/ProfilerOptionsPanel.java b/profiler/profiler.options/src/org/netbeans/modules/profiler/options/ui/ProfilerOptionsPanel.java
similarity index 100%
rename from profiler.options/src/org/netbeans/modules/profiler/options/ui/ProfilerOptionsPanel.java
rename to profiler/profiler.options/src/org/netbeans/modules/profiler/options/ui/ProfilerOptionsPanel.java
diff --git a/profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/ProfilerOptionsContainer.java b/profiler/profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/ProfilerOptionsContainer.java
similarity index 100%
rename from profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/ProfilerOptionsContainer.java
rename to profiler/profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/ProfilerOptionsContainer.java
diff --git a/profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/ProfilerOptionsPanel.java b/profiler/profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/ProfilerOptionsPanel.java
similarity index 100%
rename from profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/ProfilerOptionsPanel.java
rename to profiler/profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/ProfilerOptionsPanel.java
diff --git a/profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/impl/EngineOptionsPanel.java b/profiler/profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/impl/EngineOptionsPanel.java
similarity index 100%
rename from profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/impl/EngineOptionsPanel.java
rename to profiler/profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/impl/EngineOptionsPanel.java
diff --git a/profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/impl/FiltersOptionsPanel.java b/profiler/profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/impl/FiltersOptionsPanel.java
similarity index 100%
rename from profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/impl/FiltersOptionsPanel.java
rename to profiler/profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/impl/FiltersOptionsPanel.java
diff --git a/profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/impl/GeneralOptionsPanel.java b/profiler/profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/impl/GeneralOptionsPanel.java
similarity index 100%
rename from profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/impl/GeneralOptionsPanel.java
rename to profiler/profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/impl/GeneralOptionsPanel.java
diff --git a/profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/impl/SnapshotsOptionsPanel.java b/profiler/profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/impl/SnapshotsOptionsPanel.java
similarity index 100%
rename from profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/impl/SnapshotsOptionsPanel.java
rename to profiler/profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/impl/SnapshotsOptionsPanel.java
diff --git a/profiler.oql.language/build.xml b/profiler/profiler.oql.language/build.xml
similarity index 87%
rename from profiler.oql.language/build.xml
rename to profiler/profiler.oql.language/build.xml
index 5cf5b31b41..5424efa5f5 100644
--- a/profiler.oql.language/build.xml
+++ b/profiler/profiler.oql.language/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="profiler.oql.language">
+<project basedir="." default="build" name="profiler/profiler.oql.language">
     <description>Builds, tests, and runs the project org.netbeans.modules.profiler.oql.language</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/profiler.oql.language/manifest.mf b/profiler/profiler.oql.language/manifest.mf
similarity index 100%
rename from profiler.oql.language/manifest.mf
rename to profiler/profiler.oql.language/manifest.mf
diff --git a/profiler.oql.language/nbproject/project.properties b/profiler/profiler.oql.language/nbproject/project.properties
similarity index 100%
rename from profiler.oql.language/nbproject/project.properties
rename to profiler/profiler.oql.language/nbproject/project.properties
diff --git a/profiler.oql.language/nbproject/project.xml b/profiler/profiler.oql.language/nbproject/project.xml
similarity index 100%
rename from profiler.oql.language/nbproject/project.xml
rename to profiler/profiler.oql.language/nbproject/project.xml
diff --git a/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/Bundle.properties b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/Bundle.properties
similarity index 100%
rename from profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/Bundle.properties
rename to profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/Bundle.properties
diff --git a/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/ClassnameCompletionItem.java b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/ClassnameCompletionItem.java
similarity index 100%
rename from profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/ClassnameCompletionItem.java
rename to profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/ClassnameCompletionItem.java
diff --git a/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/FontAndColors.xml b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/FontAndColors.xml
similarity index 100%
rename from profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/FontAndColors.xml
rename to profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/FontAndColors.xml
diff --git a/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/FunctionCompletionItem.java b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/FunctionCompletionItem.java
similarity index 100%
rename from profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/FunctionCompletionItem.java
rename to profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/FunctionCompletionItem.java
diff --git a/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/KeywordCompletionItem.java b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/KeywordCompletionItem.java
similarity index 100%
rename from profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/KeywordCompletionItem.java
rename to profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/KeywordCompletionItem.java
diff --git a/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLCompletionProvider.java b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLCompletionProvider.java
similarity index 100%
rename from profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLCompletionProvider.java
rename to profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLCompletionProvider.java
diff --git a/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLEditorKit.java b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLEditorKit.java
similarity index 100%
rename from profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLEditorKit.java
rename to profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLEditorKit.java
diff --git a/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLLanguageHierarchy.java b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLLanguageHierarchy.java
similarity index 100%
rename from profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLLanguageHierarchy.java
rename to profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLLanguageHierarchy.java
diff --git a/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLLanguageProvider.java b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLLanguageProvider.java
similarity index 100%
rename from profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLLanguageProvider.java
rename to profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLLanguageProvider.java
diff --git a/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLLexer.java b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLLexer.java
similarity index 100%
rename from profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLLexer.java
rename to profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLLexer.java
diff --git a/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLTokenId.java b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLTokenId.java
similarity index 100%
rename from profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLTokenId.java
rename to profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLTokenId.java
diff --git a/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/PackageCompletionItem.java b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/PackageCompletionItem.java
similarity index 100%
rename from profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/PackageCompletionItem.java
rename to profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/PackageCompletionItem.java
diff --git a/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/layer.xml b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/layer.xml
similarity index 100%
rename from profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/layer.xml
rename to profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/layer.xml
diff --git a/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/preferences.xml b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/preferences.xml
similarity index 100%
rename from profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/preferences.xml
rename to profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/preferences.xml
diff --git a/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/test.oql b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/test.oql
similarity index 100%
rename from profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/test.oql
rename to profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/test.oql
diff --git a/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/ui/OQLEditor.java b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/ui/OQLEditor.java
similarity index 100%
rename from profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/ui/OQLEditor.java
rename to profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/ui/OQLEditor.java
diff --git a/profiler.oql/build.xml b/profiler/profiler.oql/build.xml
similarity index 88%
rename from profiler.oql/build.xml
rename to profiler/profiler.oql/build.xml
index b72e273155..dd2673c626 100644
--- a/profiler.oql/build.xml
+++ b/profiler/profiler.oql/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="profiler.oql">
+<project basedir="." default="build" name="profiler/profiler.oql">
     <description>Builds, tests, and runs the project org.netbeans.modules.profiler.oql</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/profiler.oql/licenseinfo.xml b/profiler/profiler.oql/licenseinfo.xml
similarity index 100%
rename from profiler.oql/licenseinfo.xml
rename to profiler/profiler.oql/licenseinfo.xml
diff --git a/profiler.oql/manifest.mf b/profiler/profiler.oql/manifest.mf
similarity index 100%
rename from profiler.oql/manifest.mf
rename to profiler/profiler.oql/manifest.mf
diff --git a/profiler.oql/nbproject/project.properties b/profiler/profiler.oql/nbproject/project.properties
similarity index 100%
rename from profiler.oql/nbproject/project.properties
rename to profiler/profiler.oql/nbproject/project.properties
diff --git a/profiler.oql/nbproject/project.xml b/profiler/profiler.oql/nbproject/project.xml
similarity index 100%
rename from profiler.oql/nbproject/project.xml
rename to profiler/profiler.oql/nbproject/project.xml
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/Bundle.properties b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/Bundle.properties
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/Bundle.properties
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/Bundle.properties
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/OQLEngine.java b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/OQLEngine.java
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/OQLEngine.java
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/OQLEngine.java
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/OQLException.java b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/OQLException.java
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/OQLException.java
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/OQLException.java
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/ReferenceChain.java b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/ReferenceChain.java
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/ReferenceChain.java
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/ReferenceChain.java
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/Bundle.properties b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/Bundle.properties
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/Bundle.properties
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/Bundle.properties
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/OQLEngineImpl.java b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/OQLEngineImpl.java
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/OQLEngineImpl.java
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/OQLEngineImpl.java
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/OQLQueryImpl.java b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/OQLQueryImpl.java
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/OQLQueryImpl.java
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/OQLQueryImpl.java
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/ReachableExcludes.java b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/ReachableExcludes.java
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/ReachableExcludes.java
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/ReachableExcludes.java
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/ReachableObjects.java b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/ReachableObjects.java
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/ReachableObjects.java
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/ReachableObjects.java
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/Snapshot.java b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/Snapshot.java
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/Snapshot.java
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/Snapshot.java
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/TreeIterator.java b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/TreeIterator.java
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/TreeIterator.java
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/TreeIterator.java
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/hat.js b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/hat.js
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/hat.js
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/hat.js
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/icons/OQLIcons.java b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/icons/OQLIcons.java
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/icons/OQLIcons.java
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/icons/OQLIcons.java
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/icons/impl/OQLIconsProviderImpl.java b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/icons/impl/OQLIconsProviderImpl.java
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/icons/impl/OQLIconsProviderImpl.java
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/icons/impl/OQLIconsProviderImpl.java
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/icons/impl/oql.png b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/icons/impl/oql.png
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/icons/impl/oql.png
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/icons/impl/oql.png
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/layer.xml b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/layer.xml
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/layer.xml
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/layer.xml
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryCategory.java b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryCategory.java
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryCategory.java
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryCategory.java
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryDefinition.java b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryDefinition.java
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryDefinition.java
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryDefinition.java
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryRepository.java b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryRepository.java
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryRepository.java
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryRepository.java
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/BootstrapCount.oql b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/BootstrapCount.oql
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/BootstrapCount.oql
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/BootstrapCount.oql
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/Bundle.properties b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/Bundle.properties
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/Bundle.properties
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/Bundle.properties
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/CLChildParent.oql b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/CLChildParent.oql
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/CLChildParent.oql
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/CLChildParent.oql
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/CLHisto.oql b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/CLHisto.oql
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/CLHisto.oql
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/CLHisto.oql
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/CLLiveness.oql b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/CLLiveness.oql
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/CLLiveness.oql
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/CLLiveness.oql
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/CLLoadedClasses.oql b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/CLLoadedClasses.oql
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/CLLoadedClasses.oql
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/CLLoadedClasses.oql
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/CLReflection.oql b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/CLReflection.oql
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/CLReflection.oql
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/CLReflection.oql
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/CLTypes.oql b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/CLTypes.oql
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/CLTypes.oql
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/permgen/resources/CLTypes.oql
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/resources/AllFiles.oql b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/resources/AllFiles.oql
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/repository/resources/AllFiles.oql
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/resources/AllFiles.oql
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/resources/Bundle.properties b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/resources/Bundle.properties
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/repository/resources/Bundle.properties
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/resources/Bundle.properties
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/resources/OverallocatedStrings.oql b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/resources/OverallocatedStrings.oql
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/repository/resources/OverallocatedStrings.oql
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/resources/OverallocatedStrings.oql
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/resources/OverallocatedStringsJS.oql b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/resources/OverallocatedStringsJS.oql
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/repository/resources/OverallocatedStringsJS.oql
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/resources/OverallocatedStringsJS.oql
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/resources/TooManyBooleans.oql b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/resources/TooManyBooleans.oql
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/repository/resources/TooManyBooleans.oql
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/resources/TooManyBooleans.oql
diff --git a/profiler.oql/src/org/netbeans/modules/profiler/oql/spi/OQLEditorImpl.java b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/spi/OQLEditorImpl.java
similarity index 100%
rename from profiler.oql/src/org/netbeans/modules/profiler/oql/spi/OQLEditorImpl.java
rename to profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/spi/OQLEditorImpl.java
diff --git a/profiler.oql/test/unit/src/org/netbeans/modules/profiler/oql/engine/api/impl/OQLEngineTest.java b/profiler/profiler.oql/test/unit/src/org/netbeans/modules/profiler/oql/engine/api/impl/OQLEngineTest.java
similarity index 100%
rename from profiler.oql/test/unit/src/org/netbeans/modules/profiler/oql/engine/api/impl/OQLEngineTest.java
rename to profiler/profiler.oql/test/unit/src/org/netbeans/modules/profiler/oql/engine/api/impl/OQLEngineTest.java
diff --git a/profiler.oql/test/unit/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryRepositoryTest.java b/profiler/profiler.oql/test/unit/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryRepositoryTest.java
similarity index 100%
rename from profiler.oql/test/unit/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryRepositoryTest.java
rename to profiler/profiler.oql/test/unit/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryRepositoryTest.java
diff --git a/profiler.ppoints/build.xml b/profiler/profiler.ppoints/build.xml
similarity index 88%
rename from profiler.ppoints/build.xml
rename to profiler/profiler.ppoints/build.xml
index d1fa3f7188..8e7473bdb7 100644
--- a/profiler.ppoints/build.xml
+++ b/profiler/profiler.ppoints/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="profiler.ppoints">
+<project basedir="." default="build" name="profiler/profiler.ppoints">
     <description>Builds, tests, and runs the project org.netbeans.modules.profiler.ppoints</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/profiler.ppoints/licenseinfo.xml b/profiler/profiler.ppoints/licenseinfo.xml
similarity index 100%
rename from profiler.ppoints/licenseinfo.xml
rename to profiler/profiler.ppoints/licenseinfo.xml
diff --git a/profiler.ppoints/manifest.mf b/profiler/profiler.ppoints/manifest.mf
similarity index 100%
rename from profiler.ppoints/manifest.mf
rename to profiler/profiler.ppoints/manifest.mf
diff --git a/profiler.ppoints/nbproject/project.properties b/profiler/profiler.ppoints/nbproject/project.properties
similarity index 100%
rename from profiler.ppoints/nbproject/project.properties
rename to profiler/profiler.ppoints/nbproject/project.properties
diff --git a/profiler.ppoints/nbproject/project.xml b/profiler/profiler.ppoints/nbproject/project.xml
similarity index 100%
rename from profiler.ppoints/nbproject/project.xml
rename to profiler/profiler.ppoints/nbproject/project.xml
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/Bundle.properties b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/Bundle.properties
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/Bundle.properties
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/Bundle.properties
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/CodeProfilingPoint.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/CodeProfilingPoint.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/CodeProfilingPoint.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/CodeProfilingPoint.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/CodeProfilingPointFactory.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/CodeProfilingPointFactory.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/CodeProfilingPointFactory.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/CodeProfilingPointFactory.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/GlobalProfilingPoint.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/GlobalProfilingPoint.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/GlobalProfilingPoint.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/GlobalProfilingPoint.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/GlobalProfilingPointsProcessor.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/GlobalProfilingPointsProcessor.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/GlobalProfilingPointsProcessor.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/GlobalProfilingPointsProcessor.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/Installer.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/Installer.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/Installer.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/Installer.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/LoadGenProfilingPoint.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/LoadGenProfilingPoint.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/LoadGenProfilingPoint.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/LoadGenProfilingPoint.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/LoadGenProfilingPointFactory.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/LoadGenProfilingPointFactory.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/LoadGenProfilingPointFactory.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/LoadGenProfilingPointFactory.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPoint.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPoint.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPoint.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPoint.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointAnnotator.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointAnnotator.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointAnnotator.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointAnnotator.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointFactory.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointFactory.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointFactory.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointFactory.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointScopeProvider.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointScopeProvider.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointScopeProvider.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointScopeProvider.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointWizard.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointWizard.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointWizard.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointWizard.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointsAnnotationProvider.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointsAnnotationProvider.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointsAnnotationProvider.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointsAnnotationProvider.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointsManager.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointsManager.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointsManager.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointsManager.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ResetResultsProfilingPoint.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ResetResultsProfilingPoint.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ResetResultsProfilingPoint.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ResetResultsProfilingPoint.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ResetResultsProfilingPointFactory.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ResetResultsProfilingPointFactory.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ResetResultsProfilingPointFactory.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ResetResultsProfilingPointFactory.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/StopwatchProfilingPoint.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/StopwatchProfilingPoint.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/StopwatchProfilingPoint.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/StopwatchProfilingPoint.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/StopwatchProfilingPointFactory.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/StopwatchProfilingPointFactory.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/StopwatchProfilingPointFactory.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/StopwatchProfilingPointFactory.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TakeSnapshotProfilingPoint.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TakeSnapshotProfilingPoint.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TakeSnapshotProfilingPoint.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TakeSnapshotProfilingPoint.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TakeSnapshotProfilingPointFactory.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TakeSnapshotProfilingPointFactory.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TakeSnapshotProfilingPointFactory.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TakeSnapshotProfilingPointFactory.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TimedGlobalProfilingPoint.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TimedGlobalProfilingPoint.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TimedGlobalProfilingPoint.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TimedGlobalProfilingPoint.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TimedTakeSnapshotProfilingPoint.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TimedTakeSnapshotProfilingPoint.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TimedTakeSnapshotProfilingPoint.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TimedTakeSnapshotProfilingPoint.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TimedTakeSnapshotProfilingPointFactory.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TimedTakeSnapshotProfilingPointFactory.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TimedTakeSnapshotProfilingPointFactory.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TimedTakeSnapshotProfilingPointFactory.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TriggeredGlobalProfilingPoint.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TriggeredGlobalProfilingPoint.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TriggeredGlobalProfilingPoint.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TriggeredGlobalProfilingPoint.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TriggeredTakeSnapshotProfilingPoint.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TriggeredTakeSnapshotProfilingPoint.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TriggeredTakeSnapshotProfilingPoint.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TriggeredTakeSnapshotProfilingPoint.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TriggeredTakeSnapshotProfilingPointFactory.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TriggeredTakeSnapshotProfilingPointFactory.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TriggeredTakeSnapshotProfilingPointFactory.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/TriggeredTakeSnapshotProfilingPointFactory.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/Utils.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/Utils.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/Utils.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/Utils.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/layer.xml b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/layer.xml
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/layer.xml
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/layer.xml
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/profiler_pp.settings b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/profiler_pp.settings
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/profiler_pp.settings
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/profiler_pp.settings
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/profiler_pp.wstcref b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/profiler_pp.wstcref
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/profiler_pp.wstcref
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/profiler_pp.wstcref
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/Bundle.properties b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/Bundle.properties
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/Bundle.properties
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/Bundle.properties
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/CustomizeProfilingPointAction.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/CustomizeProfilingPointAction.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/CustomizeProfilingPointAction.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/CustomizeProfilingPointAction.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/DeleteProfilingPointAction.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/DeleteProfilingPointAction.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/DeleteProfilingPointAction.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/DeleteProfilingPointAction.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/EnableDisableProfilingPointAction.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/EnableDisableProfilingPointAction.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/EnableDisableProfilingPointAction.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/EnableDisableProfilingPointAction.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/InsertProfilingPointAction.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/InsertProfilingPointAction.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/InsertProfilingPointAction.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/InsertProfilingPointAction.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/InsertProfilingPointMenuAction.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/InsertProfilingPointMenuAction.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/InsertProfilingPointMenuAction.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/InsertProfilingPointMenuAction.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/LoadGeneratorCustomizer.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/LoadGeneratorCustomizer.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/LoadGeneratorCustomizer.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/LoadGeneratorCustomizer.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/LocationCustomizer.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/LocationCustomizer.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/LocationCustomizer.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/LocationCustomizer.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/OpenProfilingPointsWindowAction.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/OpenProfilingPointsWindowAction.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/OpenProfilingPointsWindowAction.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/OpenProfilingPointsWindowAction.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProfilingPointReport.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProfilingPointReport.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProfilingPointReport.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProfilingPointReport.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProfilingPointsDisplayer.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProfilingPointsDisplayer.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProfilingPointsDisplayer.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProfilingPointsDisplayer.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProfilingPointsIcons.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProfilingPointsIcons.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProfilingPointsIcons.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProfilingPointsIcons.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProfilingPointsUIHelper.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProfilingPointsUIHelper.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProfilingPointsUIHelper.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProfilingPointsUIHelper.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProfilingPointsWindow.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProfilingPointsWindow.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProfilingPointsWindow.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProfilingPointsWindow.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProfilingPointsWindowUI.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProfilingPointsWindowUI.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProfilingPointsWindowUI.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProfilingPointsWindowUI.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProjectSelector.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProjectSelector.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProjectSelector.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProjectSelector.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ResetResultsCustomizer.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ResetResultsCustomizer.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ResetResultsCustomizer.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ResetResultsCustomizer.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ShowOppositeProfilingPointAction.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ShowOppositeProfilingPointAction.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ShowOppositeProfilingPointAction.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ShowOppositeProfilingPointAction.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/SnapshotCustomizer.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/SnapshotCustomizer.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/SnapshotCustomizer.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/SnapshotCustomizer.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/StopwatchCustomizer.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/StopwatchCustomizer.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/StopwatchCustomizer.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/StopwatchCustomizer.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/TakeSnapshotCustomizer.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/TakeSnapshotCustomizer.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/TakeSnapshotCustomizer.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/TakeSnapshotCustomizer.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/TimeCustomizer.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/TimeCustomizer.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/TimeCustomizer.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/TimeCustomizer.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/TimedTakeSnapshotCustomizer.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/TimedTakeSnapshotCustomizer.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/TimedTakeSnapshotCustomizer.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/TimedTakeSnapshotCustomizer.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ToggleProfilingPointAction.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ToggleProfilingPointAction.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ToggleProfilingPointAction.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ToggleProfilingPointAction.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/TriggerCustomizer.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/TriggerCustomizer.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/TriggerCustomizer.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/TriggerCustomizer.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/TriggeredTakeSnapshotCustomizer.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/TriggeredTakeSnapshotCustomizer.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/TriggeredTakeSnapshotCustomizer.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/TriggeredTakeSnapshotCustomizer.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ValidityAwarePanel.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ValidityAwarePanel.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ValidityAwarePanel.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ValidityAwarePanel.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ValidityListener.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ValidityListener.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ValidityListener.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ValidityListener.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/WizardPanel1UI.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/WizardPanel1UI.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/WizardPanel1UI.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/WizardPanel1UI.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ProfilingPointsIcons.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ProfilingPointsIcons.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ProfilingPointsIcons.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ProfilingPointsIcons.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ProfilingPointsIconsProviderImpl.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ProfilingPointsIconsProviderImpl.java
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ProfilingPointsIconsProviderImpl.java
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ProfilingPointsIconsProviderImpl.java
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/codeProfilingPoint.png b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/codeProfilingPoint.png
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/codeProfilingPoint.png
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/codeProfilingPoint.png
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/globalProfilingPoint.png b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/globalProfilingPoint.png
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/globalProfilingPoint.png
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/globalProfilingPoint.png
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/loadgenProfilingPoint.png b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/loadgenProfilingPoint.png
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/loadgenProfilingPoint.png
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/loadgenProfilingPoint.png
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/loadgenProfilingPointD.png b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/loadgenProfilingPointD.png
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/loadgenProfilingPointD.png
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/loadgenProfilingPointD.png
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ppoint.png b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ppoint.png
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ppoint.png
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ppoint.png
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ppointAdd.png b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ppointAdd.png
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ppointAdd.png
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ppointAdd.png
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ppointEdit.png b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ppointEdit.png
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ppointEdit.png
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ppointEdit.png
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ppointEnableDisable.png b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ppointEnableDisable.png
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ppointEnableDisable.png
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ppointEnableDisable.png
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ppointRemove.png b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ppointRemove.png
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ppointRemove.png
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/ppointRemove.png
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/resetResultsProfilingPoint.png b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/resetResultsProfilingPoint.png
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/resetResultsProfilingPoint.png
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/resetResultsProfilingPoint.png
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/resetResultsProfilingPointD.png b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/resetResultsProfilingPointD.png
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/resetResultsProfilingPointD.png
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/resetResultsProfilingPointD.png
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/stopwatchProfilingPoint.png b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/stopwatchProfilingPoint.png
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/stopwatchProfilingPoint.png
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/stopwatchProfilingPoint.png
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/stopwatchProfilingPointD.png b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/stopwatchProfilingPointD.png
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/stopwatchProfilingPointD.png
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/stopwatchProfilingPointD.png
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/takeSnapshotProfilingPoint.png b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/takeSnapshotProfilingPoint.png
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/takeSnapshotProfilingPoint.png
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/takeSnapshotProfilingPoint.png
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/takeSnapshotProfilingPointD.png b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/takeSnapshotProfilingPointD.png
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/takeSnapshotProfilingPointD.png
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/takeSnapshotProfilingPointD.png
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/timedTakeSnapshotProfilingPoint.png b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/timedTakeSnapshotProfilingPoint.png
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/timedTakeSnapshotProfilingPoint.png
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/timedTakeSnapshotProfilingPoint.png
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/triggeredTakeSnapshotProfilingPoint.png b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/triggeredTakeSnapshotProfilingPoint.png
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/triggeredTakeSnapshotProfilingPoint.png
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/icons/triggeredTakeSnapshotProfilingPoint.png
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/loadgenProfilingPoint.xml b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/loadgenProfilingPoint.xml
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/loadgenProfilingPoint.xml
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/loadgenProfilingPoint.xml
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/loadgenProfilingPointD.xml b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/loadgenProfilingPointD.xml
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/loadgenProfilingPointD.xml
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/loadgenProfilingPointD.xml
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/resetResultsProfilingPoint.xml b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/resetResultsProfilingPoint.xml
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/resetResultsProfilingPoint.xml
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/resetResultsProfilingPoint.xml
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/resetResultsProfilingPointD.xml b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/resetResultsProfilingPointD.xml
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/resetResultsProfilingPointD.xml
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/resetResultsProfilingPointD.xml
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/stopwatchProfilingPoint.xml b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/stopwatchProfilingPoint.xml
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/stopwatchProfilingPoint.xml
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/stopwatchProfilingPoint.xml
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/stopwatchProfilingPointD.xml b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/stopwatchProfilingPointD.xml
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/stopwatchProfilingPointD.xml
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/stopwatchProfilingPointD.xml
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/takeSnapshotProfilingPoint.xml b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/takeSnapshotProfilingPoint.xml
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/takeSnapshotProfilingPoint.xml
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/takeSnapshotProfilingPoint.xml
diff --git a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/takeSnapshotProfilingPointD.xml b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/takeSnapshotProfilingPointD.xml
similarity index 100%
rename from profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/takeSnapshotProfilingPointD.xml
rename to profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/resources/takeSnapshotProfilingPointD.xml
diff --git a/profiler.projectsupport/build.xml b/profiler/profiler.projectsupport/build.xml
similarity index 87%
rename from profiler.projectsupport/build.xml
rename to profiler/profiler.projectsupport/build.xml
index 373607e47c..6479e4497e 100644
--- a/profiler.projectsupport/build.xml
+++ b/profiler/profiler.projectsupport/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="profiler.projectsupport">
+<project basedir="." default="build" name="profiler/profiler.projectsupport">
     <description>Builds, tests, and runs the project org.netbeans.modules.profiler.projectsupport</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/profiler.projectsupport/manifest.mf b/profiler/profiler.projectsupport/manifest.mf
similarity index 100%
rename from profiler.projectsupport/manifest.mf
rename to profiler/profiler.projectsupport/manifest.mf
diff --git a/profiler.projectsupport/nbproject/project.properties b/profiler/profiler.projectsupport/nbproject/project.properties
similarity index 100%
rename from profiler.projectsupport/nbproject/project.properties
rename to profiler/profiler.projectsupport/nbproject/project.properties
diff --git a/profiler.projectsupport/nbproject/project.xml b/profiler/profiler.projectsupport/nbproject/project.xml
similarity index 100%
rename from profiler.projectsupport/nbproject/project.xml
rename to profiler/profiler.projectsupport/nbproject/project.xml
diff --git a/profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/AbstractProjectLookupProvider.java b/profiler/profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/AbstractProjectLookupProvider.java
similarity index 100%
rename from profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/AbstractProjectLookupProvider.java
rename to profiler/profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/AbstractProjectLookupProvider.java
diff --git a/profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/Bundle.properties b/profiler/profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/Bundle.properties
similarity index 100%
rename from profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/Bundle.properties
rename to profiler/profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/Bundle.properties
diff --git a/profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/utilities/AppletSupport.java b/profiler/profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/utilities/AppletSupport.java
similarity index 100%
rename from profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/utilities/AppletSupport.java
rename to profiler/profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/utilities/AppletSupport.java
diff --git a/profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/utilities/Bundle.properties b/profiler/profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/utilities/Bundle.properties
similarity index 100%
rename from profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/utilities/Bundle.properties
rename to profiler/profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/utilities/Bundle.properties
diff --git a/profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/utilities/ProjectUtilities.java b/profiler/profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/utilities/ProjectUtilities.java
similarity index 100%
rename from profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/utilities/ProjectUtilities.java
rename to profiler/profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/utilities/ProjectUtilities.java
diff --git a/profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/utilities/ProjectUtilitiesProviderImpl.java b/profiler/profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/utilities/ProjectUtilitiesProviderImpl.java
similarity index 100%
rename from profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/utilities/ProjectUtilitiesProviderImpl.java
rename to profiler/profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/utilities/ProjectUtilitiesProviderImpl.java
diff --git a/profiler.snaptracer/build.xml b/profiler/profiler.snaptracer/build.xml
similarity index 87%
rename from profiler.snaptracer/build.xml
rename to profiler/profiler.snaptracer/build.xml
index 164843e402..318e5f4507 100644
--- a/profiler.snaptracer/build.xml
+++ b/profiler/profiler.snaptracer/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="profiler.snaptracer">
+<project basedir="." default="build" name="profiler/profiler.snaptracer">
     <description>Builds, tests, and runs the project org.netbeans.modules.profiler.snaptracer</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/profiler.snaptracer/licenseinfo.xml b/profiler/profiler.snaptracer/licenseinfo.xml
similarity index 100%
rename from profiler.snaptracer/licenseinfo.xml
rename to profiler/profiler.snaptracer/licenseinfo.xml
diff --git a/profiler.snaptracer/manifest.mf b/profiler/profiler.snaptracer/manifest.mf
similarity index 100%
rename from profiler.snaptracer/manifest.mf
rename to profiler/profiler.snaptracer/manifest.mf
diff --git a/profiler.snaptracer/nbproject/project.properties b/profiler/profiler.snaptracer/nbproject/project.properties
similarity index 100%
rename from profiler.snaptracer/nbproject/project.properties
rename to profiler/profiler.snaptracer/nbproject/project.properties
diff --git a/profiler.snaptracer/nbproject/project.xml b/profiler/profiler.snaptracer/nbproject/project.xml
similarity index 100%
rename from profiler.snaptracer/nbproject/project.xml
rename to profiler/profiler.snaptracer/nbproject/project.xml
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/Bundle.properties b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/Bundle.properties
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/Bundle.properties
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/Bundle.properties
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/ClassNameComparator.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/ClassNameComparator.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/ClassNameComparator.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/ClassNameComparator.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/ItemValueFormatter.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/ItemValueFormatter.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/ItemValueFormatter.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/ItemValueFormatter.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/PackageStateHandler.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/PackageStateHandler.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/PackageStateHandler.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/PackageStateHandler.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/Positionable.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/Positionable.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/Positionable.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/Positionable.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/ProbeItemDescriptor.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/ProbeItemDescriptor.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/ProbeItemDescriptor.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/ProbeItemDescriptor.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/ProbeStateHandler.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/ProbeStateHandler.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/ProbeStateHandler.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/ProbeStateHandler.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/SessionInitializationException.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/SessionInitializationException.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/SessionInitializationException.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/SessionInitializationException.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerPackage.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerPackage.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerPackage.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerPackage.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerPackageProvider.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerPackageProvider.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerPackageProvider.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerPackageProvider.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerProbe.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerProbe.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerProbe.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerProbe.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerProbeDescriptor.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerProbeDescriptor.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerProbeDescriptor.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerProbeDescriptor.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerProgressObject.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerProgressObject.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerProgressObject.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerProgressObject.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerSupport.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerSupport.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerSupport.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerSupport.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/AttachToBugAction.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/AttachToBugAction.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/AttachToBugAction.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/AttachToBugAction.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/Bundle.properties b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/Bundle.properties
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/Bundle.properties
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/Bundle.properties
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/DetailsView.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/DetailsView.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/DetailsView.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/DetailsView.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/ExportSnapshotAction.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/ExportSnapshotAction.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/ExportSnapshotAction.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/ExportSnapshotAction.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/IdeSnapshot.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/IdeSnapshot.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/IdeSnapshot.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/IdeSnapshot.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/IdeSnapshotAction.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/IdeSnapshotAction.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/IdeSnapshotAction.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/IdeSnapshotAction.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/NpssDataObject.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/NpssDataObject.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/NpssDataObject.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/NpssDataObject.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/TimelineView.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/TimelineView.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/TimelineView.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/TimelineView.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/TracerController.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/TracerController.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/TracerController.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/TracerController.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/TracerModel.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/TracerModel.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/TracerModel.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/TracerModel.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/TracerSupportImpl.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/TracerSupportImpl.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/TracerSupportImpl.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/TracerSupportImpl.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/TracerView.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/TracerView.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/TracerView.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/TracerView.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/DetailsPanel.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/DetailsPanel.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/DetailsPanel.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/DetailsPanel.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/DetailsTable.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/DetailsTable.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/DetailsTable.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/DetailsTable.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/DetailsTableCellRenderer.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/DetailsTableCellRenderer.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/DetailsTableCellRenderer.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/DetailsTableCellRenderer.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/DetailsTableModel.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/DetailsTableModel.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/DetailsTableModel.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/DetailsTableModel.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/ItemValueRenderer.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/ItemValueRenderer.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/ItemValueRenderer.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/ItemValueRenderer.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/MarkRenderer.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/MarkRenderer.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/MarkRenderer.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/MarkRenderer.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/TimestampRenderer.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/TimestampRenderer.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/TimestampRenderer.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/details/TimestampRenderer.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/CSVExporter.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/CSVExporter.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/CSVExporter.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/CSVExporter.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/DataExport.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/DataExport.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/DataExport.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/DataExport.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/ExportBatch.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/ExportBatch.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/ExportBatch.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/ExportBatch.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/Exporter.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/Exporter.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/Exporter.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/Exporter.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/HTMLExporter.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/HTMLExporter.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/HTMLExporter.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/HTMLExporter.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/XMLExporter.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/XMLExporter.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/XMLExporter.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/XMLExporter.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/TracerIcons.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/TracerIcons.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/TracerIcons.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/TracerIcons.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/TracerIconsProviderImpl.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/TracerIconsProviderImpl.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/TracerIconsProviderImpl.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/TracerIconsProviderImpl.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/bugtracking.png b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/bugtracking.png
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/bugtracking.png
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/bugtracking.png
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/decrement.png b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/decrement.png
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/decrement.png
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/decrement.png
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/genericAction.png b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/genericAction.png
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/genericAction.png
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/genericAction.png
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/hmwheel.png b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/hmwheel.png
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/hmwheel.png
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/hmwheel.png
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/increment.png b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/increment.png
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/increment.png
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/increment.png
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/mark.png b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/mark.png
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/mark.png
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/mark.png
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/markClear.png b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/markClear.png
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/markClear.png
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/markClear.png
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/markHighl.png b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/markHighl.png
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/markHighl.png
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/markHighl.png
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/probe.png b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/probe.png
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/probe.png
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/probe.png
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/reset.png b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/reset.png
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/reset.png
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/reset.png
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/selectAll.png b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/selectAll.png
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/selectAll.png
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/selectAll.png
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/snapshotDataObjectCPU.png b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/snapshotDataObjectCPU.png
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/snapshotDataObjectCPU.png
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/snapshotDataObjectCPU.png
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/snapshotDataObjectCPU32.png b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/snapshotDataObjectCPU32.png
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/snapshotDataObjectCPU32.png
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/snapshotDataObjectCPU32.png
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/tracer.png b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/tracer.png
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/tracer.png
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/tracer.png
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/tracer32.png b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/tracer32.png
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/tracer32.png
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/tracer32.png
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/vmwheel.png b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/vmwheel.png
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/vmwheel.png
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/vmwheel.png
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/zmwheel.png b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/zmwheel.png
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/zmwheel.png
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/icons/zmwheel.png
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/options/TracerOptions.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/options/TracerOptions.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/options/TracerOptions.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/options/TracerOptions.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/options/TracerOptionsCategory.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/options/TracerOptionsCategory.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/options/TracerOptionsCategory.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/options/TracerOptionsCategory.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/options/TracerOptionsPanel.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/options/TracerOptionsPanel.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/options/TracerOptionsPanel.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/options/TracerOptionsPanel.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/options/TracerOptionsPanelController.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/options/TracerOptionsPanelController.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/options/TracerOptionsPanelController.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/options/TracerOptionsPanelController.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/packages/TestPackage.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/packages/TestPackage.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/packages/TestPackage.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/packages/TestPackage.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/packages/TestPackageProvider.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/packages/TestPackageProvider.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/packages/TestPackageProvider.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/packages/TestPackageProvider.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/packages/TestProbe.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/packages/TestProbe.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/packages/TestProbe.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/packages/TestProbe.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/packages/UiGesturesProbe.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/packages/UiGesturesProbe.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/packages/UiGesturesProbe.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/packages/UiGesturesProbe.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/probes/ProbeDescriptorComponent.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/probes/ProbeDescriptorComponent.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/probes/ProbeDescriptorComponent.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/probes/ProbeDescriptorComponent.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/probes/ProbePresenter.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/probes/ProbePresenter.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/probes/ProbePresenter.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/probes/ProbePresenter.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/resources/NpssResolver.xml b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/resources/NpssResolver.xml
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/resources/NpssResolver.xml
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/resources/NpssResolver.xml
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/ColorIcon.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/ColorIcon.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/ColorIcon.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/ColorIcon.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/CustomComboRenderer.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/CustomComboRenderer.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/CustomComboRenderer.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/CustomComboRenderer.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/DropdownButton.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/DropdownButton.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/DropdownButton.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/DropdownButton.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/EnhancedLabelRenderer.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/EnhancedLabelRenderer.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/EnhancedLabelRenderer.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/EnhancedLabelRenderer.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/HeaderButton.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/HeaderButton.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/HeaderButton.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/HeaderButton.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/HeaderLabel.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/HeaderLabel.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/HeaderLabel.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/HeaderLabel.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/HeaderPanel.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/HeaderPanel.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/HeaderPanel.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/HeaderPanel.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/HorizontalLayout.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/HorizontalLayout.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/HorizontalLayout.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/HorizontalLayout.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/LabelRenderer.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/LabelRenderer.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/LabelRenderer.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/LabelRenderer.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/LegendFont.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/LegendFont.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/LegendFont.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/LegendFont.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/ScrollBar.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/ScrollBar.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/ScrollBar.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/ScrollBar.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/ScrollableContainer.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/ScrollableContainer.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/ScrollableContainer.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/ScrollableContainer.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/SectionSeparator.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/SectionSeparator.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/SectionSeparator.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/SectionSeparator.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/Separator.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/Separator.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/Separator.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/Separator.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/SimpleSeparator.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/SimpleSeparator.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/SimpleSeparator.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/SimpleSeparator.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/Spacer.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/Spacer.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/Spacer.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/Spacer.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/TimelineMarksPainter.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/TimelineMarksPainter.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/TimelineMarksPainter.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/TimelineMarksPainter.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/TransparentToolBar.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/TransparentToolBar.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/TransparentToolBar.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/TransparentToolBar.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/VerticalLayout.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/VerticalLayout.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/VerticalLayout.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/VerticalLayout.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/VisibilityHandler.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/VisibilityHandler.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/VisibilityHandler.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/swing/VisibilityHandler.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/Bundle.properties b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/Bundle.properties
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/Bundle.properties
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/Bundle.properties
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/ChartPanel.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/ChartPanel.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/ChartPanel.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/ChartPanel.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/ContinuousXYPainter.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/ContinuousXYPainter.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/ContinuousXYPainter.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/ContinuousXYPainter.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/DiscreteXYPainter.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/DiscreteXYPainter.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/DiscreteXYPainter.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/DiscreteXYPainter.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/PointsComputer.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/PointsComputer.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/PointsComputer.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/PointsComputer.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/ProbesPanel.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/ProbesPanel.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/ProbesPanel.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/ProbesPanel.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/RowBackgroundDecorator.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/RowBackgroundDecorator.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/RowBackgroundDecorator.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/RowBackgroundDecorator.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/RowBoundsDecorator.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/RowBoundsDecorator.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/RowBoundsDecorator.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/RowBoundsDecorator.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/RowForegroundDecorator.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/RowForegroundDecorator.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/RowForegroundDecorator.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/RowForegroundDecorator.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineAxis.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineAxis.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineAxis.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineAxis.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineChart.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineChart.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineChart.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineChart.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineColorFactory.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineColorFactory.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineColorFactory.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineColorFactory.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineIconPainter.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineIconPainter.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineIconPainter.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineIconPainter.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineLegendOverlay.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineLegendOverlay.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineLegendOverlay.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineLegendOverlay.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineModel.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineModel.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineModel.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineModel.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelinePaintersFactory.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelinePaintersFactory.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelinePaintersFactory.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelinePaintersFactory.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelinePanel.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelinePanel.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelinePanel.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelinePanel.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineSelectionManager.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineSelectionManager.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineSelectionManager.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineSelectionManager.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineSelectionOverlay.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineSelectionOverlay.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineSelectionOverlay.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineSelectionOverlay.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineSupport.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineSupport.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineSupport.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineSupport.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineTooltipOverlay.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineTooltipOverlay.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineTooltipOverlay.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineTooltipOverlay.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineTooltipPainter.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineTooltipPainter.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineTooltipPainter.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineTooltipPainter.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineUnitsOverlay.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineUnitsOverlay.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineUnitsOverlay.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineUnitsOverlay.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineXYItem.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineXYItem.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineXYItem.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineXYItem.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineXYPainter.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineXYPainter.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineXYPainter.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/TimelineXYPainter.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/VerticalTimelineLayout.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/VerticalTimelineLayout.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/VerticalTimelineLayout.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/VerticalTimelineLayout.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/XChartSelectionOverlay.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/XChartSelectionOverlay.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/XChartSelectionOverlay.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/XChartSelectionOverlay.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/items/ContinuousXYItemDescriptor.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/items/ContinuousXYItemDescriptor.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/items/ContinuousXYItemDescriptor.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/items/ContinuousXYItemDescriptor.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/items/DiscreteXYItemDescriptor.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/items/DiscreteXYItemDescriptor.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/items/DiscreteXYItemDescriptor.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/items/DiscreteXYItemDescriptor.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/items/IconItemDescriptor.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/items/IconItemDescriptor.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/items/IconItemDescriptor.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/items/IconItemDescriptor.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/items/ValueItemDescriptor.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/items/ValueItemDescriptor.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/items/ValueItemDescriptor.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/items/ValueItemDescriptor.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/items/XYItemDescriptor.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/items/XYItemDescriptor.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/items/XYItemDescriptor.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/items/XYItemDescriptor.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/logs/LogReader.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/logs/LogReader.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/logs/LogReader.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/logs/LogReader.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/logs/LogRecords.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/logs/LogRecords.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/logs/LogRecords.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/logs/LogRecords.java
diff --git a/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/package-info.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/package-info.java
similarity index 100%
rename from profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/package-info.java
rename to profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/package-info.java
diff --git a/profiler.utilities/build.xml b/profiler/profiler.utilities/build.xml
similarity index 87%
rename from profiler.utilities/build.xml
rename to profiler/profiler.utilities/build.xml
index c801a78791..36e291bd58 100644
--- a/profiler.utilities/build.xml
+++ b/profiler/profiler.utilities/build.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="profiler.utilities">
+<project basedir="." default="build" name="profiler/profiler.utilities">
     <description>Builds, tests, and runs the project org.netbeans.modules.profiler.utilities</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/profiler.utilities/manifest.mf b/profiler/profiler.utilities/manifest.mf
similarity index 100%
rename from profiler.utilities/manifest.mf
rename to profiler/profiler.utilities/manifest.mf
diff --git a/profiler.utilities/nbproject/project.properties b/profiler/profiler.utilities/nbproject/project.properties
similarity index 100%
rename from profiler.utilities/nbproject/project.properties
rename to profiler/profiler.utilities/nbproject/project.properties
diff --git a/profiler.utilities/nbproject/project.xml b/profiler/profiler.utilities/nbproject/project.xml
similarity index 100%
rename from profiler.utilities/nbproject/project.xml
rename to profiler/profiler.utilities/nbproject/project.xml
diff --git a/profiler.utilities/src/org/netbeans/modules/profiler/utilities/Bundle.properties b/profiler/profiler.utilities/src/org/netbeans/modules/profiler/utilities/Bundle.properties
similarity index 100%
rename from profiler.utilities/src/org/netbeans/modules/profiler/utilities/Bundle.properties
rename to profiler/profiler.utilities/src/org/netbeans/modules/profiler/utilities/Bundle.properties
diff --git a/profiler.utilities/src/org/netbeans/modules/profiler/utilities/Delegate.java b/profiler/profiler.utilities/src/org/netbeans/modules/profiler/utilities/Delegate.java
similarity index 100%
rename from profiler.utilities/src/org/netbeans/modules/profiler/utilities/Delegate.java
rename to profiler/profiler.utilities/src/org/netbeans/modules/profiler/utilities/Delegate.java
diff --git a/profiler.utilities/src/org/netbeans/modules/profiler/utilities/OutputParameter.java b/profiler/profiler.utilities/src/org/netbeans/modules/profiler/utilities/OutputParameter.java
similarity index 100%
rename from profiler.utilities/src/org/netbeans/modules/profiler/utilities/OutputParameter.java
rename to profiler/profiler.utilities/src/org/netbeans/modules/profiler/utilities/OutputParameter.java
diff --git a/profiler.utilities/src/org/netbeans/modules/profiler/utilities/ProfilerUtils.java b/profiler/profiler.utilities/src/org/netbeans/modules/profiler/utilities/ProfilerUtils.java
similarity index 100%
rename from profiler.utilities/src/org/netbeans/modules/profiler/utilities/ProfilerUtils.java
rename to profiler/profiler.utilities/src/org/netbeans/modules/profiler/utilities/ProfilerUtils.java
diff --git a/profiler.utilities/src/org/netbeans/modules/profiler/utilities/Visitable.java b/profiler/profiler.utilities/src/org/netbeans/modules/profiler/utilities/Visitable.java
similarity index 100%
rename from profiler.utilities/src/org/netbeans/modules/profiler/utilities/Visitable.java
rename to profiler/profiler.utilities/src/org/netbeans/modules/profiler/utilities/Visitable.java
diff --git a/profiler.utilities/src/org/netbeans/modules/profiler/utilities/Visitor.java b/profiler/profiler.utilities/src/org/netbeans/modules/profiler/utilities/Visitor.java
similarity index 100%
rename from profiler.utilities/src/org/netbeans/modules/profiler/utilities/Visitor.java
rename to profiler/profiler.utilities/src/org/netbeans/modules/profiler/utilities/Visitor.java
diff --git a/profiler/build.xml b/profiler/profiler/build.xml
similarity index 95%
rename from profiler/build.xml
rename to profiler/profiler/build.xml
index 8a2e2e98d3..2f42cd082f 100644
--- a/profiler/build.xml
+++ b/profiler/profiler/build.xml
@@ -19,9 +19,9 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="profiler">
+<project basedir="." default="build" name="profiler/profiler">
     <description>Builds, tests, and runs the project org.yourorghere.main</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
     <property name="test.run.args" value="-Dnetbeans.keyring.no.master=true -Dnetbeans.full.hack=true  -client -Xss4m -Xms64m -Xmx512m -XX:PermSize=64m -XX:MaxPermSize=300m -Dsun.java2d.noddraw=true"/>
     
   <target name="netbeans-extra-ml" depends="release-ml" if="locales"/>
diff --git a/profiler/l10n.list b/profiler/profiler/l10n.list
similarity index 100%
rename from profiler/l10n.list
rename to profiler/profiler/l10n.list
diff --git a/profiler/licenseinfo.xml b/profiler/profiler/licenseinfo.xml
similarity index 100%
rename from profiler/licenseinfo.xml
rename to profiler/profiler/licenseinfo.xml
diff --git a/profiler/manifest.mf b/profiler/profiler/manifest.mf
similarity index 100%
rename from profiler/manifest.mf
rename to profiler/profiler/manifest.mf
diff --git a/profiler/nbproject/project.properties b/profiler/profiler/nbproject/project.properties
similarity index 100%
rename from profiler/nbproject/project.properties
rename to profiler/profiler/nbproject/project.properties
diff --git a/profiler/nbproject/project.xml b/profiler/profiler/nbproject/project.xml
similarity index 100%
rename from profiler/nbproject/project.xml
rename to profiler/profiler/nbproject/project.xml
diff --git a/profiler/release/VERSION.txt b/profiler/profiler/release/VERSION.txt
similarity index 100%
rename from profiler/release/VERSION.txt
rename to profiler/profiler/release/VERSION.txt
diff --git a/profiler/src/org/netbeans/modules/profiler/Bundle.properties b/profiler/profiler/src/org/netbeans/modules/profiler/Bundle.properties
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/Bundle.properties
rename to profiler/profiler/src/org/netbeans/modules/profiler/Bundle.properties
diff --git a/profiler/src/org/netbeans/modules/profiler/DummyHprofResolver.xml b/profiler/profiler/src/org/netbeans/modules/profiler/DummyHprofResolver.xml
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/DummyHprofResolver.xml
rename to profiler/profiler/src/org/netbeans/modules/profiler/DummyHprofResolver.xml
diff --git a/profiler/src/org/netbeans/modules/profiler/HeapDumpWatch.java b/profiler/profiler/src/org/netbeans/modules/profiler/HeapDumpWatch.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/HeapDumpWatch.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/HeapDumpWatch.java
diff --git a/profiler/src/org/netbeans/modules/profiler/LoadedSnapshot.java b/profiler/profiler/src/org/netbeans/modules/profiler/LoadedSnapshot.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/LoadedSnapshot.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/LoadedSnapshot.java
diff --git a/profiler/src/org/netbeans/modules/profiler/NetBeansProfiler.java b/profiler/profiler/src/org/netbeans/modules/profiler/NetBeansProfiler.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/NetBeansProfiler.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/NetBeansProfiler.java
diff --git a/profiler/src/org/netbeans/modules/profiler/NpsResolver.xml b/profiler/profiler/src/org/netbeans/modules/profiler/NpsResolver.xml
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/NpsResolver.xml
rename to profiler/profiler/src/org/netbeans/modules/profiler/NpsResolver.xml
diff --git a/profiler/src/org/netbeans/modules/profiler/ProfilerModule.java b/profiler/profiler/src/org/netbeans/modules/profiler/ProfilerModule.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/ProfilerModule.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/ProfilerModule.java
diff --git a/profiler/src/org/netbeans/modules/profiler/ProfilerTopComponent.java b/profiler/profiler/src/org/netbeans/modules/profiler/ProfilerTopComponent.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/ProfilerTopComponent.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/ProfilerTopComponent.java
diff --git a/profiler/src/org/netbeans/modules/profiler/ProfilingMonitor.java b/profiler/profiler/src/org/netbeans/modules/profiler/ProfilingMonitor.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/ProfilingMonitor.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/ProfilingMonitor.java
diff --git a/profiler/src/org/netbeans/modules/profiler/ResultsListener.java b/profiler/profiler/src/org/netbeans/modules/profiler/ResultsListener.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/ResultsListener.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/ResultsListener.java
diff --git a/profiler/src/org/netbeans/modules/profiler/ResultsManager.java b/profiler/profiler/src/org/netbeans/modules/profiler/ResultsManager.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/ResultsManager.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/ResultsManager.java
diff --git a/profiler/src/org/netbeans/modules/profiler/SampledCPUSnapshot.java b/profiler/profiler/src/org/netbeans/modules/profiler/SampledCPUSnapshot.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/SampledCPUSnapshot.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/SampledCPUSnapshot.java
diff --git a/profiler/src/org/netbeans/modules/profiler/SaveSnapshotAction.java b/profiler/profiler/src/org/netbeans/modules/profiler/SaveSnapshotAction.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/SaveSnapshotAction.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/SaveSnapshotAction.java
diff --git a/profiler/src/org/netbeans/modules/profiler/ServerStateMonitor.java b/profiler/profiler/src/org/netbeans/modules/profiler/ServerStateMonitor.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/ServerStateMonitor.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/ServerStateMonitor.java
diff --git a/profiler/src/org/netbeans/modules/profiler/SnapshotInfoAction.java b/profiler/profiler/src/org/netbeans/modules/profiler/SnapshotInfoAction.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/SnapshotInfoAction.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/SnapshotInfoAction.java
diff --git a/profiler/src/org/netbeans/modules/profiler/SnapshotInfoPanel.java b/profiler/profiler/src/org/netbeans/modules/profiler/SnapshotInfoPanel.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/SnapshotInfoPanel.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/SnapshotInfoPanel.java
diff --git a/profiler/src/org/netbeans/modules/profiler/SnapshotResultsWindow.java b/profiler/profiler/src/org/netbeans/modules/profiler/SnapshotResultsWindow.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/SnapshotResultsWindow.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/SnapshotResultsWindow.java
diff --git a/profiler/src/org/netbeans/modules/profiler/SnapshotsListener.java b/profiler/profiler/src/org/netbeans/modules/profiler/SnapshotsListener.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/SnapshotsListener.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/SnapshotsListener.java
diff --git a/profiler/src/org/netbeans/modules/profiler/ThreadDumpWindow.java b/profiler/profiler/src/org/netbeans/modules/profiler/ThreadDumpWindow.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/ThreadDumpWindow.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/ThreadDumpWindow.java
diff --git a/profiler/src/org/netbeans/modules/profiler/actions/AttachAction.java b/profiler/profiler/src/org/netbeans/modules/profiler/actions/AttachAction.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/actions/AttachAction.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/actions/AttachAction.java
diff --git a/profiler/src/org/netbeans/modules/profiler/actions/Bundle.properties b/profiler/profiler/src/org/netbeans/modules/profiler/actions/Bundle.properties
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/actions/Bundle.properties
rename to profiler/profiler/src/org/netbeans/modules/profiler/actions/Bundle.properties
diff --git a/profiler/src/org/netbeans/modules/profiler/actions/CompareSnapshotsAction.java b/profiler/profiler/src/org/netbeans/modules/profiler/actions/CompareSnapshotsAction.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/actions/CompareSnapshotsAction.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/actions/CompareSnapshotsAction.java
diff --git a/profiler/src/org/netbeans/modules/profiler/actions/GetCmdLineArgumentsAction.java b/profiler/profiler/src/org/netbeans/modules/profiler/actions/GetCmdLineArgumentsAction.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/actions/GetCmdLineArgumentsAction.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/actions/GetCmdLineArgumentsAction.java
diff --git a/profiler/src/org/netbeans/modules/profiler/actions/HeapDumpAction.java b/profiler/profiler/src/org/netbeans/modules/profiler/actions/HeapDumpAction.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/actions/HeapDumpAction.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/actions/HeapDumpAction.java
diff --git a/profiler/src/org/netbeans/modules/profiler/actions/InternalStatsAction.java b/profiler/profiler/src/org/netbeans/modules/profiler/actions/InternalStatsAction.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/actions/InternalStatsAction.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/actions/InternalStatsAction.java
diff --git a/profiler/src/org/netbeans/modules/profiler/actions/JavaPlatformSelector.java b/profiler/profiler/src/org/netbeans/modules/profiler/actions/JavaPlatformSelector.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/actions/JavaPlatformSelector.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/actions/JavaPlatformSelector.java
diff --git a/profiler/src/org/netbeans/modules/profiler/actions/LoadSnapshotAction.java b/profiler/profiler/src/org/netbeans/modules/profiler/actions/LoadSnapshotAction.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/actions/LoadSnapshotAction.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/actions/LoadSnapshotAction.java
diff --git a/profiler/src/org/netbeans/modules/profiler/actions/ProfilingAwareAction.java b/profiler/profiler/src/org/netbeans/modules/profiler/actions/ProfilingAwareAction.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/actions/ProfilingAwareAction.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/actions/ProfilingAwareAction.java
diff --git a/profiler/src/org/netbeans/modules/profiler/actions/ProfilingSupport.java b/profiler/profiler/src/org/netbeans/modules/profiler/actions/ProfilingSupport.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/actions/ProfilingSupport.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/actions/ProfilingSupport.java
diff --git a/profiler/src/org/netbeans/modules/profiler/actions/ResetResultsAction.java b/profiler/profiler/src/org/netbeans/modules/profiler/actions/ResetResultsAction.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/actions/ResetResultsAction.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/actions/ResetResultsAction.java
diff --git a/profiler/src/org/netbeans/modules/profiler/actions/RunCalibrationAction.java b/profiler/profiler/src/org/netbeans/modules/profiler/actions/RunCalibrationAction.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/actions/RunCalibrationAction.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/actions/RunCalibrationAction.java
diff --git a/profiler/src/org/netbeans/modules/profiler/actions/RunGCAction.java b/profiler/profiler/src/org/netbeans/modules/profiler/actions/RunGCAction.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/actions/RunGCAction.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/actions/RunGCAction.java
diff --git a/profiler/src/org/netbeans/modules/profiler/actions/SnapshotsWindowAction.java b/profiler/profiler/src/org/netbeans/modules/profiler/actions/SnapshotsWindowAction.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/actions/SnapshotsWindowAction.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/actions/SnapshotsWindowAction.java
diff --git a/profiler/src/org/netbeans/modules/profiler/actions/StopAction.java b/profiler/profiler/src/org/netbeans/modules/profiler/actions/StopAction.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/actions/StopAction.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/actions/StopAction.java
diff --git a/profiler/src/org/netbeans/modules/profiler/actions/TakeSnapshotAction.java b/profiler/profiler/src/org/netbeans/modules/profiler/actions/TakeSnapshotAction.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/actions/TakeSnapshotAction.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/actions/TakeSnapshotAction.java
diff --git a/profiler/src/org/netbeans/modules/profiler/actions/TakeThreadDumpAction.java b/profiler/profiler/src/org/netbeans/modules/profiler/actions/TakeThreadDumpAction.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/actions/TakeThreadDumpAction.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/actions/TakeThreadDumpAction.java
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/Bundle.properties b/profiler/profiler/src/org/netbeans/modules/profiler/impl/Bundle.properties
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/Bundle.properties
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/Bundle.properties
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/CloseButtonProvider.java b/profiler/profiler/src/org/netbeans/modules/profiler/impl/CloseButtonProvider.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/CloseButtonProvider.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/CloseButtonProvider.java
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/ProfilerDialogs.java b/profiler/profiler/src/org/netbeans/modules/profiler/impl/ProfilerDialogs.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/ProfilerDialogs.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/ProfilerDialogs.java
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/ProfilerDialogsProviderImpl.java b/profiler/profiler/src/org/netbeans/modules/profiler/impl/ProfilerDialogsProviderImpl.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/ProfilerDialogsProviderImpl.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/ProfilerDialogsProviderImpl.java
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/IconsProviderImpl.java b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/IconsProviderImpl.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/IconsProviderImpl.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/IconsProviderImpl.java
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/add.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/add.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/add.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/add.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/addFolder.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/addFolder.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/addFolder.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/addFolder.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/allThreads.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/allThreads.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/allThreads.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/allThreads.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/array.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/array.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/array.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/array.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/attach.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/attach.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/attach.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/attach.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/attach24.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/attach24.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/attach24.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/attach24.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/attachButton.gif b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/attachButton.gif
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/attachButton.gif
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/attachButton.gif
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/autoRefresh.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/autoRefresh.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/autoRefresh.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/autoRefresh.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/back.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/back.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/back.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/back.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/backTracesTab.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/backTracesTab.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/backTracesTab.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/backTracesTab.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/badgeAdd.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/badgeAdd.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/badgeAdd.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/badgeAdd.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/badgeRemove.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/badgeRemove.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/badgeRemove.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/badgeRemove.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/callTreeTab.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/callTreeTab.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/callTreeTab.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/callTreeTab.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/class.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/class.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/class.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/class.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/classAnonymous.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/classAnonymous.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/classAnonymous.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/classAnonymous.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/clearFilter.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/clearFilter.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/clearFilter.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/clearFilter.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/clearFilterHighl.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/clearFilterHighl.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/clearFilterHighl.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/clearFilterHighl.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/closePanel.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/closePanel.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/closePanel.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/closePanel.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/collapsedSnippet.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/collapsedSnippet.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/collapsedSnippet.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/collapsedSnippet.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/combinedTab.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/combinedTab.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/combinedTab.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/combinedTab.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/compareSnapshots.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/compareSnapshots.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/compareSnapshots.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/compareSnapshots.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/constructorPackage.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/constructorPackage.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/constructorPackage.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/constructorPackage.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/constructorPrivate.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/constructorPrivate.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/constructorPrivate.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/constructorPrivate.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/constructorProtected.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/constructorProtected.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/constructorProtected.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/constructorProtected.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/constructorPublic.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/constructorPublic.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/constructorPublic.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/constructorPublic.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/constructors.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/constructors.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/constructors.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/constructors.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/controlPanel.gif b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/controlPanel.gif
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/controlPanel.gif
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/controlPanel.gif
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/controlPanelWindow.gif b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/controlPanelWindow.gif
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/controlPanelWindow.gif
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/controlPanelWindow.gif
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/cpu.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/cpu.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/cpu.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/cpu.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/cpu32.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/cpu32.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/cpu32.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/cpu32.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/custom32.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/custom32.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/custom32.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/custom32.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/deltaValues.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/deltaValues.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/deltaValues.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/deltaValues.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/detach.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/detach.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/detach.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/detach.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/down.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/down.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/down.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/down.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/edit.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/edit.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/edit.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/edit.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/empty.gif b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/empty.gif
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/empty.gif
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/empty.gif
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/error.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/error.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/error.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/error.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/expandedSnippet.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/expandedSnippet.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/expandedSnippet.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/expandedSnippet.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/filter.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/filter.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/filter.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/filter.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/filterContains.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/filterContains.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/filterContains.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/filterContains.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/filterEndsWith.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/filterEndsWith.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/filterEndsWith.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/filterEndsWith.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/filterHighl.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/filterHighl.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/filterHighl.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/filterHighl.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/filterNotContains.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/filterNotContains.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/filterNotContains.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/filterNotContains.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/filterRegExp.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/filterRegExp.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/filterRegExp.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/filterRegExp.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/filterStartsWith.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/filterStartsWith.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/filterStartsWith.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/filterStartsWith.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/find.gif b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/find.gif
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/find.gif
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/find.gif
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/findNext.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/findNext.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/findNext.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/findNext.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/findPrevious.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/findPrevious.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/findPrevious.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/findPrevious.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/folder.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/folder.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/folder.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/folder.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/forward.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/forward.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/forward.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/forward.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/forwardNode.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/forwardNode.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/forwardNode.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/forwardNode.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/fragment.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/fragment.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/fragment.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/fragment.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/heapSnapshot.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/heapSnapshot.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/heapSnapshot.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/heapSnapshot.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/hideColumn.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/hideColumn.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/hideColumn.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/hideColumn.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/hotspotsTab.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/hotspotsTab.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/hotspotsTab.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/hotspotsTab.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/infoIcon.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/infoIcon.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/infoIcon.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/infoIcon.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/infoTab.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/infoTab.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/infoTab.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/infoTab.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/initializer.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/initializer.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/initializer.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/initializer.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/initializerSt.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/initializerSt.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/initializerSt.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/initializerSt.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/instance.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/instance.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/instance.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/instance.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/interface.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/interface.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/interface.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/interface.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/jar.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/jar.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/jar.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/jar.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/javaProcess.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/javaProcess.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/javaProcess.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/javaProcess.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/leafNode.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/leafNode.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/leafNode.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/leafNode.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/libraries.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/libraries.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/libraries.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/libraries.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/liveResults.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/liveResults.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/liveResults.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/liveResults.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/liveResultsCPUView32.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/liveResultsCPUView32.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/liveResultsCPUView32.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/liveResultsCPUView32.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/liveResultsFragmentView32.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/liveResultsFragmentView32.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/liveResultsFragmentView32.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/liveResultsFragmentView32.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/liveResultsMemView32.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/liveResultsMemView32.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/liveResultsMemView32.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/liveResultsMemView32.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/liveResultsWindow.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/liveResultsWindow.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/liveResultsWindow.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/liveResultsWindow.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/locksView32.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/locksView32.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/locksView32.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/locksView32.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/locksWindow.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/locksWindow.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/locksWindow.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/locksWindow.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/matchCase.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/matchCase.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/matchCase.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/matchCase.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/maximizePanel.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/maximizePanel.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/maximizePanel.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/maximizePanel.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/memory.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/memory.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/memory.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/memory.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/memory32.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/memory32.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/memory32.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/memory32.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/memoryResultsTab.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/memoryResultsTab.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/memoryResultsTab.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/memoryResultsTab.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/memorySnapshot32.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/memorySnapshot32.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/memorySnapshot32.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/memorySnapshot32.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/method.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/method.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/method.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/method.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/methodInherited.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/methodInherited.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/methodInherited.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/methodInherited.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/methodPackage.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/methodPackage.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/methodPackage.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/methodPackage.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/methodPrivate.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/methodPrivate.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/methodPrivate.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/methodPrivate.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/methodProtected.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/methodProtected.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/methodProtected.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/methodProtected.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/methodPublic.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/methodPublic.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/methodPublic.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/methodPublic.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/methodStPackage.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/methodStPackage.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/methodStPackage.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/methodStPackage.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/methodStPrivate.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/methodStPrivate.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/methodStPrivate.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/methodStPrivate.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/methodStProtected.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/methodStProtected.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/methodStProtected.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/methodStProtected.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/methodStPublic.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/methodStPublic.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/methodStPublic.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/methodStPublic.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/methods.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/methods.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/methods.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/methods.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/minimizePanel.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/minimizePanel.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/minimizePanel.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/minimizePanel.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/modifyProfiling.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/modifyProfiling.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/modifyProfiling.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/modifyProfiling.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/monitoring.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/monitoring.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/monitoring.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/monitoring.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/monitoring32.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/monitoring32.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/monitoring32.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/monitoring32.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/openSnapshot.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/openSnapshot.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/openSnapshot.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/openSnapshot.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/package.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/package.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/package.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/package.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/pause.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/pause.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/pause.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/pause.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/pie.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/pie.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/pie.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/pie.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/popupArrow.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/popupArrow.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/popupArrow.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/popupArrow.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/primitive.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/primitive.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/primitive.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/primitive.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/profile.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/profile.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/profile.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/profile.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/profile24.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/profile24.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/profile24.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/profile24.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/profileInactive.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/profileInactive.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/profileInactive.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/profileInactive.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/profileRunning.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/profileRunning.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/profileRunning.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/profileRunning.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/remove.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/remove.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/remove.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/remove.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/removeFolder.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/removeFolder.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/removeFolder.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/removeFolder.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/rename.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/rename.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/rename.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/rename.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/rerun.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/rerun.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/rerun.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/rerun.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/resetResults.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/resetResults.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/resetResults.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/resetResults.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/restorePanel.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/restorePanel.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/restorePanel.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/restorePanel.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/resume.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/resume.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/resume.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/resume.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/reverseNode.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/reverseNode.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/reverseNode.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/reverseNode.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/runButton.gif b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/runButton.gif
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/runButton.gif
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/runButton.gif
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/runGC.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/runGC.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/runGC.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/runGC.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/save.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/save.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/save.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/save.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/saveAs.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/saveAs.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/saveAs.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/saveAs.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/saveView.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/saveView.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/saveView.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/saveView.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/scaleToFit.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/scaleToFit.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/scaleToFit.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/scaleToFit.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/setFilter.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/setFilter.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/setFilter.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/setFilter.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/setFilterHighl.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/setFilterHighl.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/setFilterHighl.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/setFilterHighl.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/settings.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/settings.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/settings.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/settings.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/showGraphs.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/showGraphs.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/showGraphs.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/showGraphs.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/slaveDown.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/slaveDown.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/slaveDown.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/slaveDown.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/slaveUp.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/slaveUp.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/slaveUp.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/slaveUp.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObject.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObject.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObject.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObject.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObject32.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObject32.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObject32.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObject32.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObjectCPU.gif b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObjectCPU.gif
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObjectCPU.gif
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObjectCPU.gif
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObjectCPU32.gif b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObjectCPU32.gif
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObjectCPU32.gif
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObjectCPU32.gif
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObjectFragment.gif b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObjectFragment.gif
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObjectFragment.gif
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObjectFragment.gif
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObjectFragment32.gif b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObjectFragment32.gif
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObjectFragment32.gif
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObjectFragment32.gif
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObjectMemory.gif b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObjectMemory.gif
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObjectMemory.gif
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObjectMemory.gif
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObjectMemory32.gif b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObjectMemory32.gif
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObjectMemory32.gif
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/snapshotDataObjectMemory32.gif
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/sortAsc.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/sortAsc.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/sortAsc.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/sortAsc.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/sortDesc.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/sortDesc.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/sortDesc.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/sortDesc.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/sqlQuery.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/sqlQuery.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/sqlQuery.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/sqlQuery.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/sqlWindow.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/sqlWindow.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/sqlWindow.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/sqlWindow.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/stackTracesTab.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/stackTracesTab.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/stackTracesTab.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/stackTracesTab.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/start.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/start.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/start.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/start.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/startup32.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/startup32.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/startup32.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/startup32.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/stop.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/stop.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/stop.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/stop.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/subtreeTab.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/subtreeTab.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/subtreeTab.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/subtreeTab.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/takeSnapshot.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/takeSnapshot.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/takeSnapshot.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/takeSnapshot.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/takeSnapshotCPU32.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/takeSnapshotCPU32.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/takeSnapshotCPU32.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/takeSnapshotCPU32.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/takeSnapshotFragment32.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/takeSnapshotFragment32.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/takeSnapshotFragment32.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/takeSnapshotFragment32.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/takeSnapshotMem32.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/takeSnapshotMem32.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/takeSnapshotMem32.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/takeSnapshotMem32.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/telemetryOverviewWindow.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/telemetryOverviewWindow.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/telemetryOverviewWindow.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/telemetryOverviewWindow.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/telemetryView32.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/telemetryView32.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/telemetryView32.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/telemetryView32.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/telemetryWindow.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/telemetryWindow.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/telemetryWindow.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/telemetryWindow.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/thread.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/thread.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/thread.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/thread.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/threadsSnapshot.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/threadsSnapshot.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/threadsSnapshot.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/threadsSnapshot.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/threadsView32.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/threadsView32.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/threadsView32.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/threadsView32.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/threadsWindow.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/threadsWindow.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/threadsWindow.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/threadsWindow.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/up.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/up.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/up.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/up.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/updateNow.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/updateNow.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/updateNow.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/updateNow.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/variablePackage.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/variablePackage.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/variablePackage.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/variablePackage.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/variablePrivate.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/variablePrivate.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/variablePrivate.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/variablePrivate.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/variableProtected.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/variableProtected.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/variableProtected.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/variableProtected.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/variablePublic.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/variablePublic.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/variablePublic.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/variablePublic.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/variableStPackage.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/variableStPackage.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/variableStPackage.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/variableStPackage.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/variableStPrivate.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/variableStPrivate.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/variableStPrivate.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/variableStPrivate.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/variableStProtected.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/variableStProtected.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/variableStProtected.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/variableStProtected.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/variableStPublic.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/variableStPublic.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/variableStPublic.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/variableStPublic.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/variables.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/variables.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/variables.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/variables.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/zoom.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/zoom.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/zoom.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/zoom.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/zoomIn.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/zoomIn.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/zoomIn.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/zoomIn.png
diff --git a/profiler/src/org/netbeans/modules/profiler/impl/icons/zoomOut.png b/profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/zoomOut.png
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/impl/icons/zoomOut.png
rename to profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/zoomOut.png
diff --git a/profiler/src/org/netbeans/modules/profiler/mf-layer.xml b/profiler/profiler/src/org/netbeans/modules/profiler/mf-layer.xml
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/mf-layer.xml
rename to profiler/profiler/src/org/netbeans/modules/profiler/mf-layer.xml
diff --git a/profiler/src/org/netbeans/modules/profiler/ui/Bundle.properties b/profiler/profiler/src/org/netbeans/modules/profiler/ui/Bundle.properties
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/ui/Bundle.properties
rename to profiler/profiler/src/org/netbeans/modules/profiler/ui/Bundle.properties
diff --git a/profiler/src/org/netbeans/modules/profiler/ui/HprofDataObject.java b/profiler/profiler/src/org/netbeans/modules/profiler/ui/HprofDataObject.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/ui/HprofDataObject.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/ui/HprofDataObject.java
diff --git a/profiler/src/org/netbeans/modules/profiler/ui/NBHTMLLabel.java b/profiler/profiler/src/org/netbeans/modules/profiler/ui/NBHTMLLabel.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/ui/NBHTMLLabel.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/ui/NBHTMLLabel.java
diff --git a/profiler/src/org/netbeans/modules/profiler/ui/NBSwingWorker.java b/profiler/profiler/src/org/netbeans/modules/profiler/ui/NBSwingWorker.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/ui/NBSwingWorker.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/ui/NBSwingWorker.java
diff --git a/profiler/src/org/netbeans/modules/profiler/ui/NpsDataObject.java b/profiler/profiler/src/org/netbeans/modules/profiler/ui/NpsDataObject.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/ui/NpsDataObject.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/ui/NpsDataObject.java
diff --git a/profiler/src/org/netbeans/modules/profiler/ui/ProfilerProgressDisplayer.java b/profiler/profiler/src/org/netbeans/modules/profiler/ui/ProfilerProgressDisplayer.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/ui/ProfilerProgressDisplayer.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/ui/ProfilerProgressDisplayer.java
diff --git a/profiler/src/org/netbeans/modules/profiler/utils/Bundle.properties b/profiler/profiler/src/org/netbeans/modules/profiler/utils/Bundle.properties
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/utils/Bundle.properties
rename to profiler/profiler/src/org/netbeans/modules/profiler/utils/Bundle.properties
diff --git a/profiler/src/org/netbeans/modules/profiler/utils/IDEUtils.java b/profiler/profiler/src/org/netbeans/modules/profiler/utils/IDEUtils.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/utils/IDEUtils.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/utils/IDEUtils.java
diff --git a/profiler/src/org/netbeans/modules/profiler/utils/MainClassChooser.java b/profiler/profiler/src/org/netbeans/modules/profiler/utils/MainClassChooser.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/utils/MainClassChooser.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/utils/MainClassChooser.java
diff --git a/profiler/src/org/netbeans/modules/profiler/utils/MainClassWarning.java b/profiler/profiler/src/org/netbeans/modules/profiler/utils/MainClassWarning.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/utils/MainClassWarning.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/utils/MainClassWarning.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/ProfilerFeature.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerFeature.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/ProfilerFeature.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerFeature.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/ProfilerFeatures.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerFeatures.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/ProfilerFeatures.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerFeatures.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/ProfilerPlugin.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerPlugin.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/ProfilerPlugin.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerPlugin.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/ProfilerPlugins.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerPlugins.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/ProfilerPlugins.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerPlugins.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/ProfilerSession.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerSession.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/ProfilerSession.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerSession.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/ProfilerSessions.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerSessions.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/ProfilerSessions.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerSessions.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/ProfilerWindow.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerWindow.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/ProfilerWindow.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerWindow.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/SessionStorage.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/SessionStorage.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/SessionStorage.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/SessionStorage.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/SnapshotsWindow.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/SnapshotsWindow.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/SnapshotsWindow.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/SnapshotsWindow.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/features/FeatureMode.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/FeatureMode.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/features/FeatureMode.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/features/FeatureMode.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/features/FeatureUI.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/FeatureUI.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/features/FeatureUI.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/features/FeatureUI.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/features/LocksFeature.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/LocksFeature.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/features/LocksFeature.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/features/LocksFeature.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/features/LocksFeatureUI.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/LocksFeatureUI.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/features/LocksFeatureUI.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/features/LocksFeatureUI.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/features/MethodsFeature.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/MethodsFeature.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/features/MethodsFeature.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/features/MethodsFeature.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/features/MethodsFeatureModes.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/MethodsFeatureModes.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/features/MethodsFeatureModes.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/features/MethodsFeatureModes.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/features/MethodsFeatureUI.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/MethodsFeatureUI.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/features/MethodsFeatureUI.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/features/MethodsFeatureUI.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/features/MonitorFeature.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/MonitorFeature.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/features/MonitorFeature.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/features/MonitorFeature.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/features/MonitorFeatureUI.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/MonitorFeatureUI.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/features/MonitorFeatureUI.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/features/MonitorFeatureUI.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/features/ObjectsFeature.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/ObjectsFeature.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/features/ObjectsFeature.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/features/ObjectsFeature.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/features/ObjectsFeatureModes.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/ObjectsFeatureModes.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/features/ObjectsFeatureModes.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/features/ObjectsFeatureModes.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/features/ObjectsFeatureUI.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/ObjectsFeatureUI.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/features/ObjectsFeatureUI.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/features/ObjectsFeatureUI.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/features/SQLFeature.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/SQLFeature.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/features/SQLFeature.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/features/SQLFeature.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/features/SQLFeatureModes.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/SQLFeatureModes.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/features/SQLFeatureModes.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/features/SQLFeatureModes.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/features/SQLFeatureUI.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/SQLFeatureUI.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/features/SQLFeatureUI.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/features/SQLFeatureUI.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/features/ThreadsFeature.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/ThreadsFeature.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/features/ThreadsFeature.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/features/ThreadsFeature.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/features/ThreadsFeatureUI.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/ThreadsFeatureUI.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/features/ThreadsFeatureUI.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/features/ThreadsFeatureUI.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/impl/ClassMethodList.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/ClassMethodList.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/impl/ClassMethodList.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/ClassMethodList.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/impl/ClassMethodSelector.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/ClassMethodSelector.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/impl/ClassMethodSelector.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/ClassMethodSelector.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/impl/FeaturesView.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/FeaturesView.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/impl/FeaturesView.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/FeaturesView.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/impl/FilterSelector.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/FilterSelector.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/impl/FilterSelector.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/FilterSelector.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/impl/ProfilerStatus.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/ProfilerStatus.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/impl/ProfilerStatus.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/ProfilerStatus.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/impl/ProjectsSelector.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/ProjectsSelector.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/impl/ProjectsSelector.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/ProjectsSelector.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/impl/SnapshotsWindowHelper.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/SnapshotsWindowHelper.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/impl/SnapshotsWindowHelper.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/SnapshotsWindowHelper.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/impl/SnapshotsWindowUI.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/SnapshotsWindowUI.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/impl/SnapshotsWindowUI.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/SnapshotsWindowUI.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/impl/WeakProcessor.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/WeakProcessor.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/impl/WeakProcessor.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/WeakProcessor.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/impl/WelcomePanel.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/WelcomePanel.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/impl/WelcomePanel.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/WelcomePanel.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/ui/DropdownButton.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/ui/DropdownButton.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/ui/DropdownButton.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/ui/DropdownButton.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/ui/ProjectSelector.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/ui/ProjectSelector.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/ui/ProjectSelector.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/ui/ProjectSelector.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/ui/SettingsPanel.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/ui/SettingsPanel.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/ui/SettingsPanel.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/ui/SettingsPanel.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/ui/TitledMenuSeparator.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/ui/TitledMenuSeparator.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/ui/TitledMenuSeparator.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/ui/TitledMenuSeparator.java
diff --git a/profiler/src/org/netbeans/modules/profiler/v2/ui/ToggleButtonMenuItem.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/ui/ToggleButtonMenuItem.java
similarity index 100%
rename from profiler/src/org/netbeans/modules/profiler/v2/ui/ToggleButtonMenuItem.java
rename to profiler/profiler/src/org/netbeans/modules/profiler/v2/ui/ToggleButtonMenuItem.java
diff --git a/profiler/test/qa-functional/src/org/netbeans/test/profiler/ProfilerValidationTest.java b/profiler/profiler/test/qa-functional/src/org/netbeans/test/profiler/ProfilerValidationTest.java
similarity index 100%
rename from profiler/test/qa-functional/src/org/netbeans/test/profiler/ProfilerValidationTest.java
rename to profiler/profiler/test/qa-functional/src/org/netbeans/test/profiler/ProfilerValidationTest.java
diff --git a/profiler/test/unit/src/org/netbeans/modules/profiler/actions/SelfSamplerActionTest.java b/profiler/profiler/test/unit/src/org/netbeans/modules/profiler/actions/SelfSamplerActionTest.java
similarity index 100%
rename from profiler/test/unit/src/org/netbeans/modules/profiler/actions/SelfSamplerActionTest.java
rename to profiler/profiler/test/unit/src/org/netbeans/modules/profiler/actions/SelfSamplerActionTest.java


 

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


With regards,
Apache Git Services

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

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