diff --git a/CMakeLists.txt b/CMakeLists.txt
index c567f2d..4a9a760 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated Cmake Pico project file
-
 cmake_minimum_required(VERSION 3.13)
 
 set(CMAKE_C_STANDARD 11)
@@ -12,36 +10,12 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-volatile")
 set(PICO_SDK_PATH "/usr/share/pico-sdk")
 
 # Pull in Raspberry Pi Pico SDK (must be before project)
-include(pico_sdk_import.cmake)
+include("cmake/pico_sdk_import.cmake")
 
 project(gbmanager VERSION "1.0.0" LANGUAGES C CXX ASM)
 
-configure_file(config.h.in ${PROJECT_BINARY_DIR}/config.h)
 
 # Initialise the Raspberry Pi Pico SDK
 pico_sdk_init()
 
-# Add executable. Default name is the project name, version 0.1
-
-add_executable(gbmanager gbmanager.cpp lcd.cpp ds18b20.cpp relais.cpp)
-
-pico_set_program_name(gbmanager "gbmanager")
-pico_set_program_version(gbmanager "0.1")
-
-pico_enable_stdio_uart(gbmanager 1)
-pico_enable_stdio_usb(gbmanager 0)
-
-pico_generate_pio_header(gbmanager ${CMAKE_CURRENT_LIST_DIR}/ds18b20.pio)
-
-# Add the standard library to the build
-target_link_libraries(gbmanager pico_stdlib)
-
-# Add any user requested libraries
-target_link_libraries(gbmanager
-    hardware_i2c
-    hardware_gpio
-    hardware_pio
-)
-
-pico_add_extra_outputs(gbmanager)
-
+add_subdirectory(src)
\ No newline at end of file
diff --git a/pico_sdk_import.cmake b/cmake/pico_sdk_import.cmake
similarity index 100%
rename from pico_sdk_import.cmake
rename to cmake/pico_sdk_import.cmake
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..d2686e6
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,31 @@
+configure_file(config.h.in ${PROJECT_BINARY_DIR}/src/config.h)
+
+set(SOURCES
+    gbmanager.cpp
+    lcd.cpp
+    ds18b20.cpp
+    relais.cpp
+)
+
+# Add executable. Default name is the project name, version 0.1
+add_executable(gbmanager ${SOURCES})
+
+pico_set_program_name(gbmanager "gbmanager")
+pico_set_program_version(gbmanager ${PROJECT_VERSION})
+
+pico_enable_stdio_uart(gbmanager 1)
+pico_enable_stdio_usb(gbmanager 0)
+
+pico_generate_pio_header(gbmanager ${CMAKE_CURRENT_LIST_DIR}/ds18b20.pio)
+
+# Add the standard library to the build
+target_link_libraries(gbmanager pico_stdlib)
+
+# Add any user requested libraries
+target_link_libraries(gbmanager
+    hardware_i2c
+    hardware_gpio
+    hardware_pio
+)
+
+pico_add_extra_outputs(gbmanager)
diff --git a/config.h.in b/src/config.h.in
similarity index 100%
rename from config.h.in
rename to src/config.h.in
diff --git a/ds18b20.cpp b/src/ds18b20.cpp
similarity index 100%
rename from ds18b20.cpp
rename to src/ds18b20.cpp
diff --git a/ds18b20.h b/src/ds18b20.h
similarity index 100%
rename from ds18b20.h
rename to src/ds18b20.h
diff --git a/ds18b20.pio b/src/ds18b20.pio
similarity index 100%
rename from ds18b20.pio
rename to src/ds18b20.pio
diff --git a/gbmanager.cpp b/src/gbmanager.cpp
similarity index 100%
rename from gbmanager.cpp
rename to src/gbmanager.cpp
diff --git a/lcd.cpp b/src/lcd.cpp
similarity index 100%
rename from lcd.cpp
rename to src/lcd.cpp
diff --git a/lcd.h b/src/lcd.h
similarity index 100%
rename from lcd.h
rename to src/lcd.h
diff --git a/relais.cpp b/src/relais.cpp
similarity index 100%
rename from relais.cpp
rename to src/relais.cpp
diff --git a/relais.h b/src/relais.h
similarity index 100%
rename from relais.h
rename to src/relais.h