diff --git a/lib/__init__.py b/feeder-mqtt/lib/__init__.py
similarity index 100%
rename from lib/__init__.py
rename to feeder-mqtt/lib/__init__.py
diff --git a/lib/cddis_fetch.py b/feeder-mqtt/lib/cddis_fetch.py
similarity index 100%
rename from lib/cddis_fetch.py
rename to feeder-mqtt/lib/cddis_fetch.py
diff --git a/lib/tecmap.py b/feeder-mqtt/lib/tecmap.py
similarity index 100%
rename from lib/tecmap.py
rename to feeder-mqtt/lib/tecmap.py
diff --git a/main.py b/feeder-mqtt/main.py
similarity index 100%
rename from main.py
rename to feeder-mqtt/main.py
diff --git a/vtec.service b/feeder-mqtt/vtec.service
similarity index 78%
rename from vtec.service
rename to feeder-mqtt/vtec.service
index fcca715..e0b6dd8 100644
--- a/vtec.service
+++ b/feeder-mqtt/vtec.service
@@ -6,7 +6,7 @@ After=network.target
 Type=simple
 User=homeassistant
 EnvironmentFile=/etc/secrets/space-weather
-ExecStart=/srv/space-weather/ha-noaa-space-weather-sensor/venv/bin/python /srv/space-weather/ha-noaa-space-weather-sensor/main.py
+ExecStart=/srv/space-weather/ha-noaa-space-weather-sensor/venv/bin/python /srv/space-weather/ha-noaa-space-weather-sensor/feeder-mqtt/main.py
 Restart=on-failure
 RestartSec=5s