diff --git a/app/api/resources/dashboard.py b/app/api/resources/dashboard.py
index f2ee90c..a046fd2 100644
--- a/app/api/resources/dashboard.py
+++ b/app/api/resources/dashboard.py
@@ -3,7 +3,7 @@ from flask_restful import abort
 from marshmallow import Schema, fields
 from webargs.flaskparser import use_args
 from flasgger import swag_from
-import app.dashboard as dashboard
+import app.dashboards.api as dashboard
 from app.api import ProtectedResource
 
 
diff --git a/app/core.py b/app/core.py
index c4ca7ea..d1ab8a5 100644
--- a/app/core.py
+++ b/app/core.py
@@ -29,7 +29,7 @@ def setup_blueprints(app):
     """
     from .accounts.blueprint import accounts_bp
     from .devices import devices_bp
-    from .dashboard import dashboard_bp
+    from .dashboards.blueprint import dashboard_bp
     from .api import api_bp
     from .mqtt import mqtt_bp
 
diff --git a/app/dashboards/__init__.py b/app/dashboards/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/app/dashboard/__init__.py b/app/dashboards/api.py
similarity index 94%
rename from app/dashboard/__init__.py
rename to app/dashboards/api.py
index 90f4499..e35e809 100644
--- a/app/dashboard/__init__.py
+++ b/app/dashboards/api.py
@@ -1,8 +1,5 @@
-from flask import Blueprint
 from .models import Dashboard
 
-dashboard_bp = Blueprint('dashboard', __name__)
-
 
 # Public interface
 def create_dashboard(dashboard_data, account_id):
diff --git a/app/dashboards/blueprint.py b/app/dashboards/blueprint.py
new file mode 100644
index 0000000..bf4b371
--- /dev/null
+++ b/app/dashboards/blueprint.py
@@ -0,0 +1,3 @@
+from flask import Blueprint
+
+dashboard_bp = Blueprint('dashboard', __name__)
diff --git a/app/dashboard/models.py b/app/dashboards/models.py
similarity index 100%
rename from app/dashboard/models.py
rename to app/dashboards/models.py