diff --git a/.gitignore b/.gitignore
index 068447c..79af0f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,6 @@
 */genbin/*
 asm3.2_*
 asm_patch*
-libsrc*
\ No newline at end of file
+libsrc*
+*private*
+*genfile*
\ No newline at end of file
diff --git a/InTrace-VisualVM-Container/InTrace-Agent/build.xml b/InTrace-VisualVM-Container/InTrace-Agent/build.xml
new file mode 100644
index 0000000..27416d5
--- /dev/null
+++ b/InTrace-VisualVM-Container/InTrace-Agent/build.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
+<!-- for some information on what you could do (e.g. targets to override). -->
+<!-- If you delete this file and reopen the project it will be recreated. -->
+<project name="org.intrace.agent" default="netbeans" basedir=".">
+    <description>Builds, tests, and runs the project org.intrace.agent.</description>
+    <import file="nbproject/build-impl.xml"/>
+</project>
diff --git a/InTrace-VisualVM-Container/InTrace-Agent/manifest.mf b/InTrace-VisualVM-Container/InTrace-Agent/manifest.mf
new file mode 100644
index 0000000..f4aa7dc
--- /dev/null
+++ b/InTrace-VisualVM-Container/InTrace-Agent/manifest.mf
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+OpenIDE-Module: org.intrace.agent
+OpenIDE-Module-Localizing-Bundle: org/intrace/agent/Bundle.properties
+OpenIDE-Module-Specification-Version: 1.0
+
diff --git a/InTrace-VisualVM-Container/InTrace-Agent/nbproject/build-impl.xml b/InTrace-VisualVM-Container/InTrace-Agent/nbproject/build-impl.xml
new file mode 100644
index 0000000..55215b7
--- /dev/null
+++ b/InTrace-VisualVM-Container/InTrace-Agent/nbproject/build-impl.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT  ***
+***         EDIT ../build.xml INSTEAD         ***
+-->
+<project name="org.intrace.agent-impl" basedir="..">
+    <fail message="Please build using Ant 1.7.1 or higher.">
+        <condition>
+            <not>
+                <antversion atleast="1.7.1"/>
+            </not>
+        </condition>
+    </fail>
+    <property file="nbproject/private/suite-private.properties"/>
+    <property file="nbproject/suite.properties"/>
+    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
+    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
+    <property file="${suite.dir}/nbproject/platform.properties"/>
+    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
+        <attribute name="name"/>
+        <attribute name="value"/>
+        <sequential>
+            <property name="@{name}" value="${@{value}}"/>
+        </sequential>
+    </macrodef>
+    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
+        <attribute name="property"/>
+        <attribute name="value"/>
+        <sequential>
+            <property name="@{property}" value="@{value}"/>
+        </sequential>
+    </macrodef>
+    <property file="${user.properties.file}"/>
+    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
+        <condition>
+            <not>
+                <contains string="${cluster.path.evaluated}" substring="platform"/>
+            </not>
+        </condition>
+    </fail>
+    <import file="${harness.dir}/build.xml"/>
+</project>
diff --git a/InTrace-VisualVM-Plugin/nbproject/platform.properties b/InTrace-VisualVM-Container/InTrace-Agent/nbproject/platform.properties
similarity index 100%
rename from InTrace-VisualVM-Plugin/nbproject/platform.properties
rename to InTrace-VisualVM-Container/InTrace-Agent/nbproject/platform.properties
diff --git a/InTrace-VisualVM-Container/InTrace-Agent/nbproject/project.properties b/InTrace-VisualVM-Container/InTrace-Agent/nbproject/project.properties
new file mode 100644
index 0000000..357190e
--- /dev/null
+++ b/InTrace-VisualVM-Container/InTrace-Agent/nbproject/project.properties
@@ -0,0 +1 @@
+is.autoload=true
diff --git a/InTrace-VisualVM-Container/InTrace-Agent/nbproject/project.xml b/InTrace-VisualVM-Container/InTrace-Agent/nbproject/project.xml
new file mode 100644
index 0000000..bfcf116
--- /dev/null
+++ b/InTrace-VisualVM-Container/InTrace-Agent/nbproject/project.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.apisupport.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
+            <code-name-base>org.intrace.agent</code-name-base>
+            <suite-component/>
+            <module-dependencies/>
+            <public-packages>
+                <package>org.intrace.agent</package>
+                <package>org.intrace.agent.server</package>
+                <package>org.intrace.internal.objectweb.asm</package>
+                <package>org.intrace.internal.objectweb.asm.commons</package>
+                <package>org.intrace.internal.objectweb.asm.signature</package>
+                <package>org.intrace.internal.objectweb.asm.tree</package>
+                <package>org.intrace.internal.objectweb.asm.tree.analysis</package>
+                <package>org.intrace.internal.objectweb.asm.util</package>
+                <package>org.intrace.internal.objectweb.asm.xml</package>
+                <package>org.intrace.output</package>
+                <package>org.intrace.output.callers</package>
+                <package>org.intrace.output.trace</package>
+                <package>org.intrace.shared</package>
+            </public-packages>
+            <class-path-extension>
+                <runtime-relative-path>ext/intrace-agent.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/intrace-agent.jar</binary-origin>
+            </class-path-extension>
+        </data>
+    </configuration>
+</project>
diff --git a/InTrace-VisualVM-Container/InTrace-Agent/nbproject/suite.properties b/InTrace-VisualVM-Container/InTrace-Agent/nbproject/suite.properties
new file mode 100644
index 0000000..364e160
--- /dev/null
+++ b/InTrace-VisualVM-Container/InTrace-Agent/nbproject/suite.properties
@@ -0,0 +1 @@
+suite.dir=${basedir}/..
diff --git a/InTrace-VisualVM-Container/InTrace-Agent/release/modules/ext/intrace-agent.jar b/InTrace-VisualVM-Container/InTrace-Agent/release/modules/ext/intrace-agent.jar
new file mode 100644
index 0000000..c088cdf
Binary files /dev/null and b/InTrace-VisualVM-Container/InTrace-Agent/release/modules/ext/intrace-agent.jar differ
diff --git a/InTrace-VisualVM-Container/InTrace-Agent/src/org/intrace/agent/Bundle.properties b/InTrace-VisualVM-Container/InTrace-Agent/src/org/intrace/agent/Bundle.properties
new file mode 100644
index 0000000..09dd22d
--- /dev/null
+++ b/InTrace-VisualVM-Container/InTrace-Agent/src/org/intrace/agent/Bundle.properties
@@ -0,0 +1 @@
+OpenIDE-Module-Name=InTrace: Agent (Required)
diff --git a/InTrace-VisualVM-Container/InTrace-Client-Linux/build.xml b/InTrace-VisualVM-Container/InTrace-Client-Linux/build.xml
new file mode 100644
index 0000000..b2786cd
--- /dev/null
+++ b/InTrace-VisualVM-Container/InTrace-Client-Linux/build.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
+<!-- for some information on what you could do (e.g. targets to override). -->
+<!-- If you delete this file and reopen the project it will be recreated. -->
+<project name="org.intrace.client.gui" default="netbeans" basedir=".">
+    <description>Builds, tests, and runs the project org.intrace.client.gui.</description>
+    <import file="nbproject/build-impl.xml"/>
+</project>
diff --git a/InTrace-VisualVM-Container/InTrace-Client-Linux/manifest.mf b/InTrace-VisualVM-Container/InTrace-Client-Linux/manifest.mf
new file mode 100644
index 0000000..aef7ef9
--- /dev/null
+++ b/InTrace-VisualVM-Container/InTrace-Client-Linux/manifest.mf
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+OpenIDE-Module: org.intrace.client.gui
+OpenIDE-Module-Localizing-Bundle: org/intrace/client/gui/Bundle.properties
+OpenIDE-Module-Specification-Version: 1.0
+
diff --git a/InTrace-VisualVM-Container/InTrace-Client-Linux/nbproject/build-impl.xml b/InTrace-VisualVM-Container/InTrace-Client-Linux/nbproject/build-impl.xml
new file mode 100644
index 0000000..745951b
--- /dev/null
+++ b/InTrace-VisualVM-Container/InTrace-Client-Linux/nbproject/build-impl.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT  ***
+***         EDIT ../build.xml INSTEAD         ***
+-->
+<project name="org.intrace.client.gui-impl" basedir="..">
+    <fail message="Please build using Ant 1.7.1 or higher.">
+        <condition>
+            <not>
+                <antversion atleast="1.7.1"/>
+            </not>
+        </condition>
+    </fail>
+    <property file="nbproject/private/suite-private.properties"/>
+    <property file="nbproject/suite.properties"/>
+    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
+    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
+    <property file="${suite.dir}/nbproject/platform.properties"/>
+    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
+        <attribute name="name"/>
+        <attribute name="value"/>
+        <sequential>
+            <property name="@{name}" value="${@{value}}"/>
+        </sequential>
+    </macrodef>
+    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
+        <attribute name="property"/>
+        <attribute name="value"/>
+        <sequential>
+            <property name="@{property}" value="@{value}"/>
+        </sequential>
+    </macrodef>
+    <property file="${user.properties.file}"/>
+    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
+        <condition>
+            <not>
+                <contains string="${cluster.path.evaluated}" substring="platform"/>
+            </not>
+        </condition>
+    </fail>
+    <import file="${harness.dir}/build.xml"/>
+</project>
diff --git a/InTrace-VisualVM-Container/InTrace-Client-Linux/nbproject/platform.properties b/InTrace-VisualVM-Container/InTrace-Client-Linux/nbproject/platform.properties
new file mode 100644
index 0000000..6221694
--- /dev/null
+++ b/InTrace-VisualVM-Container/InTrace-Client-Linux/nbproject/platform.properties
@@ -0,0 +1,5 @@
+cluster.path=\
+    ${nbplatform.active.dir}/platform:\
+    ${nbplatform.active.dir}/profiler:\
+    ${nbplatform.active.dir}/visualvm
+nbplatform.active=VisualVM_1.2.2
diff --git a/InTrace-VisualVM-Container/InTrace-Client-Linux/nbproject/project.properties b/InTrace-VisualVM-Container/InTrace-Client-Linux/nbproject/project.properties
new file mode 100644
index 0000000..357190e
--- /dev/null
+++ b/InTrace-VisualVM-Container/InTrace-Client-Linux/nbproject/project.properties
@@ -0,0 +1 @@
+is.autoload=true
diff --git a/InTrace-VisualVM-Container/InTrace-Client-Linux/nbproject/project.xml b/InTrace-VisualVM-Container/InTrace-Client-Linux/nbproject/project.xml
new file mode 100644
index 0000000..cf24c27
--- /dev/null
+++ b/InTrace-VisualVM-Container/InTrace-Client-Linux/nbproject/project.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.apisupport.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
+            <code-name-base>org.intrace.client.gui</code-name-base>
+            <suite-component/>
+            <module-dependencies/>
+            <public-packages>
+                <package>net.miginfocom.layout</package>
+                <package>net.miginfocom.swt</package>
+                <package>org.eclipse.swt</package>
+                <package>org.eclipse.swt.accessibility</package>
+                <package>org.eclipse.swt.awt</package>
+                <package>org.eclipse.swt.browser</package>
+                <package>org.eclipse.swt.custom</package>
+                <package>org.eclipse.swt.dnd</package>
+                <package>org.eclipse.swt.events</package>
+                <package>org.eclipse.swt.graphics</package>
+                <package>org.eclipse.swt.internal</package>
+                <package>org.eclipse.swt.internal.accessibility.gtk</package>
+                <package>org.eclipse.swt.internal.cairo</package>
+                <package>org.eclipse.swt.internal.cde</package>
+                <package>org.eclipse.swt.internal.gnome</package>
+                <package>org.eclipse.swt.internal.gtk</package>
+                <package>org.eclipse.swt.internal.image</package>
+                <package>org.eclipse.swt.internal.mozilla</package>
+                <package>org.eclipse.swt.internal.mozilla.init</package>
+                <package>org.eclipse.swt.internal.opengl.glx</package>
+                <package>org.eclipse.swt.internal.theme</package>
+                <package>org.eclipse.swt.layout</package>
+                <package>org.eclipse.swt.opengl</package>
+                <package>org.eclipse.swt.printing</package>
+                <package>org.eclipse.swt.program</package>
+                <package>org.eclipse.swt.widgets</package>
+                <package>org.intrace.client.gui</package>
+                <package>org.intrace.client.gui.helper</package>
+                <package>org.intrace.shared</package>
+            </public-packages>
+            <class-path-extension>
+                <runtime-relative-path>ext/intrace-client-gui-linux.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/intrace-client-gui-linux.jar</binary-origin>
+            </class-path-extension>
+        </data>
+    </configuration>
+</project>
diff --git a/InTrace-VisualVM-Container/InTrace-Client-Linux/nbproject/suite.properties b/InTrace-VisualVM-Container/InTrace-Client-Linux/nbproject/suite.properties
new file mode 100644
index 0000000..364e160
--- /dev/null
+++ b/InTrace-VisualVM-Container/InTrace-Client-Linux/nbproject/suite.properties
@@ -0,0 +1 @@
+suite.dir=${basedir}/..
diff --git a/InTrace-VisualVM-Container/InTrace-Client-Linux/release/modules/ext/intrace-client-gui-linux.jar b/InTrace-VisualVM-Container/InTrace-Client-Linux/release/modules/ext/intrace-client-gui-linux.jar
new file mode 100644
index 0000000..7e6fb8c
Binary files /dev/null and b/InTrace-VisualVM-Container/InTrace-Client-Linux/release/modules/ext/intrace-client-gui-linux.jar differ
diff --git a/InTrace-VisualVM-Container/InTrace-Client-Linux/src/org/intrace/client/gui/Bundle.properties b/InTrace-VisualVM-Container/InTrace-Client-Linux/src/org/intrace/client/gui/Bundle.properties
new file mode 100644
index 0000000..fd353e7
--- /dev/null
+++ b/InTrace-VisualVM-Container/InTrace-Client-Linux/src/org/intrace/client/gui/Bundle.properties
@@ -0,0 +1 @@
+OpenIDE-Module-Name=InTrace: Client (Linux)
diff --git a/InTrace-VisualVM-Container/InTrace-Client-Windows/build.xml b/InTrace-VisualVM-Container/InTrace-Client-Windows/build.xml
new file mode 100644
index 0000000..49ef628
--- /dev/null
+++ b/InTrace-VisualVM-Container/InTrace-Client-Windows/build.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
+<!-- for some information on what you could do (e.g. targets to override). -->
+<!-- If you delete this file and reopen the project it will be recreated. -->
+<project name="org.intrace.client" default="netbeans" basedir=".">
+    <description>Builds, tests, and runs the project org.intrace.client.</description>
+    <import file="nbproject/build-impl.xml"/>
+</project>
diff --git a/InTrace-VisualVM-Container/InTrace-Client-Windows/manifest.mf b/InTrace-VisualVM-Container/InTrace-Client-Windows/manifest.mf
new file mode 100644
index 0000000..2727df5
--- /dev/null
+++ b/InTrace-VisualVM-Container/InTrace-Client-Windows/manifest.mf
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+OpenIDE-Module: org.intrace.client
+OpenIDE-Module-Localizing-Bundle: org/intrace/client/Bundle.properties
+OpenIDE-Module-Specification-Version: 1.0
+
diff --git a/InTrace-VisualVM-Container/InTrace-Client-Windows/nbproject/build-impl.xml b/InTrace-VisualVM-Container/InTrace-Client-Windows/nbproject/build-impl.xml
new file mode 100644
index 0000000..8a3ad04
--- /dev/null
+++ b/InTrace-VisualVM-Container/InTrace-Client-Windows/nbproject/build-impl.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT  ***
+***         EDIT ../build.xml INSTEAD         ***
+-->
+<project name="org.intrace.client-impl" basedir="..">
+    <fail message="Please build using Ant 1.7.1 or higher.">
+        <condition>
+            <not>
+                <antversion atleast="1.7.1"/>
+            </not>
+        </condition>
+    </fail>
+    <property file="nbproject/private/suite-private.properties"/>
+    <property file="nbproject/suite.properties"/>
+    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
+    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
+    <property file="${suite.dir}/nbproject/platform.properties"/>
+    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
+        <attribute name="name"/>
+        <attribute name="value"/>
+        <sequential>
+            <property name="@{name}" value="${@{value}}"/>
+        </sequential>
+    </macrodef>
+    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
+        <attribute name="property"/>
+        <attribute name="value"/>
+        <sequential>
+            <property name="@{property}" value="@{value}"/>
+        </sequential>
+    </macrodef>
+    <property file="${user.properties.file}"/>
+    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
+        <condition>
+            <not>
+                <contains string="${cluster.path.evaluated}" substring="platform"/>
+            </not>
+        </condition>
+    </fail>
+    <import file="${harness.dir}/build.xml"/>
+</project>
diff --git a/InTrace-VisualVM-Container/InTrace-Client-Windows/nbproject/platform.properties b/InTrace-VisualVM-Container/InTrace-Client-Windows/nbproject/platform.properties
new file mode 100644
index 0000000..6221694
--- /dev/null
+++ b/InTrace-VisualVM-Container/InTrace-Client-Windows/nbproject/platform.properties
@@ -0,0 +1,5 @@
+cluster.path=\
+    ${nbplatform.active.dir}/platform:\
+    ${nbplatform.active.dir}/profiler:\
+    ${nbplatform.active.dir}/visualvm
+nbplatform.active=VisualVM_1.2.2
diff --git a/InTrace-VisualVM-Container/InTrace-Client-Windows/nbproject/project.properties b/InTrace-VisualVM-Container/InTrace-Client-Windows/nbproject/project.properties
new file mode 100644
index 0000000..357190e
--- /dev/null
+++ b/InTrace-VisualVM-Container/InTrace-Client-Windows/nbproject/project.properties
@@ -0,0 +1 @@
+is.autoload=true
diff --git a/InTrace-VisualVM-Container/InTrace-Client-Windows/nbproject/project.xml b/InTrace-VisualVM-Container/InTrace-Client-Windows/nbproject/project.xml
new file mode 100644
index 0000000..8f351f6
--- /dev/null
+++ b/InTrace-VisualVM-Container/InTrace-Client-Windows/nbproject/project.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.apisupport.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
+            <code-name-base>org.intrace.client</code-name-base>
+            <suite-component/>
+            <module-dependencies/>
+            <public-packages>
+                <package>net.miginfocom.layout</package>
+                <package>net.miginfocom.swt</package>
+                <package>org.eclipse.swt</package>
+                <package>org.eclipse.swt.accessibility</package>
+                <package>org.eclipse.swt.awt</package>
+                <package>org.eclipse.swt.browser</package>
+                <package>org.eclipse.swt.custom</package>
+                <package>org.eclipse.swt.dnd</package>
+                <package>org.eclipse.swt.events</package>
+                <package>org.eclipse.swt.graphics</package>
+                <package>org.eclipse.swt.internal</package>
+                <package>org.eclipse.swt.internal.gdip</package>
+                <package>org.eclipse.swt.internal.image</package>
+                <package>org.eclipse.swt.internal.mozilla</package>
+                <package>org.eclipse.swt.internal.mozilla.init</package>
+                <package>org.eclipse.swt.internal.ole.win32</package>
+                <package>org.eclipse.swt.internal.opengl.win32</package>
+                <package>org.eclipse.swt.internal.theme</package>
+                <package>org.eclipse.swt.internal.win32</package>
+                <package>org.eclipse.swt.layout</package>
+                <package>org.eclipse.swt.ole.win32</package>
+                <package>org.eclipse.swt.opengl</package>
+                <package>org.eclipse.swt.printing</package>
+                <package>org.eclipse.swt.program</package>
+                <package>org.eclipse.swt.widgets</package>
+                <package>org.intrace.client.gui</package>
+                <package>org.intrace.client.gui.helper</package>
+                <package>org.intrace.shared</package>
+            </public-packages>
+            <class-path-extension>
+                <runtime-relative-path>ext/intrace-client-gui-win.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/intrace-client-gui-win.jar</binary-origin>
+            </class-path-extension>
+        </data>
+    </configuration>
+</project>
diff --git a/InTrace-VisualVM-Container/InTrace-Client-Windows/nbproject/suite.properties b/InTrace-VisualVM-Container/InTrace-Client-Windows/nbproject/suite.properties
new file mode 100644
index 0000000..364e160
--- /dev/null
+++ b/InTrace-VisualVM-Container/InTrace-Client-Windows/nbproject/suite.properties
@@ -0,0 +1 @@
+suite.dir=${basedir}/..
diff --git a/InTrace-VisualVM-Container/InTrace-Client-Windows/release/modules/ext/intrace-client-gui-win.jar b/InTrace-VisualVM-Container/InTrace-Client-Windows/release/modules/ext/intrace-client-gui-win.jar
new file mode 100644
index 0000000..1abfc30
Binary files /dev/null and b/InTrace-VisualVM-Container/InTrace-Client-Windows/release/modules/ext/intrace-client-gui-win.jar differ
diff --git a/InTrace-VisualVM-Container/InTrace-Client-Windows/src/org/intrace/client/Bundle.properties b/InTrace-VisualVM-Container/InTrace-Client-Windows/src/org/intrace/client/Bundle.properties
new file mode 100644
index 0000000..7dd3140
--- /dev/null
+++ b/InTrace-VisualVM-Container/InTrace-Client-Windows/src/org/intrace/client/Bundle.properties
@@ -0,0 +1 @@
+OpenIDE-Module-Name=InTrace: Client (Windows)
diff --git a/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/build.xml b/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/build.xml
new file mode 100644
index 0000000..c4f7265
--- /dev/null
+++ b/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/build.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
+<!-- for some information on what you could do (e.g. targets to override). -->
+<!-- If you delete this file and reopen the project it will be recreated. -->
+<project name="org.intrace.visualvm" default="netbeans" basedir=".">
+    <description>Builds, tests, and runs the project org.intrace.visualvm.</description>
+    <import file="nbproject/build-impl.xml"/>
+</project>
diff --git a/InTrace-VisualVM-Plugin/manifest.mf b/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/manifest.mf
similarity index 100%
rename from InTrace-VisualVM-Plugin/manifest.mf
rename to InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/manifest.mf
diff --git a/InTrace-VisualVM-Plugin/nbproject/build-impl.xml b/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/nbproject/build-impl.xml
similarity index 81%
rename from InTrace-VisualVM-Plugin/nbproject/build-impl.xml
rename to InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/nbproject/build-impl.xml
index 65a9e86..acba896 100644
--- a/InTrace-VisualVM-Plugin/nbproject/build-impl.xml
+++ b/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/nbproject/build-impl.xml
@@ -11,8 +11,11 @@
             </not>
         </condition>
     </fail>
-    <property file="nbproject/private/platform-private.properties"/>
-    <property file="nbproject/platform.properties"/>
+    <property file="nbproject/private/suite-private.properties"/>
+    <property file="nbproject/suite.properties"/>
+    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
+    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
+    <property file="${suite.dir}/nbproject/platform.properties"/>
     <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
         <attribute name="name"/>
         <attribute name="value"/>
diff --git a/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/nbproject/platform.properties b/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/nbproject/platform.properties
new file mode 100644
index 0000000..6221694
--- /dev/null
+++ b/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/nbproject/platform.properties
@@ -0,0 +1,5 @@
+cluster.path=\
+    ${nbplatform.active.dir}/platform:\
+    ${nbplatform.active.dir}/profiler:\
+    ${nbplatform.active.dir}/visualvm
+nbplatform.active=VisualVM_1.2.2
diff --git a/InTrace-VisualVM-Plugin/nbproject/project.properties b/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/nbproject/project.properties
similarity index 100%
rename from InTrace-VisualVM-Plugin/nbproject/project.properties
rename to InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/nbproject/project.properties
diff --git a/InTrace-VisualVM-Plugin/nbproject/project.xml b/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/nbproject/project.xml
similarity index 96%
rename from InTrace-VisualVM-Plugin/nbproject/project.xml
rename to InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/nbproject/project.xml
index acd7dd1..e564fd6 100644
--- a/InTrace-VisualVM-Plugin/nbproject/project.xml
+++ b/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/nbproject/project.xml
@@ -4,7 +4,7 @@
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
             <code-name-base>org.intrace.visualvm</code-name-base>
-            <standalone/>
+            <suite-component/>
             <module-dependencies>
                 <dependency>
                     <code-name-base>com.sun.tools.visualvm.application</code-name-base>
diff --git a/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/nbproject/suite.properties b/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/nbproject/suite.properties
new file mode 100644
index 0000000..364e160
--- /dev/null
+++ b/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/nbproject/suite.properties
@@ -0,0 +1 @@
+suite.dir=${basedir}/..
diff --git a/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/release/modules/ext/intrace-agent.jar b/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/release/modules/ext/intrace-agent.jar
new file mode 100644
index 0000000..c088cdf
Binary files /dev/null and b/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/release/modules/ext/intrace-agent.jar differ
diff --git a/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/Bundle.properties b/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/Bundle.properties
new file mode 100644
index 0000000..813e788
--- /dev/null
+++ b/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/Bundle.properties
@@ -0,0 +1 @@
+OpenIDE-Module-Name=InTrace: VisualVM Plugin
diff --git a/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/Installer.java b/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/Installer.java
similarity index 100%
rename from InTrace-VisualVM-Plugin/src/org/intrace/visualvm/Installer.java
rename to InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/Installer.java
diff --git a/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/Locator.java b/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/Locator.java
similarity index 100%
rename from InTrace-VisualVM-Plugin/src/org/intrace/visualvm/Locator.java
rename to InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/Locator.java
diff --git a/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/actions/Bundle.properties b/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/actions/Bundle.properties
similarity index 100%
rename from InTrace-VisualVM-Plugin/src/org/intrace/visualvm/actions/Bundle.properties
rename to InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/actions/Bundle.properties
diff --git a/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/actions/InTraceApplicationAction.java b/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/actions/InTraceApplicationAction.java
similarity index 100%
rename from InTrace-VisualVM-Plugin/src/org/intrace/visualvm/actions/InTraceApplicationAction.java
rename to InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/actions/InTraceApplicationAction.java
diff --git a/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/impl/InTraceDataSource.java b/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/impl/InTraceDataSource.java
similarity index 100%
rename from InTrace-VisualVM-Plugin/src/org/intrace/visualvm/impl/InTraceDataSource.java
rename to InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/impl/InTraceDataSource.java
diff --git a/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/impl/InTraceLoader.java b/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/impl/InTraceLoader.java
similarity index 100%
rename from InTrace-VisualVM-Plugin/src/org/intrace/visualvm/impl/InTraceLoader.java
rename to InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/impl/InTraceLoader.java
diff --git a/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/layer.xml b/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/layer.xml
similarity index 100%
rename from InTrace-VisualVM-Plugin/src/org/intrace/visualvm/layer.xml
rename to InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/layer.xml
diff --git a/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/view/InTraceView.java b/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/view/InTraceView.java
similarity index 100%
rename from InTrace-VisualVM-Plugin/src/org/intrace/visualvm/view/InTraceView.java
rename to InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/view/InTraceView.java
diff --git a/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/view/InTraceViewProvider.java b/InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/view/InTraceViewProvider.java
similarity index 100%
rename from InTrace-VisualVM-Plugin/src/org/intrace/visualvm/view/InTraceViewProvider.java
rename to InTrace-VisualVM-Container/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/view/InTraceViewProvider.java
diff --git a/InTrace-VisualVM-Container/build.xml b/InTrace-VisualVM-Container/build.xml
new file mode 100644
index 0000000..c5b0402
--- /dev/null
+++ b/InTrace-VisualVM-Container/build.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
+<!-- for some information on what you could do (e.g. targets to override). -->
+<!-- If you delete this file and reopen the project it will be recreated. -->
+<project name="InTrace-VisualVM-Container" basedir=".">
+    <description>Builds the module suite InTrace-VisualVM-Container.</description>
+    <import file="nbproject/build-impl.xml"/>
+</project>
diff --git a/InTrace-VisualVM-Container/nbproject/build-impl.xml b/InTrace-VisualVM-Container/nbproject/build-impl.xml
new file mode 100644
index 0000000..0218eff
--- /dev/null
+++ b/InTrace-VisualVM-Container/nbproject/build-impl.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT  ***
+***         EDIT ../build.xml INSTEAD         ***
+-->
+<project name="InTrace-VisualVM-Container-impl" basedir=".." xmlns:sproject="http://www.netbeans.org/ns/nb-module-suite-project/1">
+    <fail message="Please build using Ant 1.7.1 or higher.">
+        <condition>
+            <not>
+                <antversion atleast="1.7.1"/>
+            </not>
+        </condition>
+    </fail>
+    <property file="nbproject/private/platform-private.properties"/>
+    <property file="nbproject/platform.properties"/>
+    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-suite-project/1">
+        <attribute name="name"/>
+        <attribute name="value"/>
+        <sequential>
+            <property name="@{name}" value="${@{value}}"/>
+        </sequential>
+    </macrodef>
+    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-suite-project/1">
+        <attribute name="property"/>
+        <attribute name="value"/>
+        <sequential>
+            <property name="@{property}" value="@{value}"/>
+        </sequential>
+    </macrodef>
+    <property file="${user.properties.file}"/>
+    <sproject:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir"/>
+    <sproject:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir"/>
+    <sproject:evalprops property="cluster.path.evaluated" value="${cluster.path}"/>
+    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
+        <condition>
+            <not>
+                <contains string="${cluster.path.evaluated}" substring="platform"/>
+            </not>
+        </condition>
+    </fail>
+    <fail message="Cannot find NetBeans build harness. ${line.separator}Check that nbplatform.${nbplatform.active}.netbeans.dest.dir and nbplatform.${nbplatform.active}.harness.dir are defined. ${line.separator}On a developer machine these are normally defined in ${user.properties.file}=${netbeans.user}/build.properties ${line.separator}but for automated builds you should pass these properties to Ant explicitly.">
+        <condition>
+            <not>
+                <available type="dir" file="${harness.dir}"/>
+            </not>
+        </condition>
+    </fail>
+    <import file="${harness.dir}/suite.xml"/>
+</project>
diff --git a/InTrace-VisualVM-Container/nbproject/platform.properties b/InTrace-VisualVM-Container/nbproject/platform.properties
new file mode 100644
index 0000000..6221694
--- /dev/null
+++ b/InTrace-VisualVM-Container/nbproject/platform.properties
@@ -0,0 +1,5 @@
+cluster.path=\
+    ${nbplatform.active.dir}/platform:\
+    ${nbplatform.active.dir}/profiler:\
+    ${nbplatform.active.dir}/visualvm
+nbplatform.active=VisualVM_1.2.2
diff --git a/InTrace-VisualVM-Container/nbproject/project.properties b/InTrace-VisualVM-Container/nbproject/project.properties
new file mode 100644
index 0000000..c07dc4c
--- /dev/null
+++ b/InTrace-VisualVM-Container/nbproject/project.properties
@@ -0,0 +1,9 @@
+modules=\
+    ${project.org.intrace.visualvm}:\
+    ${project.org.intrace.client}:\
+    ${project.org.intrace.client.gui}:\
+    ${project.org.intrace.agent}
+project.org.intrace.agent=InTrace-Agent
+project.org.intrace.client=InTrace-Client-Windows
+project.org.intrace.client.gui=InTrace-Client-Linux
+project.org.intrace.visualvm=InTrace-VisualVM-Plugin
diff --git a/InTrace-VisualVM-Container/nbproject/project.xml b/InTrace-VisualVM-Container/nbproject/project.xml
new file mode 100644
index 0000000..089fb51
--- /dev/null
+++ b/InTrace-VisualVM-Container/nbproject/project.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.apisupport.project.suite</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/nb-module-suite-project/1">
+            <name>InTrace-VisualVM-Container</name>
+        </data>
+    </configuration>
+</project>
diff --git a/InTrace-VisualVM-Plugin/build.xml b/InTrace-VisualVM-Plugin/build.xml
deleted file mode 100644
index 7517c1d..0000000
--- a/InTrace-VisualVM-Plugin/build.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
-<!-- for some information on what you could do (e.g. targets to override). -->
-<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.intrace.visualvm" default="netbeans" basedir=".">
-    <description>Builds, tests, and runs the project org.intrace.visualvm.</description>
-    <import file="nbproject/build-impl.xml"/>
-
-    <target name="init" depends="basic-init,files-init,build-init,-javac-init,-post-init"/>
-    <target name="-post-init" depends="build-libs"/>
-
-    <target name="build-libs">
-        <ant dir="${basedir}/../org.intrace/" target="jar"/>
-        <copy todir="${basedir}/release/modules/ext">
-            <fileset dir="${basedir}/../org.intrace/build/jars">
-              <include name="intrace-agent.jar"/>
-              <include name="intrace-client-gui-linux.jar"/>
-              <include name="intrace-client-gui-win.jar"/>
-            </fileset>
-        </copy>
-        <echo message="${cp.extra}" />
-    </target>
-</project>
diff --git a/InTrace-VisualVM-Plugin/nbproject/genfiles.properties b/InTrace-VisualVM-Plugin/nbproject/genfiles.properties
deleted file mode 100644
index 470de0b..0000000
--- a/InTrace-VisualVM-Plugin/nbproject/genfiles.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=bb7a3013
-build.xml.script.CRC32=6b6e80f6
-build.xml.stylesheet.CRC32=a56c6a5b@1.42.1
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=c6db8612
-nbproject/build-impl.xml.script.CRC32=7cbc4f92
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.1
diff --git a/InTrace-VisualVM-Plugin/nbproject/private/platform-private.properties b/InTrace-VisualVM-Plugin/nbproject/private/platform-private.properties
deleted file mode 100644
index 71be29d..0000000
--- a/InTrace-VisualVM-Plugin/nbproject/private/platform-private.properties
+++ /dev/null
@@ -1 +0,0 @@
-user.properties.file=C:\\Documents and Settings\\mchr\\.netbeans\\6.9\\build.properties
diff --git a/InTrace-VisualVM-Plugin/nbproject/private/private.xml b/InTrace-VisualVM-Plugin/nbproject/private/private.xml
deleted file mode 100644
index cc2c0e5..0000000
--- a/InTrace-VisualVM-Plugin/nbproject/private/private.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
-    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-</project-private>
diff --git a/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/Bundle.properties b/InTrace-VisualVM-Plugin/src/org/intrace/visualvm/Bundle.properties
deleted file mode 100644
index e69de29..0000000