diff --git a/modules/hue/__init__.py b/modules/hue/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/modules/hue/__main__.py b/modules/hue/__main__.py
new file mode 100644
index 0000000..e69de29
diff --git a/modules/hue/config.py b/modules/hue/config.py
new file mode 100644
index 0000000..2328100
--- /dev/null
+++ b/modules/hue/config.py
@@ -0,0 +1,6 @@
+# Speech CMD settings
+prefix = "computer"
+
+# Hue Remote Settings
+address = "192.168.0.3"
+username = "E0ru0AeVFKEH1E30X40JAJfovg4Uu1aTkdrKQ2Oi"
diff --git a/hue_remote/default-config.py b/modules/hue/default-config.py
similarity index 100%
rename from hue_remote/default-config.py
rename to modules/hue/default-config.py
diff --git a/hue_remote/hue_controller.py b/modules/hue/hue_controller.py
similarity index 100%
rename from hue_remote/hue_controller.py
rename to modules/hue/hue_controller.py
diff --git a/hue_remote/hue_remote.py b/modules/hue/hue_remote.py
similarity index 100%
rename from hue_remote/hue_remote.py
rename to modules/hue/hue_remote.py
diff --git a/hue_remote/lib/func.py b/modules/hue/lib/func.py
similarity index 100%
rename from hue_remote/lib/func.py
rename to modules/hue/lib/func.py
diff --git a/hue_remote/presets.py b/modules/hue/presets.py
similarity index 100%
rename from hue_remote/presets.py
rename to modules/hue/presets.py
diff --git a/modules/speech/__init__.py b/modules/speech/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/modules/speech/__main__.py b/modules/speech/__main__.py
new file mode 100644
index 0000000..e69de29
diff --git a/speech/speech.py b/modules/speech/speech.py
similarity index 100%
rename from speech/speech.py
rename to modules/speech/speech.py
diff --git a/speech_daemon.py b/speech_daemon.py
new file mode 100755
index 0000000..42a18ca
--- /dev/null
+++ b/speech_daemon.py
@@ -0,0 +1,3 @@
+#!/usr/bin/env python
+
+import lib.speech.speech