diff --git a/app/routes/account/account.py b/app/routes/account/account.py
index f5df8d5..532c472 100644
--- a/app/routes/account/account.py
+++ b/app/routes/account/account.py
@@ -3,7 +3,7 @@ from flask_login import login_required, current_user, logout_user
 from app import app, db
 from app.forms.account import UpdateAccountForm, RegistrationForm, \
     DeleteAccountForm, AskResetPasswordForm, ResetPasswordForm
-from app.model.user import Member
+from app.models.user import Member
 from app.models.trophy import Title
 from app.utils.render import render
 from app.utils.send_mail import send_validation_mail, send_reset_password_mail
diff --git a/app/routes/account/login.py b/app/routes/account/login.py
index 13709c6..058219f 100644
--- a/app/routes/account/login.py
+++ b/app/routes/account/login.py
@@ -3,7 +3,7 @@ from flask_login import login_user, logout_user, login_required, current_user
 from urllib.parse import urlparse, urljoin
 from app import app
 from app.forms.login import LoginForm
-from app.model.user import Member
+from app.models.user import Member
 from app.models.priv import Group
 from app.utils.render import render
 from app.utils.send_mail import send_validation_mail
diff --git a/app/routes/admin/account.py b/app/routes/admin/account.py
index d6bf49c..1d4c04c 100644
--- a/app/routes/admin/account.py
+++ b/app/routes/admin/account.py
@@ -2,7 +2,7 @@ from flask import flash, redirect, url_for, request
 from flask_login import current_user
 from wtforms import BooleanField
 from app.utils.priv_required import priv_required
-from app.model.user import Member
+from app.models.user import Member
 from app.models.trophy import Trophy, Title
 from app.models.priv import Group
 from app.forms.account import AdminUpdateAccountForm, AdminDeleteAccountForm, \
diff --git a/app/routes/admin/groups.py b/app/routes/admin/groups.py
index 611997c..7e667cd 100644
--- a/app/routes/admin/groups.py
+++ b/app/routes/admin/groups.py
@@ -1,7 +1,7 @@
 from app.utils.priv_required import priv_required
 from flask_wtf import FlaskForm
 from wtforms import SubmitField
-from app.model.user import Member, Group, GroupPrivilege
+from app.models.user import Member, Group, GroupPrivilege
 from app.models.priv import SpecialPrivilege
 from app.utils.render import render
 from app import app, db
diff --git a/app/routes/forum/index.py b/app/routes/forum/index.py
index 55a97ff..aa0d209 100644
--- a/app/routes/forum/index.py
+++ b/app/routes/forum/index.py
@@ -9,7 +9,7 @@ from app.models.forum import Forum
 from app.models.topic import Topic
 from app.models.thread import Thread
 from app.models.comment import Comment
-from app.model.user import Guest
+from app.models.user import Guest
 from app.models.attachment import Attachment
 
 
diff --git a/app/routes/forum/topic.py b/app/routes/forum/topic.py
index f855936..173e066 100644
--- a/app/routes/forum/topic.py
+++ b/app/routes/forum/topic.py
@@ -9,7 +9,7 @@ from app.models.forum import Forum
 from app.models.topic import Topic
 from app.models.thread import Thread
 from app.models.comment import Comment
-from app.model.user import Guest
+from app.models.user import Guest
 from app.models.attachment import Attachment
 
 
diff --git a/app/routes/users.py b/app/routes/users.py
index a1691af..3cb4779 100644
--- a/app/routes/users.py
+++ b/app/routes/users.py
@@ -2,7 +2,7 @@ from flask import redirect, url_for, send_file
 from werkzeug.utils import secure_filename
 import os.path
 from app import app
-from app.model.user import Member
+from app.models.user import Member
 from app.models.trophy import Trophy
 from app.utils import unicode_names
 from app.utils.render import render
diff --git a/app/utils/notify.py b/app/utils/notify.py
index c26df9e..245885f 100644
--- a/app/utils/notify.py
+++ b/app/utils/notify.py
@@ -1,6 +1,6 @@
 from app import db
 from app.models.notification import Notification
-from app.model.user import Member
+from app.models.user import Member
 
 def notify(user, message, href=None):
     """ Notify a user (by id, name or object reference) with a message.
diff --git a/app/utils/valid_name.py b/app/utils/valid_name.py
index bf8ef39..5b94228 100644
--- a/app/utils/valid_name.py
+++ b/app/utils/valid_name.py
@@ -1,5 +1,5 @@
 from app.utils.unicode_names import normalize
-from app.model.user import User
+from app.models.user import User
 import re
 
 def valid_name(name, msg=False):
diff --git a/app/utils/validators/__init__.py b/app/utils/validators/__init__.py
index 0d97e69..08899e4 100644
--- a/app/utils/validators/__init__.py
+++ b/app/utils/validators/__init__.py
@@ -1,6 +1,6 @@
 from flask_login import current_user
 from wtforms.validators import ValidationError
-from app.model.user import Member
+from app.models.user import Member
 from app.models.trophy import Title
 from werkzeug.exceptions import NotFound
 
diff --git a/app/utils/validators/name.py b/app/utils/validators/name.py
index 6a98c6f..9ec6b69 100644
--- a/app/utils/validators/name.py
+++ b/app/utils/validators/name.py
@@ -1,6 +1,6 @@
 from wtforms.validators import ValidationError
 from app.utils.valid_name import valid_name
-from app.model.user import User, Member
+from app.models.user import User, Member
 import app.utils.ldap as ldap
 from app.utils.unicode_names import normalize
 from config import V5Config
diff --git a/master.py b/master.py
index e959fcc..dd588f0 100755
--- a/master.py
+++ b/master.py
@@ -1,7 +1,7 @@
 #! /usr/bin/python3
 
 from app import app, db
-from app.model.user import Member, Group, GroupPrivilege
+from app.models.user import Member, Group, GroupPrivilege
 from app.models.priv import SpecialPrivilege
 from app.models.trophy import Trophy, Title
 from app.models.forum import Forum