diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 62faa60..230d27d 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -3,7 +3,7 @@
         {
             "name": "Win32",
             "includePath": [
-				"${workspaceFolder}/**",
+				"${workspaceFolder}/src/**",
 				"${workspaceFolder}/../libraries/SIM808",
 				"${workspaceFolder}/../libraries/uDS3231",
 				"${workspaceFolder}/../libraries/E24",
diff --git a/Alerts.cpp b/src/Alerts.cpp
similarity index 100%
rename from Alerts.cpp
rename to src/Alerts.cpp
diff --git a/Alerts.h b/src/Alerts.h
similarity index 100%
rename from Alerts.h
rename to src/Alerts.h
diff --git a/Config.cpp b/src/Config.cpp
similarity index 100%
rename from Config.cpp
rename to src/Config.cpp
diff --git a/Config.h b/src/Config.h
similarity index 100%
rename from Config.h
rename to src/Config.h
diff --git a/Core.cpp b/src/Core.cpp
similarity index 100%
rename from Core.cpp
rename to src/Core.cpp
diff --git a/Core.h b/src/Core.h
similarity index 100%
rename from Core.h
rename to src/Core.h
diff --git a/Debug.cpp b/src/Debug.cpp
similarity index 100%
rename from Debug.cpp
rename to src/Debug.cpp
diff --git a/Debug.h b/src/Debug.h
similarity index 100%
rename from Debug.h
rename to src/Debug.h
diff --git a/Flash.cpp b/src/Flash.cpp
similarity index 100%
rename from Flash.cpp
rename to src/Flash.cpp
diff --git a/Flash.h b/src/Flash.h
similarity index 100%
rename from Flash.h
rename to src/Flash.h
diff --git a/Gps.cpp b/src/Gps.cpp
similarity index 100%
rename from Gps.cpp
rename to src/Gps.cpp
diff --git a/Gps.h b/src/Gps.h
similarity index 100%
rename from Gps.h
rename to src/Gps.h
diff --git a/GpsTracker.h b/src/GpsTracker.h
similarity index 100%
rename from GpsTracker.h
rename to src/GpsTracker.h
diff --git a/GpsTracker.ino b/src/GpsTracker.ino
similarity index 100%
rename from GpsTracker.ino
rename to src/GpsTracker.ino
diff --git a/Hardware.cpp b/src/Hardware.cpp
similarity index 100%
rename from Hardware.cpp
rename to src/Hardware.cpp
diff --git a/Hardware.h b/src/Hardware.h
similarity index 100%
rename from Hardware.h
rename to src/Hardware.h
diff --git a/Logging.cpp b/src/Logging.cpp
similarity index 100%
rename from Logging.cpp
rename to src/Logging.cpp
diff --git a/Logging.h b/src/Logging.h
similarity index 100%
rename from Logging.h
rename to src/Logging.h
diff --git a/MainUnit.cpp b/src/MainUnit.cpp
similarity index 100%
rename from MainUnit.cpp
rename to src/MainUnit.cpp
diff --git a/MainUnit.h b/src/MainUnit.h
similarity index 100%
rename from MainUnit.h
rename to src/MainUnit.h
diff --git a/Network.cpp b/src/Network.cpp
similarity index 100%
rename from Network.cpp
rename to src/Network.cpp
diff --git a/Network.h b/src/Network.h
similarity index 100%
rename from Network.h
rename to src/Network.h
diff --git a/NetworkPositionsBackup.cpp b/src/NetworkPositionsBackup.cpp
similarity index 100%
rename from NetworkPositionsBackup.cpp
rename to src/NetworkPositionsBackup.cpp
diff --git a/NetworkPositionsBackup.h b/src/NetworkPositionsBackup.h
similarity index 100%
rename from NetworkPositionsBackup.h
rename to src/NetworkPositionsBackup.h
diff --git a/NetworkPositionsConfig.h b/src/NetworkPositionsConfig.h
similarity index 100%
rename from NetworkPositionsConfig.h
rename to src/NetworkPositionsConfig.h
diff --git a/Pins.h b/src/Pins.h
similarity index 100%
rename from Pins.h
rename to src/Pins.h
diff --git a/Positions.cpp b/src/Positions.cpp
similarity index 100%
rename from Positions.cpp
rename to src/Positions.cpp
diff --git a/Positions.h b/src/Positions.h
similarity index 100%
rename from Positions.h
rename to src/Positions.h
diff --git a/PositionsBackup.cpp b/src/PositionsBackup.cpp
similarity index 100%
rename from PositionsBackup.cpp
rename to src/PositionsBackup.cpp
diff --git a/PositionsBackup.h b/src/PositionsBackup.h
similarity index 100%
rename from PositionsBackup.h
rename to src/PositionsBackup.h
diff --git a/Rtc.cpp b/src/Rtc.cpp
similarity index 100%
rename from Rtc.cpp
rename to src/Rtc.cpp
diff --git a/Rtc.h b/src/Rtc.h
similarity index 100%
rename from Rtc.h
rename to src/Rtc.h
diff --git a/SdCard.cpp b/src/SdCard.cpp
similarity index 100%
rename from SdCard.cpp
rename to src/SdCard.cpp
diff --git a/SdCard.h b/src/SdCard.h
similarity index 100%
rename from SdCard.h
rename to src/SdCard.h
diff --git a/SdPositionsBackup.cpp b/src/SdPositionsBackup.cpp
similarity index 100%
rename from SdPositionsBackup.cpp
rename to src/SdPositionsBackup.cpp
diff --git a/SdPositionsBackup.h b/src/SdPositionsBackup.h
similarity index 100%
rename from SdPositionsBackup.h
rename to src/SdPositionsBackup.h
diff --git a/SdPositionsConfig.cpp b/src/SdPositionsConfig.cpp
similarity index 100%
rename from SdPositionsConfig.cpp
rename to src/SdPositionsConfig.cpp
diff --git a/SdPositionsConfig.h b/src/SdPositionsConfig.h
similarity index 100%
rename from SdPositionsConfig.h
rename to src/SdPositionsConfig.h
diff --git a/Time2.cpp b/src/Time2.cpp
similarity index 100%
rename from Time2.cpp
rename to src/Time2.cpp
diff --git a/Time2.h b/src/Time2.h
similarity index 100%
rename from Time2.h
rename to src/Time2.h