diff --git a/designateclient/v1/base.py b/designateclient/client.py
similarity index 98%
rename from designateclient/v1/base.py
rename to designateclient/client.py
index a010699d..2d2dcb23 100644
--- a/designateclient/v1/base.py
+++ b/designateclient/client.py
@@ -15,6 +15,7 @@
 # under the License.
 import abc
 
+
 import six
 
 
@@ -56,4 +57,4 @@ class CrudController(Controller):
     def delete(self, *args, **kw):
         """
         Delete a resource
-        """
+            """
diff --git a/designateclient/v1/diagnostics.py b/designateclient/v1/diagnostics.py
index b5c92fb3..d2e51539 100644
--- a/designateclient/v1/diagnostics.py
+++ b/designateclient/v1/diagnostics.py
@@ -13,10 +13,10 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-from designateclient.v1.base import Controller
+from designateclient import client
 
 
-class DiagnosticsController(Controller):
+class DiagnosticsController(client.Controller):
     def ping(self, service, host):
         """
         Ping a service on a given host
diff --git a/designateclient/v1/domains.py b/designateclient/v1/domains.py
index 530aae21..f1c233d5 100644
--- a/designateclient/v1/domains.py
+++ b/designateclient/v1/domains.py
@@ -15,8 +15,8 @@
 # under the License.
 import json
 
+from designateclient import client
 from designateclient import utils
-from designateclient.v1.base import CrudController
 from designateclient import warlock
 
 
@@ -24,7 +24,7 @@ Domain = warlock.model_factory(utils.load_schema('v1', 'domain'))
 Server = warlock.model_factory(utils.load_schema('v1', 'server'))
 
 
-class DomainsController(CrudController):
+class DomainsController(client.CrudController):
     def list(self):
         """
         Retrieve a list of domains
diff --git a/designateclient/v1/quotas.py b/designateclient/v1/quotas.py
index c2316107..32a1467f 100644
--- a/designateclient/v1/quotas.py
+++ b/designateclient/v1/quotas.py
@@ -15,10 +15,10 @@
 # under the License.
 import json
 
-from designateclient.v1.base import Controller
+from designateclient import client
 
 
-class QuotasController(Controller):
+class QuotasController(client.Controller):
     def get(self, tenant_id):
         """
         Ping a service on a given host
diff --git a/designateclient/v1/records.py b/designateclient/v1/records.py
index 63c7a809..5b1292c3 100644
--- a/designateclient/v1/records.py
+++ b/designateclient/v1/records.py
@@ -16,8 +16,8 @@
 
 import json
 
+from designateclient import client
 from designateclient import utils
-from designateclient.v1.base import CrudController
 from designateclient.v1.domains import Domain
 from designateclient import warlock
 
@@ -25,7 +25,7 @@ from designateclient import warlock
 Record = warlock.model_factory(utils.load_schema('v1', 'record'))
 
 
-class RecordsController(CrudController):
+class RecordsController(client.CrudController):
     def list(self, domain):
         """
         Retrieve a list of records
diff --git a/designateclient/v1/reports.py b/designateclient/v1/reports.py
index 5bff9cfc..4a32c6c8 100644
--- a/designateclient/v1/reports.py
+++ b/designateclient/v1/reports.py
@@ -13,10 +13,10 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-from designateclient.v1.base import Controller
+from designateclient import client
 
 
-class ReportsController(Controller):
+class ReportsController(client.Controller):
     def count_all(self):
         """
         Domain, Records and tenant total count
diff --git a/designateclient/v1/servers.py b/designateclient/v1/servers.py
index 68586eea..6c98f661 100644
--- a/designateclient/v1/servers.py
+++ b/designateclient/v1/servers.py
@@ -16,15 +16,15 @@
 
 import json
 
+from designateclient import client
 from designateclient import utils
-from designateclient.v1.base import CrudController
 from designateclient import warlock
 
 
 Server = warlock.model_factory(utils.load_schema('v1', 'server'))
 
 
-class ServersController(CrudController):
+class ServersController(client.CrudController):
     def list(self):
         """
         Retrieve a list of servers
diff --git a/designateclient/v1/sync.py b/designateclient/v1/sync.py
index 5e93b574..f86e6426 100644
--- a/designateclient/v1/sync.py
+++ b/designateclient/v1/sync.py
@@ -13,10 +13,10 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-from designateclient.v1.base import Controller
+from designateclient import client
 
 
-class SyncController(Controller):
+class SyncController(client.Controller):
     def sync_all(self):
         """
         Sync Everything
diff --git a/designateclient/v1/touch.py b/designateclient/v1/touch.py
index 9b0120c3..bbbdbd2f 100644
--- a/designateclient/v1/touch.py
+++ b/designateclient/v1/touch.py
@@ -13,10 +13,10 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-from designateclient.v1.base import Controller
+from designateclient import client
 
 
-class TouchController(Controller):
+class TouchController(client.Controller):
     def domain(self, domain_id):
         """
         Touch a single Domain