diff --git a/__init__.py b/__init__.py
index 2bccd3b3..c7b59f37 100644
--- a/__init__.py
+++ b/__init__.py
@@ -20,7 +20,6 @@
 city name provided in the request.
 """
 from datetime import datetime
-from multi_key_dict import multi_key_dict
 from time import sleep
 from typing import List, Tuple
 
@@ -30,7 +29,7 @@
 from mycroft import MycroftSkill, intent_handler
 from mycroft.messagebus.message import Message
 from mycroft.util.parse import extract_number
-from .source import (
+from .skill import (
     CurrentDialog,
     DAILY,
     DailyDialog,
diff --git a/source/__init__.py b/skill/__init__.py
similarity index 100%
rename from source/__init__.py
rename to skill/__init__.py
diff --git a/source/api.py b/skill/api.py
similarity index 100%
rename from source/api.py
rename to skill/api.py
diff --git a/source/config.py b/skill/config.py
similarity index 100%
rename from source/config.py
rename to skill/config.py
diff --git a/source/dialog.py b/skill/dialog.py
similarity index 100%
rename from source/dialog.py
rename to skill/dialog.py
diff --git a/source/intent.py b/skill/intent.py
similarity index 100%
rename from source/intent.py
rename to skill/intent.py
diff --git a/source/util.py b/skill/util.py
similarity index 100%
rename from source/util.py
rename to skill/util.py
diff --git a/source/weather.py b/skill/weather.py
similarity index 100%
rename from source/weather.py
rename to skill/weather.py