13 files changed, 33 insertions, 55 deletions
diff --git a/testapi/testapi-client/__init__.py b/testapi/testapi-client/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/testapi/testapi-client/__init__.py
diff --git a/testapi/testapi-client/setup.cfg b/testapi/testapi-client/setup.cfg
index 672c9ae..72a5a57 100644
--- a/testapi/testapi-client/setup.cfg
+++ b/testapi/testapi-client/setup.cfg
@@ -14,43 +14,18 @@ console_scripts =
     testapi = testapiclient.main:main
 
 testapi =
-    auth = testapiclient.auth:Auth
-    pod create = testapiclient.pods:PodCreate
-    pod get = testapiclient.pods:PodGet
-    pod delete = testapiclient.pods:PodDelete
-    pod getone = testapiclient.pods:PodGetOne
+    auth = testapiclient.cli.auth:Auth
+    pod create = testapiclient.cli.pods:PodCreate
+    pod get = testapiclient.cli.pods:PodGet
+    pod delete = testapiclient.cli.pods:PodDelete
+    pod getone = testapiclient.cli.pods:PodGetOne
+
+    project create = testapiclient.cli.projects:ProjectCreate
+    project get = testapiclient.cli.projects:ProjectGet
+    project getone = testapiclient.cli.projects:ProjectGetOne
+    project delete = testapiclient.cli.projects:ProjectDelete
+    project put = testapiclient.cli.projects:ProjectPut
 
-    project create = testapiclient.projects:ProjectCreate
-    project get = testapiclient.projects:ProjectGet
-    project getone = testapiclient.projects:ProjectGetOne
-    project delete = testapiclient.projects:ProjectDelete
-    project put = testapiclient.projects:ProjectPut
-
-    testcase create = testapiclient.testcase:TestCaseCreate
-    testcase get = testapiclient.testcase:TestCaseGet
-    testcase delete = testapiclient.testcase:TestCaseDelete
-    testcase put = testapiclient.testcase:TestCasePut
-
-    scenario create = testapiclient.scenario:ScenarioCreate
-    scenario get = testapiclient.scenario:ScenarioGet
-    scenario delete = testapiclient.scenario:ScenarioDelete
-    scenario put = testapiclient.scenario:ScenarioPut
-
-    scenario addscore = testapiclient.scenario:ScenarioAddScore
-
-    scenario addyi = testapiclient.scenario:ScenarioAddTI
-
-    scenario addcustom = testapiclient.scenario:ScenarioAddCustom
-    scenario updatecustom = testapiclient.scenario:ScenarioUpdateCustom
-    scenario deletecustom = testapiclient.scenario:ScenarioDeleteCustom
-
-    scenario addproject = testapiclient.scenario:ScenarioAddProject
-    scenario deleteproject = testapiclient.scenario:ScenarioDeleteProject
-
-    scenario addversion = testapiclient.scenario:ScenarioAddVersion
-    scenario deleteversion = testapiclient.scenario:ScenarioDeleteVersion
-
-    result get = testapiclient.results:ResultGet
 [egg_info]
 tag_build =
 tag_date = 0
diff --git a/testapi/testapi-client/testapiclient/cli/__init__.py b/testapi/testapi-client/testapiclient/cli/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/testapi/testapi-client/testapiclient/cli/__init__.py
diff --git a/testapi/testapi-client/testapiclient/auth.py b/testapi/testapi-client/testapiclient/cli/auth.py
index 3728498..434c55a 100644
--- a/testapi/testapi-client/testapiclient/auth.py
+++ b/testapi/testapi-client/testapiclient/cli/auth.py
@@ -1,5 +1,5 @@
-from testapiclient import command
-from testapiclient import identity
+from testapiclient.utils import command
+from testapiclient.utils import identity
 
 
 class Auth(command.Command):
diff --git a/testapi/testapi-client/testapiclient/pods.py b/testapi/testapi-client/testapiclient/cli/pods.py
index 85c19e4..cdedc3e 100644
--- a/testapi/testapi-client/testapiclient/pods.py
+++ b/testapi/testapi-client/testapiclient/cli/pods.py
@@ -1,9 +1,9 @@
 import json
 
-from testapiclient import command
-from testapiclient import http_client as client
-from testapiclient import identity
-from testapiclient import url_parse
+from testapiclient.utils import command
+from testapiclient.utils import http_client as client
+from testapiclient.utils import identity
+from testapiclient.utils import url_parse
 
 
 def pods_url():
diff --git a/testapi/testapi-client/testapiclient/projects.py b/testapi/testapi-client/testapiclient/cli/projects.py
index 7f98b56..f847961 100644
--- a/testapi/testapi-client/testapiclient/projects.py
+++ b/testapi/testapi-client/testapiclient/cli/projects.py
@@ -1,9 +1,9 @@
 import json
 
-from testapiclient import command
-from testapiclient import http_client as client
-from testapiclient import identity
-from testapiclient import url_parse
+from testapiclient.utils import command
+from testapiclient.utils import http_client as client
+from testapiclient.utils import identity
+from testapiclient.utils import url_parse
 
 
 def projects_url():
diff --git a/testapi/testapi-client/testapiclient/main.py b/testapi/testapi-client/testapiclient/main.py
index 6c6cf56..dfa6284 100644
--- a/testapi/testapi-client/testapiclient/main.py
+++ b/testapi/testapi-client/testapiclient/main.py
@@ -1,21 +1,21 @@
 import sys
 
-from cliff.app import App
-from cliff.commandmanager import CommandManager
+from cliff import app
+from cliff import commandmanager
 import requests
 
-from testapiclient import user
+from testapiclient.utils import user
 
 
-class TestAPIClient(App):
+class TestAPIClient(app.App):
 
     def __init__(self):
         super(TestAPIClient, self).__init__(
             description='TestAPI Client',
             version='0.1',
-            command_manager=CommandManager('testapi'),
+            command_manager=commandmanager.CommandManager('testapi'),
             deferred_help=True,
-            )
+        )
         user.User.session = requests.Session()
 
     def initialize_app(self, argv):
diff --git a/testapi/testapi-client/testapiclient/utils/__init__.py b/testapi/testapi-client/testapiclient/utils/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/testapi/testapi-client/testapiclient/utils/__init__.py
diff --git a/testapi/testapi-client/testapiclient/command.py b/testapi/testapi-client/testapiclient/utils/command.py
index 62a8b86..95f1fb0 100644
--- a/testapi/testapi-client/testapiclient/command.py
+++ b/testapi/testapi-client/testapiclient/utils/command.py
@@ -1,5 +1,6 @@
 from cliff import command
-from testapiclient import url_parse
+
+from testapiclient.utils import url_parse
 
 
 class Command(command.Command):
diff --git a/testapi/testapi-client/testapiclient/http_client.py b/testapi/testapi-client/testapiclient/utils/http_client.py
index 8a33a8c..6be33ee 100644
--- a/testapi/testapi-client/testapiclient/http_client.py
+++ b/testapi/testapi-client/testapiclient/utils/http_client.py
@@ -1,7 +1,8 @@
 import json
 
 import requests
-from testapiclient import user
+
+from testapiclient.utils import user
 
 
 class HTTPClient(object):
diff --git a/testapi/testapi-client/testapiclient/identity.py b/testapi/testapi-client/testapiclient/utils/identity.py
index f38d8e1..2aeb87a 100644
--- a/testapi/testapi-client/testapiclient/identity.py
+++ b/testapi/testapi-client/testapiclient/utils/identity.py
@@ -3,7 +3,8 @@ import os
 import urllib
 
 import requests
-from testapiclient import user
+
+from testapiclient.utils import user
 
 
 def _authenticate(username, password):
diff --git a/testapi/testapi-client/testapiclient/url_parse.py b/testapi/testapi-client/testapiclient/utils/url_parse.py
index 08f7a63..08f7a63 100644
--- a/testapi/testapi-client/testapiclient/url_parse.py
+++ b/testapi/testapi-client/testapiclient/utils/url_parse.py
diff --git a/testapi/testapi-client/testapiclient/user.py b/testapi/testapi-client/testapiclient/utils/user.py
index 7e72163..7e72163 100644
--- a/testapi/testapi-client/testapiclient/user.py
+++ b/testapi/testapi-client/testapiclient/utils/user.py