diff --git a/progit/hooks/irc.py b/progit/hooks/irc.py
index bb23ae0..1b01fd5 100644
--- a/progit/hooks/irc.py
+++ b/progit/hooks/irc.py
@@ -17,7 +17,7 @@ from flask.ext import wtf
 from sqlalchemy.orm import relation
 
 from progit.hooks import BaseHook
-from progit.model import BASE, Project
+from progit.lib.model import BASE, Project
 from progit import SESSION, APP
 
 
diff --git a/progit/hooks/mail.py b/progit/hooks/mail.py
index 77e05be..86f40b5 100644
--- a/progit/hooks/mail.py
+++ b/progit/hooks/mail.py
@@ -18,7 +18,7 @@ from flask.ext import wtf
 from sqlalchemy.orm import relation
 
 from progit.hooks import BaseHook
-from progit.model import BASE, Project
+from progit.lib.model import BASE, Project
 from progit import SESSION, APP
 
 
diff --git a/progit/hooks/progit_hook.py b/progit/hooks/progit_hook.py
index 197531d..f17e2e5 100644
--- a/progit/hooks/progit_hook.py
+++ b/progit/hooks/progit_hook.py
@@ -18,7 +18,7 @@ from flask.ext import wtf
 from sqlalchemy.orm import relation
 
 from progit.hooks import BaseHook
-from progit.model import BASE, Project
+from progit.lib.model import BASE, Project
 from progit import SESSION, APP
 
 
diff --git a/progit/hooks/progit_ticket_hook.py b/progit/hooks/progit_ticket_hook.py
index 9cb36fb..46e5a4d 100644
--- a/progit/hooks/progit_ticket_hook.py
+++ b/progit/hooks/progit_ticket_hook.py
@@ -18,7 +18,7 @@ from flask.ext import wtf
 from sqlalchemy.orm import relation
 
 from progit.hooks import BaseHook
-from progit.model import BASE, Project
+from progit.lib.model import BASE, Project
 from progit import SESSION, APP
 
 
diff --git a/progit/lib/__init__.py b/progit/lib/__init__.py
index 96f23b6..f2415f8 100644
--- a/progit/lib/__init__.py
+++ b/progit/lib/__init__.py
@@ -31,7 +31,7 @@ import pygit2
 
 import progit.exceptions
 import progit.notify
-from progit import model
+from progit.lib import model
 
 
 def create_session(db_url, debug=False, pool_recycle=3600):
diff --git a/progit/ui/login.py b/progit/ui/login.py
index ea3282f..3870ca1 100644
--- a/progit/ui/login.py
+++ b/progit/ui/login.py
@@ -21,7 +21,7 @@ import progit.lib
 import progit.notify
 from progit import APP, SESSION, is_admin
 from progit.ui.admin import admin_required
-import progit.model as model
+import progit.lib.model as model
 
 
 @APP.route('/user/new', methods=['GET', 'POST'])
diff --git a/progit/ui/plugins.py b/progit/ui/plugins.py
index d70c30d..21b7ad6 100644
--- a/progit/ui/plugins.py
+++ b/progit/ui/plugins.py
@@ -22,7 +22,7 @@ import progit.exceptions
 import progit.lib
 import progit.forms
 from progit import APP, SESSION, LOG, cla_required, is_repo_admin
-from progit.model import BASE
+from progit.lib.model import BASE
 
 
 def get_plugin_names():