diff --git a/.gitignore b/.gitignore
index 0d20b64..66dbf51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
+*.egg-info
 *.pyc
diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
new file mode 100644
index 0000000..6a71ffa
--- /dev/null
+++ b/docs/CHANGES.txt
@@ -0,0 +1,4 @@
+0.1
+------
+
+        - make wstools as an egg
diff --git a/ZPL b/docs/ZPL
similarity index 100%
rename from ZPL
rename to docs/ZPL
diff --git a/license.txt b/docs/license.txt
similarity index 100%
rename from license.txt
rename to docs/license.txt
diff --git a/src/wstools/test/__init__.py b/src/wstools/test/__init__.py
deleted file mode 100644
index d5a5350..0000000
--- a/src/wstools/test/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /usr/bin/env python
-"""wstools.WSDLTools.WSDLReader tests directory."""
-
-import utils
-
diff --git a/src/wstools/test/.cvsignore b/src/wstools/tests/.cvsignore
similarity index 100%
rename from src/wstools/test/.cvsignore
rename to src/wstools/tests/.cvsignore
diff --git a/src/wstools/test/README b/src/wstools/tests/README
similarity index 100%
rename from src/wstools/test/README
rename to src/wstools/tests/README
diff --git a/src/wstools/tests/__init__.py b/src/wstools/tests/__init__.py
new file mode 100644
index 0000000..ee3ecd2
--- /dev/null
+++ b/src/wstools/tests/__init__.py
@@ -0,0 +1 @@
+#! /usr/bin/env python
diff --git a/src/wstools/test/config.txt b/src/wstools/tests/config.txt
similarity index 100%
rename from src/wstools/test/config.txt
rename to src/wstools/tests/config.txt
diff --git a/src/wstools/test/schema.tar.gz b/src/wstools/tests/schema.tar.gz
similarity index 100%
rename from src/wstools/test/schema.tar.gz
rename to src/wstools/tests/schema.tar.gz
diff --git a/src/wstools/test/test_t1.py b/src/wstools/tests/test_t1.py
similarity index 100%
rename from src/wstools/test/test_t1.py
rename to src/wstools/tests/test_t1.py
diff --git a/src/wstools/test/test_wsdl.py b/src/wstools/tests/test_wsdl.py
similarity index 95%
rename from src/wstools/test/test_wsdl.py
rename to src/wstools/tests/test_wsdl.py
index 90b0c4d..52c419c 100644
--- a/src/wstools/test/test_wsdl.py
+++ b/src/wstools/tests/test_wsdl.py
@@ -7,9 +7,13 @@
 
 import sys, unittest
 import ConfigParser
-from ZSI.wstools.Utility import DOM
-from ZSI.wstools.WSDLTools import WSDLReader
-from ZSI.wstools.TimeoutSocket import TimeoutError
+import os
+from wstools.Utility import DOM
+from wstools.WSDLTools import WSDLReader
+from wstools.TimeoutSocket import TimeoutError
+
+from wstools import tests
+cwd = os.path.dirname(tests.__file__)
 
 class WSDLToolsTestCase(unittest.TestCase):
 
@@ -129,7 +133,8 @@ class WSDLToolsTestCase(unittest.TestCase):
 
 def setUpOptions(section):
     cp = ConfigParser.ConfigParser()
-    cp.read('config.txt')
+    import pdb;pdb.set_trace()  ## Breakpoint ##
+    cp.read(cwd+'/config.txt')
     if not cp.sections():
         print 'fatal error:  configuration file config.txt not present'
         sys.exit(0)
diff --git a/src/wstools/test/test_wstools.py b/src/wstools/tests/test_wstools.py
similarity index 100%
rename from src/wstools/test/test_wstools.py
rename to src/wstools/tests/test_wstools.py
diff --git a/src/wstools/test/test_wstools_net.py b/src/wstools/tests/test_wstools_net.py
similarity index 100%
rename from src/wstools/test/test_wstools_net.py
rename to src/wstools/tests/test_wstools_net.py
diff --git a/src/wstools/test/xmethods.tar.gz b/src/wstools/tests/xmethods.tar.gz
similarity index 100%
rename from src/wstools/test/xmethods.tar.gz
rename to src/wstools/tests/xmethods.tar.gz