diff --git a/shared/selene_util/account/sql/__init__.py b/shared/selene/__init__.py
similarity index 100%
rename from shared/selene_util/account/sql/__init__.py
rename to shared/selene/__init__.py
diff --git a/shared/account/__init__.py b/shared/selene/account/__init__.py
similarity index 100%
rename from shared/account/__init__.py
rename to shared/selene/account/__init__.py
diff --git a/shared/account/account.py b/shared/selene/account/account.py
similarity index 94%
rename from shared/account/account.py
rename to shared/selene/account/account.py
index 9e359564..066085b6 100644
--- a/shared/account/account.py
+++ b/shared/selene/account/account.py
@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from os import path
 
-from selene_util.db import DatabaseQuery, fetch
+from selene.util.db import DatabaseQuery, fetch
 
 SQL_DIR = path.join(path.dirname(__file__), 'sql')
 
diff --git a/shared/account/sql/get_account_by_id.sql b/shared/selene/account/sql/get_account_by_id.sql
similarity index 100%
rename from shared/account/sql/get_account_by_id.sql
rename to shared/selene/account/sql/get_account_by_id.sql
diff --git a/shared/device/__init__.py b/shared/selene/device/__init__.py
similarity index 100%
rename from shared/device/__init__.py
rename to shared/selene/device/__init__.py
diff --git a/shared/device/sql/get_device_by_id.sql b/shared/selene/device/sql/get_device_by_id.sql
similarity index 100%
rename from shared/device/sql/get_device_by_id.sql
rename to shared/selene/device/sql/get_device_by_id.sql
diff --git a/shared/device/sql/get_devices_by_account_id.sql b/shared/selene/device/sql/get_devices_by_account_id.sql
similarity index 100%
rename from shared/device/sql/get_devices_by_account_id.sql
rename to shared/selene/device/sql/get_devices_by_account_id.sql
diff --git a/shared/skill/__init__.py b/shared/selene/skill/__init__.py
similarity index 100%
rename from shared/skill/__init__.py
rename to shared/selene/skill/__init__.py
diff --git a/shared/skill/skill.py b/shared/selene/skill/skill.py
similarity index 98%
rename from shared/skill/skill.py
rename to shared/selene/skill/skill.py
index 7716e43c..e4c07b83 100644
--- a/shared/skill/skill.py
+++ b/shared/selene/skill/skill.py
@@ -2,7 +2,7 @@ from dataclasses import dataclass
 from os import path
 from typing import List
 
-from selene_util.db import DatabaseQuery, fetch
+from selene.util.db import DatabaseQuery, fetch
 
 SQL_DIR = path.join(path.dirname(__file__), 'sql')
 
diff --git a/shared/skill/sql/get_setting_by_section_ids.sql b/shared/selene/skill/sql/get_setting_by_section_ids.sql
similarity index 100%
rename from shared/skill/sql/get_setting_by_section_ids.sql
rename to shared/selene/skill/sql/get_setting_by_section_ids.sql
diff --git a/shared/skill/sql/get_setting_sections_by_device_id_and_setting_version.sql b/shared/selene/skill/sql/get_setting_sections_by_device_id_and_setting_version.sql
similarity index 100%
rename from shared/skill/sql/get_setting_sections_by_device_id_and_setting_version.sql
rename to shared/selene/skill/sql/get_setting_sections_by_device_id_and_setting_version.sql
diff --git a/shared/skill/sql/get_skill_setting_by_device_id_and_version_hash.sql b/shared/selene/skill/sql/get_skill_setting_by_device_id_and_version_hash.sql
similarity index 100%
rename from shared/skill/sql/get_skill_setting_by_device_id_and_version_hash.sql
rename to shared/selene/skill/sql/get_skill_setting_by_device_id_and_version_hash.sql
diff --git a/shared/selene_util/api.py b/shared/selene/util/api.py
similarity index 100%
rename from shared/selene_util/api.py
rename to shared/selene/util/api.py
diff --git a/shared/selene_util/auth.py b/shared/selene/util/auth.py
similarity index 100%
rename from shared/selene_util/auth.py
rename to shared/selene/util/auth.py
diff --git a/shared/selene_util/db.py b/shared/selene/util/db.py
similarity index 97%
rename from shared/selene_util/db.py
rename to shared/selene/util/db.py
index 256cb548..a724cb53 100644
--- a/shared/selene_util/db.py
+++ b/shared/selene/util/db.py
@@ -1,7 +1,7 @@
 """Utility code for interacting with a database.
 
 Example Usage:
-    from selene_util.db import get_sql_from_file, mycroft_db_ro
+    from util.db import get_sql_from_file, mycroft_db_ro
     sql = get_sql_from_file(<fully qualified path to .sql file>)
     query_result = mycroft_db_ro.execute_sql(sql)
 """
diff --git a/shared/selene_util/github.py b/shared/selene/util/github.py
similarity index 100%
rename from shared/selene_util/github.py
rename to shared/selene/util/github.py