diff --git a/files/classes/__init__.py b/files/classes/__init__.py
index 2225bfd15..955eb061d 100644
--- a/files/classes/__init__.py
+++ b/files/classes/__init__.py
@@ -92,4 +92,5 @@ from files.helpers.security import *
 
 # Then the specific stuff we don't want stomped on
 from files.helpers.lazy import lazy
-from files.__main__ import Base, app, cache
+from files.classes.base import Base
+from files.__main__ import app, cache
diff --git a/files/classes/user.py b/files/classes/user.py
index 776b21599..c9ae82bc2 100644
--- a/files/classes/user.py
+++ b/files/classes/user.py
@@ -17,7 +17,7 @@ from .mod_logs import *
 from .mod import *
 from .exiles import *
 from .sub_block import *
-from files.__main__ import app, Base, cache
+from files.__main__ import app, cache
 from files.helpers.security import *
 from files.helpers.assetcache import assetcache_path
 from files.helpers.contentsorting import apply_time_filter, sort_objects