diff --git a/app.db b/app.db
index a7d11d0..d411f46 100644
Binary files a/app.db and b/app.db differ
diff --git a/backend b/backend
index f94c64e..26cc342 160000
--- a/backend
+++ b/backend
@@ -1 +1 @@
-Subproject commit f94c64e699e29cac8c707337e219ada64a1ae01e
+Subproject commit 26cc3425ee50ff516d75903d9e281b30860c497b
diff --git a/server/models.py b/database/models.py
similarity index 100%
rename from server/models.py
rename to database/models.py
diff --git a/server/__init__.py b/server/__init__.py
index 9984e05..38c8864 100644
--- a/server/__init__.py
+++ b/server/__init__.py
@@ -23,5 +23,5 @@ migrate = Migrate(app, db)
 # https://flask-login.readthedocs.io/en/latest
 login_manager = LoginManager(app)
 
-
-from server import routes, models
+from server import routes
+from database import models
diff --git a/server/forms.py b/server/forms.py
index 2f1dda0..8d818c2 100644
--- a/server/forms.py
+++ b/server/forms.py
@@ -1,7 +1,7 @@
 from flask_wtf import FlaskForm
 from wtforms import StringField, PasswordField, BooleanField, SubmitField
 from wtforms.validators import DataRequired, ValidationError, Email, EqualTo
-from server.models import User
+from database.models import User
 import email_validator
 
 class LoginForm(FlaskForm):
diff --git a/server/googleHandler.py b/server/googleHandler.py
index 80be940..02b6cda 100644
--- a/server/googleHandler.py
+++ b/server/googleHandler.py
@@ -23,7 +23,7 @@ from flask_login import (
 )
 import requests
 
-from server.models import Calendar as dbCalendar
+from database.models import Calendar as dbCalendar
 
 # Configuration
 CLIENT_SECRETS_FILE = "certificate/client_secret.json"
diff --git a/server/routes.py b/server/routes.py
index 7d0ff4c..88c6ede 100644
--- a/server/routes.py
+++ b/server/routes.py
@@ -21,7 +21,7 @@ import server.googleHandler as google
 from backend.Routine import Routine
 from server import login_manager, app, db
 from server.forms import LoginForm, RegistrationForm, DeviceForm
-from server.models import User, Calendar, Device
+from database.models import User, Calendar, Device
 
 os.environ['OAUTHLIB_INSECURE_TRANSPORT'] = '1'