5 files changed, 5 insertions, 5 deletions
diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index 3f0cb6f0..476e2a06 100644
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -24,7 +24,7 @@ from sqlalchemy.ext.declarative import declarative_base
 from migrate.changeset.constraint import UniqueConstraint
 
 from mediagoblin.db.util import RegisterMigration
-from mediagoblin.db.sql.models import MediaEntry, Collection, User
+from mediagoblin.db.models import MediaEntry, Collection, User
 
 MIGRATIONS = {}
 
diff --git a/mediagoblin/db/sql/models.py b/mediagoblin/db/models.py
index 4450e38d..4450e38d 100644
--- a/mediagoblin/db/sql/models.py
+++ b/mediagoblin/db/models.py
diff --git a/mediagoblin/db/sql/models_v0.py b/mediagoblin/db/models_v0.py
index 06f87d28..06f87d28 100644
--- a/mediagoblin/db/sql/models_v0.py
+++ b/mediagoblin/db/models_v0.py
diff --git a/mediagoblin/db/open.py b/mediagoblin/db/open.py
index 801c92ea..11b2dc97 100644
--- a/mediagoblin/db/open.py
+++ b/mediagoblin/db/open.py
@@ -50,7 +50,7 @@ class DatabaseMaster(object):
 
 
 def load_models(app_config):
-    import mediagoblin.db.sql.models
+    import mediagoblin.db.models
 
     for media_type in app_config['media_types']:
         _log.debug("Loading %s.models", media_type)
diff --git a/mediagoblin/db/util.py b/mediagoblin/db/util.py
index 2f167e45..32dd0884 100644
--- a/mediagoblin/db/util.py
+++ b/mediagoblin/db/util.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import sys
 from mediagoblin.db.sql.base import Session
-from mediagoblin.db.sql.models import MediaEntry, Tag, MediaTag, Collection
+from mediagoblin.db.models import MediaEntry, Tag, MediaTag, Collection
 
 from mediagoblin.tools.common import simple_printer
 
@@ -45,7 +45,7 @@ class MigrationManager(object):
         self.printer = printer
 
         # For convenience
-        from mediagoblin.db.sql.models import MigrationData
+        from mediagoblin.db.models import MigrationData
 
         self.migration_model = MigrationData
         self.migration_table = MigrationData.__table__
@@ -259,7 +259,7 @@ def assure_migrations_table_setup(db):
     """
     Make sure the migrations table is set up in the database.
     """
-    from mediagoblin.db.sql.models import MigrationData
+    from mediagoblin.db.models import MigrationData
 
     if not MigrationData.__table__.exists(db.bind):
         MigrationData.metadata.create_all(