diff --git a/app/__init__.py b/app/__init__.py
index 43b8a6b..3d0ca30 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -5,13 +5,13 @@
 from mongoengine import connect
 from werkzeug.exceptions import HTTPException
 
-from app.controllers.auth_controller import auth_bp
-from app.controllers.encounter_controller import encounter_bp
-from app.controllers.item_controller import item_bp
-from app.controllers.roll_controller import roll_bp
-from app.controllers.rolltable_controller import rolltable_bp
-from app.controllers.room_controller import room_bp
-from app.controllers.user_controller import user_bp
+from app.views.auth import auth_bp
+from app.views.encounter import encounter_bp
+from app.views.item import item_bp
+from app.views.roll import roll_bp
+from app.views.rolltable import rolltable_bp
+from app.views.room import room_bp
+from app.views.user import user_bp
 from app.utils.json_provider import CustomJSONProvider
 from config.settings import settings
 
diff --git a/app/controllers/__init__.py b/app/views/__init__.py
similarity index 100%
rename from app/controllers/__init__.py
rename to app/views/__init__.py
diff --git a/app/controllers/auth_controller.py b/app/views/auth.py
similarity index 100%
rename from app/controllers/auth_controller.py
rename to app/views/auth.py
diff --git a/app/controllers/encounter_controller.py b/app/views/encounter.py
similarity index 100%
rename from app/controllers/encounter_controller.py
rename to app/views/encounter.py
diff --git a/app/controllers/item_controller.py b/app/views/item.py
similarity index 100%
rename from app/controllers/item_controller.py
rename to app/views/item.py
diff --git a/app/controllers/roll_controller.py b/app/views/roll.py
similarity index 100%
rename from app/controllers/roll_controller.py
rename to app/views/roll.py
diff --git a/app/controllers/rolltable_controller.py b/app/views/rolltable.py
similarity index 100%
rename from app/controllers/rolltable_controller.py
rename to app/views/rolltable.py
diff --git a/app/controllers/room_controller.py b/app/views/room.py
similarity index 100%
rename from app/controllers/room_controller.py
rename to app/views/room.py
diff --git a/app/controllers/user_controller.py b/app/views/user.py
similarity index 100%
rename from app/controllers/user_controller.py
rename to app/views/user.py
diff --git a/tests/controllers/__init__.py b/tests/views/__init__.py
similarity index 100%
rename from tests/controllers/__init__.py
rename to tests/views/__init__.py
diff --git a/tests/controllers/test_auth_controller.py b/tests/views/test_auth.py
similarity index 100%
rename from tests/controllers/test_auth_controller.py
rename to tests/views/test_auth.py
diff --git a/tests/controllers/test_encounter_controller.py b/tests/views/test_encounter.py
similarity index 97%
rename from tests/controllers/test_encounter_controller.py
rename to tests/views/test_encounter.py
index d83969d..ecc9392 100644
--- a/tests/controllers/test_encounter_controller.py
+++ b/tests/views/test_encounter.py
@@ -1,6 +1,6 @@
 import unittest
 from app.models.encounter import Encounter
-from tests.controllers.controller_test_base import ControllerTestBase
+from tests.views.test_view_base import ControllerTestBase
 
 
 class EncounterControllerTestCase(ControllerTestBase):
diff --git a/tests/controllers/test_item_controller.py b/tests/views/test_item.py
similarity index 97%
rename from tests/controllers/test_item_controller.py
rename to tests/views/test_item.py
index 5141073..b125c22 100644
--- a/tests/controllers/test_item_controller.py
+++ b/tests/views/test_item.py
@@ -1,7 +1,7 @@
 import unittest
 
 from app.models.item import Item
-from tests.controllers.controller_test_base import ControllerTestBase
+from tests.views.test_view_base import ControllerTestBase
 
 
 class ItemControllerTestCase(ControllerTestBase):
diff --git a/tests/controllers/test_roll_controller.py b/tests/views/test_roll.py
similarity index 100%
rename from tests/controllers/test_roll_controller.py
rename to tests/views/test_roll.py
diff --git a/tests/controllers/test_rolltable_controller.py b/tests/views/test_rolltable.py
similarity index 98%
rename from tests/controllers/test_rolltable_controller.py
rename to tests/views/test_rolltable.py
index dab76fa..e2b50d4 100644
--- a/tests/controllers/test_rolltable_controller.py
+++ b/tests/views/test_rolltable.py
@@ -2,7 +2,7 @@
 
 from app.models.item import Item
 from app.models.rolltable import RollTable
-from tests.controllers.controller_test_base import ControllerTestBase
+from tests.views.test_view_base import ControllerTestBase
 
 
 class RollTableControllerTestCase(ControllerTestBase):
diff --git a/tests/controllers/test_room_controller.py b/tests/views/test_room.py
similarity index 97%
rename from tests/controllers/test_room_controller.py
rename to tests/views/test_room.py
index 3bc85d7..0b54754 100644
--- a/tests/controllers/test_room_controller.py
+++ b/tests/views/test_room.py
@@ -1,6 +1,6 @@
 import unittest
 from app.models.room import Room
-from tests.controllers.controller_test_base import ControllerTestBase
+from tests.views.test_view_base import ControllerTestBase
 
 
 class RoomControllerTestCase(ControllerTestBase):
diff --git a/tests/controllers/test_user_controller.py b/tests/views/test_user.py
similarity index 99%
rename from tests/controllers/test_user_controller.py
rename to tests/views/test_user.py
index cfb14a0..82f6eef 100644
--- a/tests/controllers/test_user_controller.py
+++ b/tests/views/test_user.py
@@ -3,7 +3,7 @@
 
 from app.models.item import Item
 from app.models.user import User
-from tests.controllers.controller_test_base import ControllerTestBase
+from tests.views.test_view_base import ControllerTestBase
 
 
 class UserControllerTestCase(ControllerTestBase):
diff --git a/tests/controllers/controller_test_base.py b/tests/views/test_view_base.py
similarity index 100%
rename from tests/controllers/controller_test_base.py
rename to tests/views/test_view_base.py