diff --git a/setup.sh b/setup.sh
deleted file mode 100755
index ff48677..0000000
--- a/setup.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-git submodule init
-git submodule update
-test -x .setup_hook.sh && ./.setup_hook.sh
-cd hardware/esp8266com/esp8266
-git submodule init
-git submodule update
-cd tools
-./get.py
-
diff --git a/ESPNTPServer/Config.cpp b/src/Config.cpp
similarity index 100%
rename from ESPNTPServer/Config.cpp
rename to src/Config.cpp
diff --git a/ESPNTPServer/Config.h b/src/Config.h
similarity index 100%
rename from ESPNTPServer/Config.h
rename to src/Config.h
diff --git a/ESPNTPServer/DialogInput_plain_10.h b/src/DialogInput_plain_10.h
similarity index 100%
rename from ESPNTPServer/DialogInput_plain_10.h
rename to src/DialogInput_plain_10.h
diff --git a/ESPNTPServer/Display.cpp b/src/Display.cpp
similarity index 100%
rename from ESPNTPServer/Display.cpp
rename to src/Display.cpp
diff --git a/ESPNTPServer/Display.h b/src/Display.h
similarity index 100%
rename from ESPNTPServer/Display.h
rename to src/Display.h
diff --git a/ESPNTPServer/ESPNTPServer.cpp b/src/ESPNTPServer.cpp
similarity index 100%
rename from ESPNTPServer/ESPNTPServer.cpp
rename to src/ESPNTPServer.cpp
diff --git a/ESPNTPServer/ESPNTPServer.h b/src/ESPNTPServer.h
similarity index 100%
rename from ESPNTPServer/ESPNTPServer.h
rename to src/ESPNTPServer.h
diff --git a/ESPNTPServer/ESPNTPServerVersion.h b/src/ESPNTPServerVersion.h
similarity index 100%
rename from ESPNTPServer/ESPNTPServerVersion.h
rename to src/ESPNTPServerVersion.h
diff --git a/ESPNTPServer/GPS.cpp b/src/GPS.cpp
similarity index 100%
rename from ESPNTPServer/GPS.cpp
rename to src/GPS.cpp
diff --git a/ESPNTPServer/GPS.h b/src/GPS.h
similarity index 100%
rename from ESPNTPServer/GPS.h
rename to src/GPS.h
diff --git a/ESPNTPServer/Log.h b/src/Log.h
similarity index 100%
rename from ESPNTPServer/Log.h
rename to src/Log.h
diff --git a/ESPNTPServer/NTP.cpp b/src/NTP.cpp
similarity index 100%
rename from ESPNTPServer/NTP.cpp
rename to src/NTP.cpp
diff --git a/ESPNTPServer/NTP.h b/src/NTP.h
similarity index 100%
rename from ESPNTPServer/NTP.h
rename to src/NTP.h
diff --git a/ESPNTPServer/WiFiSetup.cpp b/src/WiFiSetup.cpp
similarity index 100%
rename from ESPNTPServer/WiFiSetup.cpp
rename to src/WiFiSetup.cpp
diff --git a/ESPNTPServer/WiFiSetup.h b/src/WiFiSetup.h
similarity index 100%
rename from ESPNTPServer/WiFiSetup.h
rename to src/WiFiSetup.h
diff --git a/ESPNTPServer/WireUtils.cpp b/src/WireUtils.cpp
similarity index 100%
rename from ESPNTPServer/WireUtils.cpp
rename to src/WireUtils.cpp
diff --git a/ESPNTPServer/WireUtils.h b/src/WireUtils.h
similarity index 100%
rename from ESPNTPServer/WireUtils.h
rename to src/WireUtils.h