diff --git a/.gitignore b/.gitignore
index 28b5066..19399db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 .vscode
-config.h
\ No newline at end of file
+*/config.h
diff --git a/lib/BME280/BME280.cpp b/libraries/BME280/BME280.cpp
similarity index 100%
rename from lib/BME280/BME280.cpp
rename to libraries/BME280/BME280.cpp
diff --git a/lib/BME280/BME280.h b/libraries/BME280/BME280.h
similarity index 100%
rename from lib/BME280/BME280.h
rename to libraries/BME280/BME280.h
diff --git a/lib/BME280/BME280I2C.cpp b/libraries/BME280/BME280I2C.cpp
similarity index 100%
rename from lib/BME280/BME280I2C.cpp
rename to libraries/BME280/BME280I2C.cpp
diff --git a/lib/BME280/BME280I2C.h b/libraries/BME280/BME280I2C.h
similarity index 100%
rename from lib/BME280/BME280I2C.h
rename to libraries/BME280/BME280I2C.h
diff --git a/lib/BME280/LICENSE b/libraries/BME280/LICENSE
similarity index 100%
rename from lib/BME280/LICENSE
rename to libraries/BME280/LICENSE
diff --git a/lib/BME280/README.md b/libraries/BME280/README.md
similarity index 100%
rename from lib/BME280/README.md
rename to libraries/BME280/README.md
diff --git a/lib/BME280/examples/BME280_Modes/BME280_Modes.ino b/libraries/BME280/examples/BME280_Modes/BME280_Modes.ino
similarity index 100%
rename from lib/BME280/examples/BME280_Modes/BME280_Modes.ino
rename to libraries/BME280/examples/BME280_Modes/BME280_Modes.ino
diff --git a/lib/BME280/examples/BME_280_I2C_Test/BME_280_I2C_Test.ino b/libraries/BME280/examples/BME_280_I2C_Test/BME_280_I2C_Test.ino
similarity index 100%
rename from lib/BME280/examples/BME_280_I2C_Test/BME_280_I2C_Test.ino
rename to libraries/BME280/examples/BME_280_I2C_Test/BME_280_I2C_Test.ino
diff --git a/lib/BME280/keywords.txt b/libraries/BME280/keywords.txt
similarity index 100%
rename from lib/BME280/keywords.txt
rename to libraries/BME280/keywords.txt
diff --git a/lib/BME280/library.properties b/libraries/BME280/library.properties
similarity index 100%
rename from lib/BME280/library.properties
rename to libraries/BME280/library.properties
diff --git a/lib/ESP8266TrueRandom/.gitignore b/libraries/ESP8266TrueRandom/.gitignore
similarity index 100%
rename from lib/ESP8266TrueRandom/.gitignore
rename to libraries/ESP8266TrueRandom/.gitignore
diff --git a/lib/ESP8266TrueRandom/ESP8266TrueRandom.cpp b/libraries/ESP8266TrueRandom/ESP8266TrueRandom.cpp
similarity index 100%
rename from lib/ESP8266TrueRandom/ESP8266TrueRandom.cpp
rename to libraries/ESP8266TrueRandom/ESP8266TrueRandom.cpp
diff --git a/lib/ESP8266TrueRandom/ESP8266TrueRandom.h b/libraries/ESP8266TrueRandom/ESP8266TrueRandom.h
similarity index 100%
rename from lib/ESP8266TrueRandom/ESP8266TrueRandom.h
rename to libraries/ESP8266TrueRandom/ESP8266TrueRandom.h
diff --git a/lib/ESP8266TrueRandom/LICENSE b/libraries/ESP8266TrueRandom/LICENSE
similarity index 100%
rename from lib/ESP8266TrueRandom/LICENSE
rename to libraries/ESP8266TrueRandom/LICENSE
diff --git a/lib/ESP8266TrueRandom/README.md b/libraries/ESP8266TrueRandom/README.md
similarity index 100%
rename from lib/ESP8266TrueRandom/README.md
rename to libraries/ESP8266TrueRandom/README.md
diff --git a/lib/ESP8266TrueRandom/examples/Benchmark/Benchmark.ino b/libraries/ESP8266TrueRandom/examples/Benchmark/Benchmark.ino
similarity index 100%
rename from lib/ESP8266TrueRandom/examples/Benchmark/Benchmark.ino
rename to libraries/ESP8266TrueRandom/examples/Benchmark/Benchmark.ino
diff --git a/lib/ESP8266TrueRandom/examples/Die/Die.ino b/libraries/ESP8266TrueRandom/examples/Die/Die.ino
similarity index 100%
rename from lib/ESP8266TrueRandom/examples/Die/Die.ino
rename to libraries/ESP8266TrueRandom/examples/Die/Die.ino
diff --git a/lib/ESP8266TrueRandom/examples/Magic8Ball/Magic8Ball.ino b/libraries/ESP8266TrueRandom/examples/Magic8Ball/Magic8Ball.ino
similarity index 100%
rename from lib/ESP8266TrueRandom/examples/Magic8Ball/Magic8Ball.ino
rename to libraries/ESP8266TrueRandom/examples/Magic8Ball/Magic8Ball.ino
diff --git a/lib/ESP8266TrueRandom/examples/SetRandomSeed/SetRandomSeed.ino b/libraries/ESP8266TrueRandom/examples/SetRandomSeed/SetRandomSeed.ino
similarity index 100%
rename from lib/ESP8266TrueRandom/examples/SetRandomSeed/SetRandomSeed.ino
rename to libraries/ESP8266TrueRandom/examples/SetRandomSeed/SetRandomSeed.ino
diff --git a/lib/ESP8266TrueRandom/examples/Uuid/Uuid.ino b/libraries/ESP8266TrueRandom/examples/Uuid/Uuid.ino
similarity index 100%
rename from lib/ESP8266TrueRandom/examples/Uuid/Uuid.ino
rename to libraries/ESP8266TrueRandom/examples/Uuid/Uuid.ino
diff --git a/lib/ESP8266TrueRandom/keywords.txt b/libraries/ESP8266TrueRandom/keywords.txt
similarity index 100%
rename from lib/ESP8266TrueRandom/keywords.txt
rename to libraries/ESP8266TrueRandom/keywords.txt
diff --git a/lib/Time/DateStrings.cpp b/libraries/Time/DateStrings.cpp
similarity index 100%
rename from lib/Time/DateStrings.cpp
rename to libraries/Time/DateStrings.cpp
diff --git a/lib/Time/Readme.txt b/libraries/Time/Readme.txt
similarity index 100%
rename from lib/Time/Readme.txt
rename to libraries/Time/Readme.txt
diff --git a/lib/Time/Time.cpp b/libraries/Time/Time.cpp
similarity index 100%
rename from lib/Time/Time.cpp
rename to libraries/Time/Time.cpp
diff --git a/lib/Time/Time.h b/libraries/Time/Time.h
similarity index 100%
rename from lib/Time/Time.h
rename to libraries/Time/Time.h
diff --git a/lib/Time/TimeLib.h b/libraries/Time/TimeLib.h
similarity index 100%
rename from lib/Time/TimeLib.h
rename to libraries/Time/TimeLib.h
diff --git a/lib/Time/examples/Processing/SyncArduinoClock/SyncArduinoClock.pde b/libraries/Time/examples/Processing/SyncArduinoClock/SyncArduinoClock.pde
similarity index 100%
rename from lib/Time/examples/Processing/SyncArduinoClock/SyncArduinoClock.pde
rename to libraries/Time/examples/Processing/SyncArduinoClock/SyncArduinoClock.pde
diff --git a/lib/Time/examples/Processing/SyncArduinoClock/readme.txt b/libraries/Time/examples/Processing/SyncArduinoClock/readme.txt
similarity index 100%
rename from lib/Time/examples/Processing/SyncArduinoClock/readme.txt
rename to libraries/Time/examples/Processing/SyncArduinoClock/readme.txt
diff --git a/lib/Time/examples/TimeArduinoDue/TimeArduinoDue.ino b/libraries/Time/examples/TimeArduinoDue/TimeArduinoDue.ino
similarity index 100%
rename from lib/Time/examples/TimeArduinoDue/TimeArduinoDue.ino
rename to libraries/Time/examples/TimeArduinoDue/TimeArduinoDue.ino
diff --git a/lib/Time/examples/TimeGPS/TimeGPS.ino b/libraries/Time/examples/TimeGPS/TimeGPS.ino
similarity index 100%
rename from lib/Time/examples/TimeGPS/TimeGPS.ino
rename to libraries/Time/examples/TimeGPS/TimeGPS.ino
diff --git a/lib/Time/examples/TimeNTP/TimeNTP.ino b/libraries/Time/examples/TimeNTP/TimeNTP.ino
similarity index 100%
rename from lib/Time/examples/TimeNTP/TimeNTP.ino
rename to libraries/Time/examples/TimeNTP/TimeNTP.ino
diff --git a/lib/Time/examples/TimeNTP_ESP8266WiFi/TimeNTP_ESP8266WiFi.ino b/libraries/Time/examples/TimeNTP_ESP8266WiFi/TimeNTP_ESP8266WiFi.ino
similarity index 100%
rename from lib/Time/examples/TimeNTP_ESP8266WiFi/TimeNTP_ESP8266WiFi.ino
rename to libraries/Time/examples/TimeNTP_ESP8266WiFi/TimeNTP_ESP8266WiFi.ino
diff --git a/lib/Time/examples/TimeRTC/TimeRTC.ino b/libraries/Time/examples/TimeRTC/TimeRTC.ino
similarity index 100%
rename from lib/Time/examples/TimeRTC/TimeRTC.ino
rename to libraries/Time/examples/TimeRTC/TimeRTC.ino
diff --git a/lib/Time/examples/TimeRTCLog/TimeRTCLog.ino b/libraries/Time/examples/TimeRTCLog/TimeRTCLog.ino
similarity index 100%
rename from lib/Time/examples/TimeRTCLog/TimeRTCLog.ino
rename to libraries/Time/examples/TimeRTCLog/TimeRTCLog.ino
diff --git a/lib/Time/examples/TimeRTCSet/TimeRTCSet.ino b/libraries/Time/examples/TimeRTCSet/TimeRTCSet.ino
similarity index 100%
rename from lib/Time/examples/TimeRTCSet/TimeRTCSet.ino
rename to libraries/Time/examples/TimeRTCSet/TimeRTCSet.ino
diff --git a/lib/Time/examples/TimeSerial/TimeSerial.ino b/libraries/Time/examples/TimeSerial/TimeSerial.ino
similarity index 100%
rename from lib/Time/examples/TimeSerial/TimeSerial.ino
rename to libraries/Time/examples/TimeSerial/TimeSerial.ino
diff --git a/lib/Time/examples/TimeSerialDateStrings/TimeSerialDateStrings.ino b/libraries/Time/examples/TimeSerialDateStrings/TimeSerialDateStrings.ino
similarity index 100%
rename from lib/Time/examples/TimeSerialDateStrings/TimeSerialDateStrings.ino
rename to libraries/Time/examples/TimeSerialDateStrings/TimeSerialDateStrings.ino
diff --git a/lib/Time/examples/TimeTeensy3/TimeTeensy3.ino b/libraries/Time/examples/TimeTeensy3/TimeTeensy3.ino
similarity index 100%
rename from lib/Time/examples/TimeTeensy3/TimeTeensy3.ino
rename to libraries/Time/examples/TimeTeensy3/TimeTeensy3.ino
diff --git a/lib/Time/keywords.txt b/libraries/Time/keywords.txt
similarity index 100%
rename from lib/Time/keywords.txt
rename to libraries/Time/keywords.txt
diff --git a/lib/Time/library.json b/libraries/Time/library.json
similarity index 100%
rename from lib/Time/library.json
rename to libraries/Time/library.json
diff --git a/lib/Time/library.properties b/libraries/Time/library.properties
similarity index 100%
rename from lib/Time/library.properties
rename to libraries/Time/library.properties
diff --git a/lib/TinyGPS++/TinyGPS++.cpp b/libraries/TinyGPS++/TinyGPS++.cpp
similarity index 100%
rename from lib/TinyGPS++/TinyGPS++.cpp
rename to libraries/TinyGPS++/TinyGPS++.cpp
diff --git a/lib/TinyGPS++/TinyGPS++.h b/libraries/TinyGPS++/TinyGPS++.h
similarity index 100%
rename from lib/TinyGPS++/TinyGPS++.h
rename to libraries/TinyGPS++/TinyGPS++.h
diff --git a/lib/TinyGPS++/examples/BasicExample/BasicExample.ino b/libraries/TinyGPS++/examples/BasicExample/BasicExample.ino
similarity index 100%
rename from lib/TinyGPS++/examples/BasicExample/BasicExample.ino
rename to libraries/TinyGPS++/examples/BasicExample/BasicExample.ino
diff --git a/lib/TinyGPS++/examples/DeviceExample/DeviceExample.ino b/libraries/TinyGPS++/examples/DeviceExample/DeviceExample.ino
similarity index 100%
rename from lib/TinyGPS++/examples/DeviceExample/DeviceExample.ino
rename to libraries/TinyGPS++/examples/DeviceExample/DeviceExample.ino
diff --git a/lib/TinyGPS++/examples/FullExample/FullExample.ino b/libraries/TinyGPS++/examples/FullExample/FullExample.ino
similarity index 100%
rename from lib/TinyGPS++/examples/FullExample/FullExample.ino
rename to libraries/TinyGPS++/examples/FullExample/FullExample.ino
diff --git a/lib/TinyGPS++/examples/KitchenSink/KitchenSink.ino b/libraries/TinyGPS++/examples/KitchenSink/KitchenSink.ino
similarity index 100%
rename from lib/TinyGPS++/examples/KitchenSink/KitchenSink.ino
rename to libraries/TinyGPS++/examples/KitchenSink/KitchenSink.ino
diff --git a/lib/TinyGPS++/examples/SatElevTracker/SatElevTracker.ino b/libraries/TinyGPS++/examples/SatElevTracker/SatElevTracker.ino
similarity index 100%
rename from lib/TinyGPS++/examples/SatElevTracker/SatElevTracker.ino
rename to libraries/TinyGPS++/examples/SatElevTracker/SatElevTracker.ino
diff --git a/lib/TinyGPS++/examples/SatElevTracker/sample_satellite_elevation_log.txt b/libraries/TinyGPS++/examples/SatElevTracker/sample_satellite_elevation_log.txt
similarity index 100%
rename from lib/TinyGPS++/examples/SatElevTracker/sample_satellite_elevation_log.txt
rename to libraries/TinyGPS++/examples/SatElevTracker/sample_satellite_elevation_log.txt
diff --git a/lib/TinyGPS++/examples/SatelliteTracker/SatelliteTracker.ino b/libraries/TinyGPS++/examples/SatelliteTracker/SatelliteTracker.ino
similarity index 100%
rename from lib/TinyGPS++/examples/SatelliteTracker/SatelliteTracker.ino
rename to libraries/TinyGPS++/examples/SatelliteTracker/SatelliteTracker.ino
diff --git a/lib/TinyGPS++/examples/UsingCustomFields/UsingCustomFields.ino b/libraries/TinyGPS++/examples/UsingCustomFields/UsingCustomFields.ino
similarity index 100%
rename from lib/TinyGPS++/examples/UsingCustomFields/UsingCustomFields.ino
rename to libraries/TinyGPS++/examples/UsingCustomFields/UsingCustomFields.ino
diff --git a/lib/TinyGPS++/keywords.txt b/libraries/TinyGPS++/keywords.txt
similarity index 100%
rename from lib/TinyGPS++/keywords.txt
rename to libraries/TinyGPS++/keywords.txt
diff --git a/LICENSE b/mobile-sensebox/LICENSE
similarity index 100%
rename from LICENSE
rename to mobile-sensebox/LICENSE
diff --git a/README.md b/mobile-sensebox/README.md
similarity index 100%
rename from README.md
rename to mobile-sensebox/README.md
diff --git a/TelnetPrint.h b/mobile-sensebox/TelnetPrint.h
similarity index 100%
rename from TelnetPrint.h
rename to mobile-sensebox/TelnetPrint.h
diff --git a/api.h b/mobile-sensebox/api.h
similarity index 100%
rename from api.h
rename to mobile-sensebox/api.h
diff --git a/box.jpg b/mobile-sensebox/box.jpg
similarity index 100%
rename from box.jpg
rename to mobile-sensebox/box.jpg
diff --git a/config.h b/mobile-sensebox/config.h
similarity index 85%
rename from config.h
rename to mobile-sensebox/config.h
index cb3de61..4a5ab9b 100644
--- a/config.h
+++ b/mobile-sensebox/config.h
@@ -23,11 +23,9 @@
 #define GPS_INTERVAL 1000 // update interval of the gps device in ms
 
 /* API (openSenseMap) */
-#define API_ENDPOINT "api.osem.vo1d.space"
-// SHA1 of the API SSL cert
-#define API_FINGERPRINT "A2 38 74 C7 B0 71 07 D4 2A 1C A5 6D 0D 05 3E 0A 90 68 A5 CB"
-#define API_KEY "XXXXXXXXXXX"
+#define API_ENDPOINT "ingress.osem.vo1d.space"
 #define ID_BOX "57c7f3291421551100bf13c8"
 #define ID_SENSOR_WIFI_APS "57c7f3291421551100bf13ca"
 #define ID_SENSOR_WIFI_NET "57cdd4ce1421551100bf17c5"
 #define ID_SENSOR_WIFI_OPEN "57cdd4ce1421551100bf17c6"
+
diff --git a/gps.h b/mobile-sensebox/gps.h
similarity index 98%
rename from gps.h
rename to mobile-sensebox/gps.h
index bc3c1f9..b0dcb37 100644
--- a/gps.h
+++ b/mobile-sensebox/gps.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "lib/TinyGPS++/TinyGPS++.h"
-#include "lib/Time/Time.h"
+#include <TinyGPS++.h>
+#include <Time.h>
 #include "config.h"
 
 class Gps {
diff --git a/mobile-sensebox.ino b/mobile-sensebox/mobile-sensebox.ino
similarity index 99%
rename from mobile-sensebox.ino
rename to mobile-sensebox/mobile-sensebox.ino
index e0197a9..30f40c0 100644
--- a/mobile-sensebox.ino
+++ b/mobile-sensebox/mobile-sensebox.ino
@@ -1,4 +1,4 @@
-#include "lib/TinyGPS++/TinyGPS++.h"
+#include <TinyGPS++.h>
 #include "lib/BME280/BME280I2C.h"
 #include "config.h"
 #include "gps.h"
diff --git a/storage.h b/mobile-sensebox/storage.h
similarity index 97%
rename from storage.h
rename to mobile-sensebox/storage.h
index f3406e0..79d1fcf 100644
--- a/storage.h
+++ b/mobile-sensebox/storage.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <FS.h>
-#include "lib/ESP8266TrueRandom/ESP8266TrueRandom.h"
+#include <ESP8266TrueRandom.h>
 #include "config.h"
 #include "streampipe.h"
 
diff --git a/streampipe.h b/mobile-sensebox/streampipe.h
similarity index 100%
rename from streampipe.h
rename to mobile-sensebox/streampipe.h
diff --git a/ublox-neo7m-config_10hz-europe.txt b/mobile-sensebox/ublox-neo7m-config_10hz-europe.txt
similarity index 100%
rename from ublox-neo7m-config_10hz-europe.txt
rename to mobile-sensebox/ublox-neo7m-config_10hz-europe.txt
diff --git a/wifi.h b/mobile-sensebox/wifi.h
similarity index 100%
rename from wifi.h
rename to mobile-sensebox/wifi.h