diff --git a/designate/scheduler/__init__.py b/designate/scheduler/__init__.py
index 4a04e38b..9466d7f5 100644
--- a/designate/scheduler/__init__.py
+++ b/designate/scheduler/__init__.py
@@ -15,7 +15,7 @@
 from oslo_config import cfg
 from oslo_log import log as logging
 
-from designate.scheduler.base import Scheduler
+from designate.scheduler import base
 
 LOG = logging.getLogger(__name__)
 
@@ -29,4 +29,4 @@ cfg.CONF.register_opts([
 
 def get_scheduler(storage):
 
-    return Scheduler(storage=storage)
+    return base.Scheduler(storage=storage)
diff --git a/designate/scheduler/filters/attribute_filter.py b/designate/scheduler/filters/attribute_filter.py
index cdf3fae4..6012c5bd 100644
--- a/designate/scheduler/filters/attribute_filter.py
+++ b/designate/scheduler/filters/attribute_filter.py
@@ -16,12 +16,12 @@ from oslo_log import log as logging
 from oslo_utils.strutils import bool_from_string
 
 from designate.objects import PoolAttributeList
-from designate.scheduler.filters.base import Filter
+from designate.scheduler.filters import base
 
 LOG = logging.getLogger(__name__)
 
 
-class AttributeFilter(Filter):
+class AttributeFilter(base.Filter):
     """This allows users to choose the pool by supplying hints to this filter.
     These are provided as attributes as part of the zone object provided at
     zone create time.
diff --git a/designate/scheduler/filters/default_pool_filter.py b/designate/scheduler/filters/default_pool_filter.py
index a64569c9..783245de 100644
--- a/designate/scheduler/filters/default_pool_filter.py
+++ b/designate/scheduler/filters/default_pool_filter.py
@@ -13,12 +13,11 @@
 # under the License.
 from oslo_config import cfg
 
-from designate.scheduler.filters.base import Filter
-from designate.objects import Pool
-from designate.objects import PoolList
+from designate.scheduler.filters import base
+from designate import objects
 
 
-class DefaultPoolFilter(Filter):
+class DefaultPoolFilter(base.Filter):
     """This filter will always return the default pool specified in the
     designate config file
 
@@ -35,6 +34,7 @@ class DefaultPoolFilter(Filter):
     """
 
     def filter(self, context, pools, zone):
-        pools = PoolList()
-        pools.append(Pool(id=cfg.CONF['service:central'].default_pool_id))
+        pools = objects.PoolList()
+        pools.append(
+            objects.Pool(id=cfg.CONF['service:central'].default_pool_id))
         return pools
diff --git a/designate/scheduler/filters/fallback_filter.py b/designate/scheduler/filters/fallback_filter.py
index 086aa502..29cf78c1 100644
--- a/designate/scheduler/filters/fallback_filter.py
+++ b/designate/scheduler/filters/fallback_filter.py
@@ -14,9 +14,8 @@
 
 from oslo_config import cfg
 
-from designate.scheduler.filters.base import Filter
-from designate.objects import Pool
-from designate.objects import PoolList
+from designate.scheduler.filters import base
+from designate import objects
 
 cfg.CONF.register_opts([
     cfg.StrOpt('default_pool_id',
@@ -25,7 +24,7 @@ cfg.CONF.register_opts([
 ], group='service:central')
 
 
-class FallbackFilter(Filter):
+class FallbackFilter(base.Filter):
     """If there is no zones available to schedule to, this filter will insert
     the default_pool_id.
 
@@ -42,8 +41,9 @@ class FallbackFilter(Filter):
 
     def filter(self, context, pools, zone):
         if len(pools) is 0:
-            pools = PoolList()
-            pools.append(Pool(id=cfg.CONF['service:central'].default_pool_id))
+            pools = objects.PoolList()
+            pools.append(
+                objects.Pool(id=cfg.CONF['service:central'].default_pool_id))
             return pools
         else:
             return pools
diff --git a/designate/scheduler/filters/pool_id_attribute_filter.py b/designate/scheduler/filters/pool_id_attribute_filter.py
index 317ef409..a5cdbb85 100644
--- a/designate/scheduler/filters/pool_id_attribute_filter.py
+++ b/designate/scheduler/filters/pool_id_attribute_filter.py
@@ -13,7 +13,7 @@
 # under the License.
 from oslo_log import log as logging
 
-from designate.scheduler.filters.base import Filter
+from designate.scheduler.filters import base
 from designate import exceptions
 from designate import objects
 from designate import policy
@@ -21,7 +21,7 @@ from designate import policy
 LOG = logging.getLogger(__name__)
 
 
-class PoolIDAttributeFilter(Filter):
+class PoolIDAttributeFilter(base.Filter):
     """This allows users with the correct role to specify the exact pool_id
     to schedule the supplied zone to.
 
diff --git a/designate/scheduler/filters/random_filter.py b/designate/scheduler/filters/random_filter.py
index 832e17cd..578695db 100644
--- a/designate/scheduler/filters/random_filter.py
+++ b/designate/scheduler/filters/random_filter.py
@@ -15,13 +15,13 @@ import random
 
 from oslo_log import log as logging
 
-from designate.scheduler.filters.base import Filter
+from designate.scheduler.filters import base
 from designate.objects import PoolList
 
 LOG = logging.getLogger(__name__)
 
 
-class RandomFilter(Filter):
+class RandomFilter(base.Filter):
     """Randomly chooses one of the input pools if there is multiple supplied.
 
     .. note::