diff --git a/xos/core/models/plcorebase.py b/xos/core/models/plcorebase.py
index 9f7aa4c..220b35c 100644
--- a/xos/core/models/plcorebase.py
+++ b/xos/core/models/plcorebase.py
@@ -9,7 +9,7 @@
 from django.forms.models import model_to_dict
 from django.utils import timezone
 from django.core.exceptions import PermissionDenied
-import model_policy
+import synchronizers.model_policy
 from model_autodeletion import ephemeral_models
 from cgi import escape as html_escape
 
diff --git a/xos/core/models/user.py b/xos/core/models/user.py
index cb90145..bb6ad88 100644
--- a/xos/core/models/user.py
+++ b/xos/core/models/user.py
@@ -15,7 +15,7 @@
 from timezones.fields import TimeZoneField
 from operator import itemgetter, attrgetter
 from core.middleware import get_request
-import model_policy
+import synchronizers.model_policy
 
 # ------ from plcorebase.py ------
 try:
diff --git a/xos/manage.py b/xos/manage.py
index 25d88b6..ae4f598 100644
--- a/xos/manage.py
+++ b/xos/manage.py
@@ -12,12 +12,12 @@
         sys.argv.remove("--makemigrations")
 
     if "--nomodelpolicy" in sys.argv:
-        import model_policy
+        import synchronizers.model_policy as model_policy
         model_policy.EnableModelPolicy(False)
         sys.argv.remove("--nomodelpolicy")
 
     if "--noobserver" in sys.argv:
-        import synchronizers.base
+        import synchronizers.base as observer
         observer.EnableObserver(False)
         sys.argv.remove("--noobserver")
 
diff --git a/xos/synchronizers/base/backend.py b/xos/synchronizers/base/backend.py
index 107ba2c..ec22f79 100644
--- a/xos/synchronizers/base/backend.py
+++ b/xos/synchronizers/base/backend.py
@@ -5,7 +5,7 @@
 from synchronizers.base.event_loop import XOSObserver
 from synchronizers.base.event_manager import EventListener
 from util.logger import Logger, logging
-from model_policy import run_policy
+from synchronizers.model_policy import run_policy
 from xos.config import Config
 
 logger = Logger(level=logging.INFO)
diff --git a/xos/synchronizers/openstack/backend.py b/xos/synchronizers/openstack/backend.py
index 107ba2c..ec22f79 100644
--- a/xos/synchronizers/openstack/backend.py
+++ b/xos/synchronizers/openstack/backend.py
@@ -5,7 +5,7 @@
 from synchronizers.base.event_loop import XOSObserver
 from synchronizers.base.event_manager import EventListener
 from util.logger import Logger, logging
-from model_policy import run_policy
+from synchronizers.model_policy import run_policy
 from xos.config import Config
 
 logger = Logger(level=logging.INFO)
diff --git a/xos/tosca/tests/observertest.py b/xos/tosca/tests/observertest.py
index cf35829..9630ecb 100644
--- a/xos/tosca/tests/observertest.py
+++ b/xos/tosca/tests/observertest.py
@@ -6,7 +6,7 @@
 import sys
 
 from synchronizers.base.event_loop import XOSObserver
-from model_policy import run_policy_once
+from synchronizers.model_policy import run_policy_once
 from xos.config import set_override
 from util.logger import Logger, observer_logger