diff --git a/_modules/apiclient/__init__.py b/_modules/__init__.py
similarity index 100%
rename from _modules/apiclient/__init__.py
rename to _modules/__init__.py
diff --git a/_modules/apiclient/creds.py b/_modules/creds.py
similarity index 100%
rename from _modules/apiclient/creds.py
rename to _modules/creds.py
diff --git a/_modules/apiclient/encode_json.py b/_modules/encode_json.py
similarity index 100%
rename from _modules/apiclient/encode_json.py
rename to _modules/encode_json.py
diff --git a/_modules/maas.py b/_modules/maas.py
index 5ad0a41..b935f23 100644
--- a/_modules/maas.py
+++ b/_modules/maas.py
@@ -27,7 +27,7 @@
 # Import third party libs
 HAS_MASS = False
 try:
-    from apiclient.maas_client import MAASClient, MAASDispatcher, MAASOAuth
+    from maas_client import MAASClient, MAASDispatcher, MAASOAuth
     HAS_MASS = True
 except ImportError:
     LOG.exception('why??')
diff --git a/_modules/apiclient/maas_client.py b/_modules/maas_client.py
similarity index 98%
rename from _modules/apiclient/maas_client.py
rename to _modules/maas_client.py
index 6704597..97aeb8b 100644
--- a/_modules/apiclient/maas_client.py
+++ b/_modules/maas_client.py
@@ -22,9 +22,9 @@
 from io import BytesIO
 import urllib2
 
-from apiclient.encode_json import encode_json_data
-from apiclient.multipart import encode_multipart_data
-from apiclient.utils import urlencode
+from encode_json import encode_json_data
+from multipart import encode_multipart_data
+from utils import urlencode
 import oauth.oauth as oauth
 
 
diff --git a/_modules/apiclient/multipart.py b/_modules/multipart.py
similarity index 100%
rename from _modules/apiclient/multipart.py
rename to _modules/multipart.py
diff --git a/_modules/apiclient/testing/__init__.py b/_modules/testing/__init__.py
similarity index 100%
rename from _modules/apiclient/testing/__init__.py
rename to _modules/testing/__init__.py
diff --git a/_modules/apiclient/testing/credentials.py b/_modules/testing/credentials.py
similarity index 100%
rename from _modules/apiclient/testing/credentials.py
rename to _modules/testing/credentials.py
diff --git a/_modules/apiclient/testing/django.py b/_modules/testing/django.py
similarity index 100%
rename from _modules/apiclient/testing/django.py
rename to _modules/testing/django.py
diff --git a/_modules/apiclient/testing/django_client_proxy.py b/_modules/testing/django_client_proxy.py
similarity index 100%
rename from _modules/apiclient/testing/django_client_proxy.py
rename to _modules/testing/django_client_proxy.py
diff --git a/_modules/apiclient/utils.py b/_modules/utils.py
similarity index 100%
rename from _modules/apiclient/utils.py
rename to _modules/utils.py