diff --git a/MANIFEST.in b/MANIFEST.in
index aef0ccb..50d7972 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -10,8 +10,9 @@ recursive-include docs *.html
 recursive-include docs *.py
 recursive-include docs *.rst
 recursive-include docs Makefile
+recursive-include hbmqtt/scripts *.py
+recursive-include hbmqtt/scripts *.yaml
 recursive-include samples *.crt
 recursive-include samples *.py
-recursive-include scripts *.yaml
 recursive-include tests *.crt
 recursive-include tests *.py
diff --git a/scripts/__init__.py b/hbmqtt/scripts/__init__.py
similarity index 100%
rename from scripts/__init__.py
rename to hbmqtt/scripts/__init__.py
diff --git a/scripts/broker_script.py b/hbmqtt/scripts/broker_script.py
similarity index 100%
rename from scripts/broker_script.py
rename to hbmqtt/scripts/broker_script.py
diff --git a/scripts/default_broker.yaml b/hbmqtt/scripts/default_broker.yaml
similarity index 100%
rename from scripts/default_broker.yaml
rename to hbmqtt/scripts/default_broker.yaml
diff --git a/scripts/default_client.yaml b/hbmqtt/scripts/default_client.yaml
similarity index 100%
rename from scripts/default_client.yaml
rename to hbmqtt/scripts/default_client.yaml
diff --git a/scripts/pub_script.py b/hbmqtt/scripts/pub_script.py
similarity index 100%
rename from scripts/pub_script.py
rename to hbmqtt/scripts/pub_script.py
diff --git a/scripts/sub_script.py b/hbmqtt/scripts/sub_script.py
similarity index 100%
rename from scripts/sub_script.py
rename to hbmqtt/scripts/sub_script.py
diff --git a/setup.py b/setup.py
index 60c9b3a..3d5bacc 100644
--- a/setup.py
+++ b/setup.py
@@ -56,9 +56,9 @@ setup(
             'packet_logger_plugin = hbmqtt.plugins.logging:PacketLoggerPlugin',
         ],
         'console_scripts': [
-            'hbmqtt = scripts.broker_script:main',
-            'hbmqtt_pub = scripts.pub_script:main',
-            'hbmqtt_sub = scripts.sub_script:main',
+            'hbmqtt = hbmqtt.scripts.broker_script:main',
+            'hbmqtt_pub = hbmqtt.scripts.pub_script:main',
+            'hbmqtt_sub = hbmqtt.scripts.sub_script:main',
         ]
     }
 )