diff --git a/requirements.txt b/requirements.txt
index 4fe8fa15..815a7e84 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,4 +2,5 @@ json_database~=0.5
 neon-utils~=1.2
 combo_lock~=0.2
 ovos-utils~=0.0, >=0.0.32
-ovos-bus-client~=0.0.3
\ No newline at end of file
+ovos-bus-client~=0.0.3
+adapt-parser>=0.5,<2.0
diff --git a/setup.py b/setup.py
index 1236fe9e..a08c0add 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@
 # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE,  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+import setuptools
 from setuptools import setup
 from os import getenv, path, walk
 
@@ -94,8 +94,7 @@ def find_resource_files():
     author_email='developers@neon.ai',
     long_description=long_description,
     long_description_content_type="text/markdown",
-    package_dir={SKILL_PKG: ""},
-    packages=[SKILL_PKG, f"{SKILL_PKG}.util"],
+    packages=setuptools.find_packages(),
     package_data={SKILL_PKG: find_resource_files()},
     include_package_data=True,
     entry_points={"ovos.plugin.skill": PLUGIN_ENTRY_POINT}
diff --git a/skill.json b/skill.json
index 2325bed0..acddb14f 100644
--- a/skill.json
+++ b/skill.json
@@ -30,6 +30,7 @@
     "systemDeps": false,
     "requirements": {
         "python": [
+            "adapt-parser>=0.5,<2.0",
             "combo_lock~=0.2",
             "json_database~=0.5",
             "neon-utils~=1.2",
diff --git a/__init__.py b/skill_alerts/__init__.py
similarity index 100%
rename from __init__.py
rename to skill_alerts/__init__.py
diff --git a/util/__init__.py b/skill_alerts/util/__init__.py
similarity index 100%
rename from util/__init__.py
rename to skill_alerts/util/__init__.py
diff --git a/util/alert.py b/skill_alerts/util/alert.py
similarity index 100%
rename from util/alert.py
rename to skill_alerts/util/alert.py
diff --git a/util/alert_manager.py b/skill_alerts/util/alert_manager.py
similarity index 100%
rename from util/alert_manager.py
rename to skill_alerts/util/alert_manager.py
diff --git a/util/parse_utils.py b/skill_alerts/util/parse_utils.py
similarity index 100%
rename from util/parse_utils.py
rename to skill_alerts/util/parse_utils.py
diff --git a/util/ui_models.py b/skill_alerts/util/ui_models.py
similarity index 100%
rename from util/ui_models.py
rename to skill_alerts/util/ui_models.py
diff --git a/test/test_skill.py b/test/test_skill.py
index df430568..fe7e5c83 100644
--- a/test/test_skill.py
+++ b/test/test_skill.py
@@ -24,7 +24,6 @@
 import lingua_franca
 import pytest
 import random
-import sys
 import shutil
 import unittest
 import datetime as dt