diff --git a/.github/workflows/skill_tests.yml b/.github/workflows/skill_tests.yml
index 9a09e30..dc81d87 100644
--- a/.github/workflows/skill_tests.yml
+++ b/.github/workflows/skill_tests.yml
@@ -14,9 +14,12 @@ jobs:
     uses: neongeckocom/.github/.github/workflows/skill_test_intents.yml@master
     with:
       test_padatious: true
+      skill_entrypoint: skill-speed_test.neongeckocom
   skill_resource_tests:
     uses: neongeckocom/.github/.github/workflows/skill_test_resources.yml@master
+    with:
+      skill_entrypoint: skill-speed_test.neongeckocom
   skill_install_tests:
     uses: neongeckocom/.github/.github/workflows/skill_test_installation.yml@master
     with:
-      test_osm: false
\ No newline at end of file
+      test_osm: false
diff --git a/__init__.py b/neon_skill_speed_test/__init__.py
similarity index 95%
rename from __init__.py
rename to neon_skill_speed_test/__init__.py
index 1b5c916..766d3e1 100644
--- a/__init__.py
+++ b/neon_skill_speed_test/__init__.py
@@ -39,11 +39,6 @@ class SpeedTestSkill(NeonSkill):
     def __init__(self, **kwargs):
         NeonSkill.__init__(self, **kwargs)
         self._test = None
-        try:
-            server = self.test.get_best_server()
-            LOG.debug(f"Selected: {server}")
-        except Exception as e:
-            LOG.exception(e)
         # TODO: Support configured server
 
     @property
diff --git a/locale/en-us/dialog/notify_testing.dialog b/neon_skill_speed_test/locale/en-us/dialog/notify_testing.dialog
similarity index 100%
rename from locale/en-us/dialog/notify_testing.dialog
rename to neon_skill_speed_test/locale/en-us/dialog/notify_testing.dialog
diff --git a/locale/en-us/dialog/results.dialog b/neon_skill_speed_test/locale/en-us/dialog/results.dialog
similarity index 100%
rename from locale/en-us/dialog/results.dialog
rename to neon_skill_speed_test/locale/en-us/dialog/results.dialog
diff --git a/locale/en-us/dialog/start_test.dialog b/neon_skill_speed_test/locale/en-us/dialog/start_test.dialog
similarity index 100%
rename from locale/en-us/dialog/start_test.dialog
rename to neon_skill_speed_test/locale/en-us/dialog/start_test.dialog
diff --git a/locale/en-us/intent/run_speed_test.intent b/neon_skill_speed_test/locale/en-us/intent/run_speed_test.intent
similarity index 100%
rename from locale/en-us/intent/run_speed_test.intent
rename to neon_skill_speed_test/locale/en-us/intent/run_speed_test.intent
diff --git a/requirements.txt b/requirements/requirements.txt
similarity index 100%
rename from requirements.txt
rename to requirements/requirements.txt
diff --git a/requirements/test.txt b/requirements/test.txt
index f2a694a..55b7220 100644
--- a/requirements/test.txt
+++ b/requirements/test.txt
@@ -1 +1 @@
-neon-minerva[padatious]~=0.3
+neon-minerva[padatious]~=0.3,>=0.3.1a2
diff --git a/setup.py b/setup.py
index 76b78d3..6748c8f 100644
--- a/setup.py
+++ b/setup.py
@@ -30,14 +30,14 @@
 from os import getenv, path, walk
 
 SKILL_NAME = "skill-speed_test"
-SKILL_PKG = SKILL_NAME.replace('-', '_')
+SKILL_PKG = "neon_" + SKILL_NAME.replace('-', '_')
 # skill_id=package_name:SkillClass
 PLUGIN_ENTRY_POINT = f'{SKILL_NAME}.neongeckocom={SKILL_PKG}:SpeedTestSkill'
 BASE_PATH = path.abspath(path.dirname(__file__))
 
 
 def get_requirements(requirements_filename: str):
-    requirements_file = path.join(BASE_PATH, requirements_filename)
+    requirements_file = path.join(BASE_PATH, "requirements", requirements_filename)
     with open(requirements_file, 'r', encoding='utf-8') as r:
         requirements = r.readlines()
     requirements = [r.strip() for r in requirements if r.strip()
@@ -59,7 +59,7 @@ def get_requirements(requirements_filename: str):
 
 def find_resource_files():
     resource_base_dirs = ("locale", "ui", "vocab", "dialog", "regex")
-    base_dir = BASE_PATH
+    base_dir = path.join(BASE_PATH, SKILL_PKG)
     package_data = ["skill.json"]
     for res in resource_base_dirs:
         if path.isdir(path.join(base_dir, res)):
@@ -89,12 +89,11 @@ def find_resource_files():
     url=f'https://github.com/NeonGeckoCom/{SKILL_NAME}',
     license='BSD-3-Clause',
     install_requires=get_requirements("requirements.txt"),
-    extras_require={"test": get_requirements("requirements/test.txt")},
+    extras_require={"test": get_requirements("test.txt")},
     author='Neongecko',
     author_email='developers@neon.ai',
     long_description=long_description,
     long_description_content_type="text/markdown",
-    package_dir={SKILL_PKG: ""},
     packages=[SKILL_PKG],
     package_data={SKILL_PKG: find_resource_files()},
     include_package_data=True,