diff --git a/ampel-firmware.h b/ampel-firmware/ampel-firmware.h
similarity index 100%
rename from ampel-firmware.h
rename to ampel-firmware/ampel-firmware.h
diff --git a/ampel-firmware.ino b/ampel-firmware/ampel-firmware.ino
similarity index 100%
rename from ampel-firmware.ino
rename to ampel-firmware/ampel-firmware.ino
diff --git a/co2_sensor.cpp b/ampel-firmware/co2_sensor.cpp
similarity index 100%
rename from co2_sensor.cpp
rename to ampel-firmware/co2_sensor.cpp
diff --git a/co2_sensor.h b/ampel-firmware/co2_sensor.h
similarity index 100%
rename from co2_sensor.h
rename to ampel-firmware/co2_sensor.h
diff --git a/config.public.h b/ampel-firmware/config.public.h
similarity index 100%
rename from config.public.h
rename to ampel-firmware/config.public.h
diff --git a/csv_writer.cpp b/ampel-firmware/csv_writer.cpp
similarity index 100%
rename from csv_writer.cpp
rename to ampel-firmware/csv_writer.cpp
diff --git a/csv_writer.h b/ampel-firmware/csv_writer.h
similarity index 100%
rename from csv_writer.h
rename to ampel-firmware/csv_writer.h
diff --git a/led_effects.cpp b/ampel-firmware/led_effects.cpp
similarity index 100%
rename from led_effects.cpp
rename to ampel-firmware/led_effects.cpp
diff --git a/led_effects.h b/ampel-firmware/led_effects.h
similarity index 100%
rename from led_effects.h
rename to ampel-firmware/led_effects.h
diff --git a/lorawan.cpp b/ampel-firmware/lorawan.cpp
similarity index 100%
rename from lorawan.cpp
rename to ampel-firmware/lorawan.cpp
diff --git a/lorawan.h b/ampel-firmware/lorawan.h
similarity index 100%
rename from lorawan.h
rename to ampel-firmware/lorawan.h
diff --git a/mqtt.cpp b/ampel-firmware/mqtt.cpp
similarity index 100%
rename from mqtt.cpp
rename to ampel-firmware/mqtt.cpp
diff --git a/mqtt.h b/ampel-firmware/mqtt.h
similarity index 100%
rename from mqtt.h
rename to ampel-firmware/mqtt.h
diff --git a/src/lib/Adafruit_NeoPixel/Adafruit_NeoPixel.cpp b/ampel-firmware/src/lib/Adafruit_NeoPixel/Adafruit_NeoPixel.cpp
similarity index 100%
rename from src/lib/Adafruit_NeoPixel/Adafruit_NeoPixel.cpp
rename to ampel-firmware/src/lib/Adafruit_NeoPixel/Adafruit_NeoPixel.cpp
diff --git a/src/lib/Adafruit_NeoPixel/Adafruit_NeoPixel.h b/ampel-firmware/src/lib/Adafruit_NeoPixel/Adafruit_NeoPixel.h
similarity index 100%
rename from src/lib/Adafruit_NeoPixel/Adafruit_NeoPixel.h
rename to ampel-firmware/src/lib/Adafruit_NeoPixel/Adafruit_NeoPixel.h
diff --git a/src/lib/Adafruit_NeoPixel/CONTRIBUTING.md b/ampel-firmware/src/lib/Adafruit_NeoPixel/CONTRIBUTING.md
similarity index 100%
rename from src/lib/Adafruit_NeoPixel/CONTRIBUTING.md
rename to ampel-firmware/src/lib/Adafruit_NeoPixel/CONTRIBUTING.md
diff --git a/src/lib/Adafruit_NeoPixel/COPYING b/ampel-firmware/src/lib/Adafruit_NeoPixel/COPYING
similarity index 100%
rename from src/lib/Adafruit_NeoPixel/COPYING
rename to ampel-firmware/src/lib/Adafruit_NeoPixel/COPYING
diff --git a/src/lib/Adafruit_NeoPixel/README.md b/ampel-firmware/src/lib/Adafruit_NeoPixel/README.md
similarity index 100%
rename from src/lib/Adafruit_NeoPixel/README.md
rename to ampel-firmware/src/lib/Adafruit_NeoPixel/README.md
diff --git a/src/lib/Adafruit_NeoPixel/esp.c b/ampel-firmware/src/lib/Adafruit_NeoPixel/esp.c
similarity index 100%
rename from src/lib/Adafruit_NeoPixel/esp.c
rename to ampel-firmware/src/lib/Adafruit_NeoPixel/esp.c
diff --git a/src/lib/Adafruit_NeoPixel/esp8266.c b/ampel-firmware/src/lib/Adafruit_NeoPixel/esp8266.c
similarity index 100%
rename from src/lib/Adafruit_NeoPixel/esp8266.c
rename to ampel-firmware/src/lib/Adafruit_NeoPixel/esp8266.c
diff --git a/src/lib/Adafruit_NeoPixel/kendyte_k210.c b/ampel-firmware/src/lib/Adafruit_NeoPixel/kendyte_k210.c
similarity index 100%
rename from src/lib/Adafruit_NeoPixel/kendyte_k210.c
rename to ampel-firmware/src/lib/Adafruit_NeoPixel/kendyte_k210.c
diff --git a/src/lib/Adafruit_NeoPixel/keywords.txt b/ampel-firmware/src/lib/Adafruit_NeoPixel/keywords.txt
similarity index 100%
rename from src/lib/Adafruit_NeoPixel/keywords.txt
rename to ampel-firmware/src/lib/Adafruit_NeoPixel/keywords.txt
diff --git a/src/lib/Adafruit_NeoPixel/library.properties b/ampel-firmware/src/lib/Adafruit_NeoPixel/library.properties
similarity index 100%
rename from src/lib/Adafruit_NeoPixel/library.properties
rename to ampel-firmware/src/lib/Adafruit_NeoPixel/library.properties
diff --git a/src/lib/NTPClient-master/.travis.yml b/ampel-firmware/src/lib/NTPClient-master/.travis.yml
similarity index 100%
rename from src/lib/NTPClient-master/.travis.yml
rename to ampel-firmware/src/lib/NTPClient-master/.travis.yml
diff --git a/src/lib/NTPClient-master/CHANGELOG b/ampel-firmware/src/lib/NTPClient-master/CHANGELOG
similarity index 100%
rename from src/lib/NTPClient-master/CHANGELOG
rename to ampel-firmware/src/lib/NTPClient-master/CHANGELOG
diff --git a/src/lib/NTPClient-master/NTPClient.cpp b/ampel-firmware/src/lib/NTPClient-master/NTPClient.cpp
similarity index 100%
rename from src/lib/NTPClient-master/NTPClient.cpp
rename to ampel-firmware/src/lib/NTPClient-master/NTPClient.cpp
diff --git a/src/lib/NTPClient-master/NTPClient.h b/ampel-firmware/src/lib/NTPClient-master/NTPClient.h
similarity index 100%
rename from src/lib/NTPClient-master/NTPClient.h
rename to ampel-firmware/src/lib/NTPClient-master/NTPClient.h
diff --git a/src/lib/NTPClient-master/README.md b/ampel-firmware/src/lib/NTPClient-master/README.md
similarity index 100%
rename from src/lib/NTPClient-master/README.md
rename to ampel-firmware/src/lib/NTPClient-master/README.md
diff --git a/src/lib/NTPClient-master/keywords.txt b/ampel-firmware/src/lib/NTPClient-master/keywords.txt
similarity index 100%
rename from src/lib/NTPClient-master/keywords.txt
rename to ampel-firmware/src/lib/NTPClient-master/keywords.txt
diff --git a/src/lib/NTPClient-master/library.json b/ampel-firmware/src/lib/NTPClient-master/library.json
similarity index 100%
rename from src/lib/NTPClient-master/library.json
rename to ampel-firmware/src/lib/NTPClient-master/library.json
diff --git a/src/lib/NTPClient-master/library.properties b/ampel-firmware/src/lib/NTPClient-master/library.properties
similarity index 100%
rename from src/lib/NTPClient-master/library.properties
rename to ampel-firmware/src/lib/NTPClient-master/library.properties
diff --git a/src/lib/PubSubClient/CHANGES.txt b/ampel-firmware/src/lib/PubSubClient/CHANGES.txt
similarity index 100%
rename from src/lib/PubSubClient/CHANGES.txt
rename to ampel-firmware/src/lib/PubSubClient/CHANGES.txt
diff --git a/src/lib/PubSubClient/LICENSE.txt b/ampel-firmware/src/lib/PubSubClient/LICENSE.txt
similarity index 100%
rename from src/lib/PubSubClient/LICENSE.txt
rename to ampel-firmware/src/lib/PubSubClient/LICENSE.txt
diff --git a/src/lib/PubSubClient/README.md b/ampel-firmware/src/lib/PubSubClient/README.md
similarity index 100%
rename from src/lib/PubSubClient/README.md
rename to ampel-firmware/src/lib/PubSubClient/README.md
diff --git a/src/lib/PubSubClient/keywords.txt b/ampel-firmware/src/lib/PubSubClient/keywords.txt
similarity index 100%
rename from src/lib/PubSubClient/keywords.txt
rename to ampel-firmware/src/lib/PubSubClient/keywords.txt
diff --git a/src/lib/PubSubClient/library.json b/ampel-firmware/src/lib/PubSubClient/library.json
similarity index 100%
rename from src/lib/PubSubClient/library.json
rename to ampel-firmware/src/lib/PubSubClient/library.json
diff --git a/src/lib/PubSubClient/library.properties b/ampel-firmware/src/lib/PubSubClient/library.properties
similarity index 100%
rename from src/lib/PubSubClient/library.properties
rename to ampel-firmware/src/lib/PubSubClient/library.properties
diff --git a/src/lib/PubSubClient/src/PubSubClient.cpp b/ampel-firmware/src/lib/PubSubClient/src/PubSubClient.cpp
similarity index 100%
rename from src/lib/PubSubClient/src/PubSubClient.cpp
rename to ampel-firmware/src/lib/PubSubClient/src/PubSubClient.cpp
diff --git a/src/lib/PubSubClient/src/PubSubClient.h b/ampel-firmware/src/lib/PubSubClient/src/PubSubClient.h
similarity index 100%
rename from src/lib/PubSubClient/src/PubSubClient.h
rename to ampel-firmware/src/lib/PubSubClient/src/PubSubClient.h
diff --git a/src/lib/SparkFun_SCD30_Arduino_Library/LICENSE.md b/ampel-firmware/src/lib/SparkFun_SCD30_Arduino_Library/LICENSE.md
similarity index 100%
rename from src/lib/SparkFun_SCD30_Arduino_Library/LICENSE.md
rename to ampel-firmware/src/lib/SparkFun_SCD30_Arduino_Library/LICENSE.md
diff --git a/src/lib/SparkFun_SCD30_Arduino_Library/README.md b/ampel-firmware/src/lib/SparkFun_SCD30_Arduino_Library/README.md
similarity index 100%
rename from src/lib/SparkFun_SCD30_Arduino_Library/README.md
rename to ampel-firmware/src/lib/SparkFun_SCD30_Arduino_Library/README.md
diff --git a/src/lib/SparkFun_SCD30_Arduino_Library/documents/Sensirion_CO2_Sensors_SCD30_Preliminary-Datasheet.pdf b/ampel-firmware/src/lib/SparkFun_SCD30_Arduino_Library/documents/Sensirion_CO2_Sensors_SCD30_Preliminary-Datasheet.pdf
similarity index 100%
rename from src/lib/SparkFun_SCD30_Arduino_Library/documents/Sensirion_CO2_Sensors_SCD30_Preliminary-Datasheet.pdf
rename to ampel-firmware/src/lib/SparkFun_SCD30_Arduino_Library/documents/Sensirion_CO2_Sensors_SCD30_Preliminary-Datasheet.pdf
diff --git a/src/lib/SparkFun_SCD30_Arduino_Library/keywords.txt b/ampel-firmware/src/lib/SparkFun_SCD30_Arduino_Library/keywords.txt
similarity index 100%
rename from src/lib/SparkFun_SCD30_Arduino_Library/keywords.txt
rename to ampel-firmware/src/lib/SparkFun_SCD30_Arduino_Library/keywords.txt
diff --git a/src/lib/SparkFun_SCD30_Arduino_Library/library.properties b/ampel-firmware/src/lib/SparkFun_SCD30_Arduino_Library/library.properties
similarity index 100%
rename from src/lib/SparkFun_SCD30_Arduino_Library/library.properties
rename to ampel-firmware/src/lib/SparkFun_SCD30_Arduino_Library/library.properties
diff --git a/src/lib/SparkFun_SCD30_Arduino_Library/src/SparkFun_SCD30_Arduino_Library.cpp b/ampel-firmware/src/lib/SparkFun_SCD30_Arduino_Library/src/SparkFun_SCD30_Arduino_Library.cpp
similarity index 100%
rename from src/lib/SparkFun_SCD30_Arduino_Library/src/SparkFun_SCD30_Arduino_Library.cpp
rename to ampel-firmware/src/lib/SparkFun_SCD30_Arduino_Library/src/SparkFun_SCD30_Arduino_Library.cpp
diff --git a/src/lib/SparkFun_SCD30_Arduino_Library/src/SparkFun_SCD30_Arduino_Library.h b/ampel-firmware/src/lib/SparkFun_SCD30_Arduino_Library/src/SparkFun_SCD30_Arduino_Library.h
similarity index 100%
rename from src/lib/SparkFun_SCD30_Arduino_Library/src/SparkFun_SCD30_Arduino_Library.h
rename to ampel-firmware/src/lib/SparkFun_SCD30_Arduino_Library/src/SparkFun_SCD30_Arduino_Library.h
diff --git a/util.cpp b/ampel-firmware/util.cpp
similarity index 100%
rename from util.cpp
rename to ampel-firmware/util.cpp
diff --git a/util.h b/ampel-firmware/util.h
similarity index 100%
rename from util.h
rename to ampel-firmware/util.h
diff --git a/web_server.cpp b/ampel-firmware/web_server.cpp
similarity index 100%
rename from web_server.cpp
rename to ampel-firmware/web_server.cpp
diff --git a/web_server.h b/ampel-firmware/web_server.h
similarity index 100%
rename from web_server.h
rename to ampel-firmware/web_server.h
diff --git a/wifi_util.cpp b/ampel-firmware/wifi_util.cpp
similarity index 100%
rename from wifi_util.cpp
rename to ampel-firmware/wifi_util.cpp
diff --git a/wifi_util.h b/ampel-firmware/wifi_util.h
similarity index 100%
rename from wifi_util.h
rename to ampel-firmware/wifi_util.h
diff --git a/platformio.ini b/platformio.ini
index 37408192cce461fd4605ba150237ec318a72d209..becf69fc263e19f956d1cf7a7ff4701dd7322247 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -8,7 +8,7 @@
 ; http://docs.platformio.org/page/projectconf.html
 
 [platformio]
-src_dir = ./
+src_dir = ampel-firmware
 
 [env:esp8266]
 platform = espressif8266