diff --git a/TestProject/src/mchr/LoveExample.java b/TestProject/src/mchr/LoveExample.java
deleted file mode 100644
index d50ed0c..0000000
--- a/TestProject/src/mchr/LoveExample.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package mchr;
-
-public class LoveExample
-{
-
-  /**
-   * @param args
-   */
-  public static void main(String[] args) throws Exception
-  {
-    while (true)
-    {
-      iLoveD();
-      Thread.sleep(1000);
-    }
-  }
-  
-  private static void iLoveD()  
-  {
-    String[] loveMessage = new String[]
-    {
-      "      _  _        ",
-      "     / \\/ \\       ",
-      "     \\ D /       ",
-      "      \\  /         ",
-      "       \\/         "
-    };
-    for (int ii = 0; ii < loveMessage.length; ii++)
-    {
-      loveDLine(loveMessage[ii]);
-    }    
-  }
-  private static void loveDLine(String loveD)
-  {
-    System.setProperty("key", loveD);
-  }
-
-}
diff --git a/gb.testinstru/.classpath b/org.intrace.agentbug/.classpath
similarity index 100%
rename from gb.testinstru/.classpath
rename to org.intrace.agentbug/.classpath
diff --git a/gb.testinstru/.project b/org.intrace.agentbug/.project
similarity index 86%
rename from gb.testinstru/.project
rename to org.intrace.agentbug/.project
index 21672b8..bda2e40 100644
--- a/gb.testinstru/.project
+++ b/org.intrace.agentbug/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>gb.testinstru</name>
+	<name>org.intrace.agentbug</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/gb.testinstru/.settings/org.eclipse.jdt.core.prefs b/org.intrace.agentbug/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from gb.testinstru/.settings/org.eclipse.jdt.core.prefs
rename to org.intrace.agentbug/.settings/org.eclipse.jdt.core.prefs
diff --git a/gb.testinstru/build.xml b/org.intrace.agentbug/build.xml
similarity index 100%
rename from gb.testinstru/build.xml
rename to org.intrace.agentbug/build.xml
diff --git a/gb.testinstru/conf/META-INF/MANIFEST.MF b/org.intrace.agentbug/conf/META-INF/MANIFEST.MF
similarity index 100%
rename from gb.testinstru/conf/META-INF/MANIFEST.MF
rename to org.intrace.agentbug/conf/META-INF/MANIFEST.MF
diff --git a/gb.testinstru/src/gb/test/TestApplication.java b/org.intrace.agentbug/src/gb/test/TestApplication.java
similarity index 100%
rename from gb.testinstru/src/gb/test/TestApplication.java
rename to org.intrace.agentbug/src/gb/test/TestApplication.java
diff --git a/gb.testinstru/src/gb/testinstru/Agent.java b/org.intrace.agentbug/src/gb/testinstru/Agent.java
similarity index 100%
rename from gb.testinstru/src/gb/testinstru/Agent.java
rename to org.intrace.agentbug/src/gb/testinstru/Agent.java
diff --git a/TestProject/.classpath b/org.intrace.test/.classpath
similarity index 100%
rename from TestProject/.classpath
rename to org.intrace.test/.classpath
diff --git a/TestProject/.project b/org.intrace.test/.project
similarity index 87%
rename from TestProject/.project
rename to org.intrace.test/.project
index 7f4b269..eb1e4f2 100644
--- a/TestProject/.project
+++ b/org.intrace.test/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>TestProject</name>
+	<name>org.intrace.test</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.intrace.test/genbin/mchr/TraceExample_gen.class b/org.intrace.test/genbin/mchr/TraceExample_gen.class
new file mode 100644
index 0000000..a954a0f
Binary files /dev/null and b/org.intrace.test/genbin/mchr/TraceExample_gen.class differ
diff --git a/TestProject/lib/traceagent.jar b/org.intrace.test/lib/traceagent.jar
similarity index 100%
rename from TestProject/lib/traceagent.jar
rename to org.intrace.test/lib/traceagent.jar
diff --git a/TestProject/src/mchr/DebugTest.java b/org.intrace.test/src/mchr/DebugTest.java
similarity index 100%
rename from TestProject/src/mchr/DebugTest.java
rename to org.intrace.test/src/mchr/DebugTest.java
diff --git a/TestProject/src/mchr/TraceExample.java b/org.intrace.test/src/mchr/TraceExample.java
similarity index 100%
rename from TestProject/src/mchr/TraceExample.java
rename to org.intrace.test/src/mchr/TraceExample.java