diff --git a/app/core.py b/app/core.py
index df02b8e..03a41bb 100644
--- a/app/core.py
+++ b/app/core.py
@@ -31,7 +31,7 @@ def setup_blueprints(app):
     from .devices.blueprint import devices_bp
     from .dashboards.blueprint import dashboard_bp
     from .api import api_bp
-    from .mqtt import mqtt_bp
+    from .mqtt.blueprint import mqtt_bp
 
     app.register_blueprint(accounts_bp)
     app.register_blueprint(devices_bp)
diff --git a/app/mqtt/__init__.py b/app/mqtt/__init__.py
index f881c9b..e69de29 100644
--- a/app/mqtt/__init__.py
+++ b/app/mqtt/__init__.py
@@ -1,19 +0,0 @@
-import atexit
-from flask import Blueprint
-from .mqtt_client import MqttClient
-
-mqtt_bp = Blueprint('mqtt', __name__)
-
-
-# Setup
-@mqtt_bp.record
-def __on_blueprint_setup(setup_state):
-    MqttClient.setup(setup_state.app)
-
-
-# When app dies, stop mqtt connection
-def on_stop():
-    MqttClient.tear_down()
-
-
-atexit.register(on_stop)
diff --git a/app/mqtt/blueprint.py b/app/mqtt/blueprint.py
new file mode 100644
index 0000000..f881c9b
--- /dev/null
+++ b/app/mqtt/blueprint.py
@@ -0,0 +1,19 @@
+import atexit
+from flask import Blueprint
+from .mqtt_client import MqttClient
+
+mqtt_bp = Blueprint('mqtt', __name__)
+
+
+# Setup
+@mqtt_bp.record
+def __on_blueprint_setup(setup_state):
+    MqttClient.setup(setup_state.app)
+
+
+# When app dies, stop mqtt connection
+def on_stop():
+    MqttClient.tear_down()
+
+
+atexit.register(on_stop)