diff --git a/README.txt b/README.txt
index e0293a4..5bd9578 100644
--- a/README.txt
+++ b/README.txt
@@ -1,23 +1,9 @@
-org.intrace description:
+== org.intrace Repository ==
 
--- Packages --
-agent        : Instrumenting Agent including IP Server
-output       : Instrumentation output handlers
-output.trace : Default (and currently only) handler
+=> org.intrace - Main InTrace Project
 
-client/cui/AgentLoader : Command line runtime Agent loading tool
-client/cui/TraceClient : Command line remote Agent config tool
-client/gui/            : GUI remote Agent config tool/network trace viewer
+=> org.intrace.agentbug - Project containing simple Agent used to illustrate bug report to Sun.
 
--- Functional Pieces --
-1. Instrumenting Agent
-2. Runtime Agent Loader
-3. CUI Remote Agent Config Tool
-4. GUI Remote Agent Config Tool/Network Trace Viewer
+=> org.intrace.agentloader - Project containing command line agent loader for loading an agent into a running process.
 
-Note to self - Git Commands:
-
-  git init
-  git remote add origin git@github.com:mchr3k/org.intrace.git
-  git push origin master
-      
\ No newline at end of file
+=> org.intrace.test - Dumping ground for toy classes used in manual testing.
\ No newline at end of file
diff --git a/org.intrace.agentbug/src/gb/testinstru/Agent.java b/org.intrace.agentbug/src/org/intrace/agentbug/agent/Agent.java
similarity index 84%
rename from org.intrace.agentbug/src/gb/testinstru/Agent.java
rename to org.intrace.agentbug/src/org/intrace/agentbug/agent/Agent.java
index 9fb19ec..f19a064 100644
--- a/org.intrace.agentbug/src/gb/testinstru/Agent.java
+++ b/org.intrace.agentbug/src/org/intrace/agentbug/agent/Agent.java
@@ -1,4 +1,4 @@
-package gb.testinstru;
+package org.intrace.agentbug.agent;
 
 import java.lang.instrument.Instrumentation;
 
diff --git a/org.intrace.agentbug/src/gb/test/TestApplication.java b/org.intrace.agentbug/src/org/intrace/agentbug/app/TestApplication.java
similarity index 81%
rename from org.intrace.agentbug/src/gb/test/TestApplication.java
rename to org.intrace.agentbug/src/org/intrace/agentbug/app/TestApplication.java
index a79a007..15e6d3e 100644
--- a/org.intrace.agentbug/src/gb/test/TestApplication.java
+++ b/org.intrace.agentbug/src/org/intrace/agentbug/app/TestApplication.java
@@ -1,4 +1,4 @@
-package gb.test;
+package org.intrace.agentbug.app;
 
 public class TestApplication
 {
diff --git a/org.intrace.test/src/mchr/DebugTest.java b/org.intrace.test/src/org/intrace/sandbox/DebugTest.java
similarity index 95%
rename from org.intrace.test/src/mchr/DebugTest.java
rename to org.intrace.test/src/org/intrace/sandbox/DebugTest.java
index 6311101..2daada1 100644
--- a/org.intrace.test/src/mchr/DebugTest.java
+++ b/org.intrace.test/src/org/intrace/sandbox/DebugTest.java
@@ -1,4 +1,4 @@
-package mchr;
+package org.intrace.sandbox;
 
 import java.util.List;
 import java.util.Map;
diff --git a/org.intrace.test/src/mchr/TraceExample.java b/org.intrace.test/src/org/intrace/sandbox/TraceExample.java
similarity index 91%
rename from org.intrace.test/src/mchr/TraceExample.java
rename to org.intrace.test/src/org/intrace/sandbox/TraceExample.java
index ed4f789..f8b392f 100644
--- a/org.intrace.test/src/mchr/TraceExample.java
+++ b/org.intrace.test/src/org/intrace/sandbox/TraceExample.java
@@ -1,4 +1,4 @@
-package mchr;
+package org.intrace.sandbox;
 
 import java.util.Arrays;
 
diff --git a/org.intrace/README.txt b/org.intrace/README.txt
index 30d74d2..0fe9cde 100644
--- a/org.intrace/README.txt
+++ b/org.intrace/README.txt
@@ -1 +1,26 @@
-test
\ No newline at end of file
+org.intrace description:
+
+-- Functional Pieces --
+1. Instrumenting Agent
+2. CUI Remote Agent Config Tool
+3. GUI Remote Agent Config Tool/Network Trace Viewer
+4. Common Output Classes
+5. Instrumentation Handlers
+
+
+-- Packages (org.intrace.) --
+agent               : Instrumenting Agent
+agent.server        : IP Server for controlling the Agent, Output and Instrumentation Handlers
+
+client.cui          : Command Line Agent Config Client
+client.gui          : GUI Agent Config Client + Live Trace/Callers viewer
+client.gui.helper   : Helper classes used by the GUI interface
+
+output              : Common Output Classes
+output.trace        : Trace Instrumentation Handler
+output.callers      : Callers Analysis Instrumentation Handler
+
+shared              : String constants used by both the Agent Server and the Client
+
+
+      
\ No newline at end of file