diff --git a/slsDetectorServers/matterhornServer/CMakeLists.txt b/slsDetectorServers/matterhornServer/CMakeLists.txt
index d99cc6e91..994dda7b8 100644
--- a/slsDetectorServers/matterhornServer/CMakeLists.txt
+++ b/slsDetectorServers/matterhornServer/CMakeLists.txt
@@ -2,25 +2,28 @@
 
 set(MATTERHORN_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/src/MatterhornApp.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/SPICommunication.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/HelperFunctions.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/communication/SPICommunication.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/HelperFunctions.cpp
 )
 
 set(MATTERHORN_INCLUDE_DIRS
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/src
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/communication
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/utils
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/defs
     ${CMAKE_CURRENT_SOURCE_DIR}/../../slsSupportLib/include
     ${CMAKE_CURRENT_SOURCE_DIR}/../slsDetectorServer_cpp/include
 )
 
 if(SLS_USE_SIMULATOR)
-    list(APPEND MATTERHORN_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/VirtualMatterhornServer.cpp ${CMAKE_CURRENT_SOURCE_DIR}/include/VirtualMatterhornServerImpl.cpp)
+    list(APPEND MATTERHORN_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/VirtualMatterhornServer.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/VirtualMatterhornServerImpl.cpp)
 
-    set(MATTERHORN_SERVER_HEADER "VirtualMatterhornServer.h")
+    set(MATTERHORN_SERVER_HEADER "VirtualMatterhornServer.hpp")
 
     add_executable(matterhornDetectorServer_virtual ${MATTERHORN_SOURCES})
 
     target_compile_definitions(matterhornDetectorServer_virtual PRIVATE
-        MATTERHORN_SERVER_HEADER=<VirtualMatterhornServer.h>
+        MATTERHORN_SERVER_HEADER=<VirtualMatterhornServer.hpp>
         MATTERHORN_SERVER_CLASS=VirtualMatterhornServer
     )
 
@@ -46,7 +49,7 @@ if(SLS_USE_SIMULATOR)
 endif() # maybe better to have a else if build with simulators on one always uses the virtual server in MatterhornApp 
 
 if(SLS_USE_MATTERHORN) 
-    list(APPEND MATTERHORN_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/MatterhornServer.cpp ${CMAKE_CURRENT_SOURCE_DIR}/include/MatterhornServerImpl.cpp)
+    list(APPEND MATTERHORN_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/MatterhornServer.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/MatterhornServerImpl.cpp)
 
     if(CMAKE_TOOLCHAIN_FILE AND NOT CMAKE_TOOLCHAIN_FILE STREQUAL "") 
         set(CROSS_COMPILE TRUE)
@@ -68,7 +71,7 @@ if(SLS_USE_MATTERHORN)
     endif()
 
     target_compile_definitions(matterhornDetectorServer PRIVATE
-        MATTERHORN_SERVER_HEADER=<MatterhornServer.h>
+        MATTERHORN_SERVER_HEADER=<MatterhornServer.hpp>
         MATTERHORN_SERVER_CLASS=MatterhornServer
     )
 
diff --git a/slsDetectorServers/matterhornServer/include/BaseMatterhornServer.h b/slsDetectorServers/matterhornServer/src/BaseMatterhornServer.hpp
similarity index 97%
rename from slsDetectorServers/matterhornServer/include/BaseMatterhornServer.h
rename to slsDetectorServers/matterhornServer/src/BaseMatterhornServer.hpp
index c69269ce5..87a4aff1c 100644
--- a/slsDetectorServers/matterhornServer/include/BaseMatterhornServer.h
+++ b/slsDetectorServers/matterhornServer/src/BaseMatterhornServer.hpp
@@ -1,8 +1,7 @@
 #pragma once
-#include "DetectorServer.h"
-#include "TCPInterface.h"
+#include "DetectorServer.hpp"
+#include "TCPInterface.hpp"
 #include "fmt/format.h"
-#include "helpers/Helpers.hpp"
 #include "sls/logger.h"
 #include "sls/network_utils.h"
 #include "sls/sls_detector_defs.h"
diff --git a/slsDetectorServers/matterhornServer/include/BaseMatterhornServerImpl.hpp b/slsDetectorServers/matterhornServer/src/BaseMatterhornServerImpl.hpp
similarity index 98%
rename from slsDetectorServers/matterhornServer/include/BaseMatterhornServerImpl.hpp
rename to slsDetectorServers/matterhornServer/src/BaseMatterhornServerImpl.hpp
index a47954ac7..6cf5474fc 100644
--- a/slsDetectorServers/matterhornServer/include/BaseMatterhornServerImpl.hpp
+++ b/slsDetectorServers/matterhornServer/src/BaseMatterhornServerImpl.hpp
@@ -1,12 +1,12 @@
 #pragma once
 #include "ArmBusCommunication.hpp"
 #include "DetectorServerImpl.hpp"
-#include "HelperFunctions.hpp"
-#include "MatterhornDefs.hpp"
 #include "MemoryModel.hpp"
-#include "RegisterDefs.hpp"
-#include "SPICommunication.h"
+#include "communication/SPICommunication.hpp"
+#include "defs/MatterhornDefs.hpp"
+#include "defs/RegisterDefs.hpp"
 #include "sls/versionAPI.h"
+#include "utils/HelperFunctions.hpp"
 #include <cstdint>
 #include <string>
 
diff --git a/slsDetectorServers/matterhornServer/src/MatterhornApp.cpp b/slsDetectorServers/matterhornServer/src/MatterhornApp.cpp
index c97a10354..3fe751214 100644
--- a/slsDetectorServers/matterhornServer/src/MatterhornApp.cpp
+++ b/slsDetectorServers/matterhornServer/src/MatterhornApp.cpp
@@ -1,4 +1,4 @@
-#include "CommandLineOptions.h"
+#include "CommandLineOptions.hpp"
 #include MATTERHORN_SERVER_HEADER
 #include "sls/logger.h"
 #include "sls/sls_detector_exceptions.h"
diff --git a/slsDetectorServers/matterhornServer/src/MatterhornServer.cpp b/slsDetectorServers/matterhornServer/src/MatterhornServer.cpp
index a1232a0ad..648754a49 100644
--- a/slsDetectorServers/matterhornServer/src/MatterhornServer.cpp
+++ b/slsDetectorServers/matterhornServer/src/MatterhornServer.cpp
@@ -1,4 +1,4 @@
-#include "MatterhornServer.h"
+#include "MatterhornServer.hpp"
 
 namespace sls {
 
diff --git a/slsDetectorServers/matterhornServer/include/MatterhornServer.h b/slsDetectorServers/matterhornServer/src/MatterhornServer.hpp
similarity index 92%
rename from slsDetectorServers/matterhornServer/include/MatterhornServer.h
rename to slsDetectorServers/matterhornServer/src/MatterhornServer.hpp
index e568c5e30..bcf1fa30f 100644
--- a/slsDetectorServers/matterhornServer/include/MatterhornServer.h
+++ b/slsDetectorServers/matterhornServer/src/MatterhornServer.hpp
@@ -1,7 +1,7 @@
 #pragma once
-#include "BaseMatterhornServer.h"
+#include "BaseMatterhornServer.hpp"
 #include "MatterhornServerImpl.hpp"
-#include "TCPInterface.h"
+#include "TCPInterface.hpp"
 #include "sls/sls_detector_defs.h"
 #include <array>
 #include <memory>
diff --git a/slsDetectorServers/matterhornServer/include/MatterhornServerImpl.cpp b/slsDetectorServers/matterhornServer/src/MatterhornServerImpl.cpp
similarity index 100%
rename from slsDetectorServers/matterhornServer/include/MatterhornServerImpl.cpp
rename to slsDetectorServers/matterhornServer/src/MatterhornServerImpl.cpp
diff --git a/slsDetectorServers/matterhornServer/include/MatterhornServerImpl.hpp b/slsDetectorServers/matterhornServer/src/MatterhornServerImpl.hpp
similarity index 100%
rename from slsDetectorServers/matterhornServer/include/MatterhornServerImpl.hpp
rename to slsDetectorServers/matterhornServer/src/MatterhornServerImpl.hpp
diff --git a/slsDetectorServers/matterhornServer/src/VirtualMatterhornServer.cpp b/slsDetectorServers/matterhornServer/src/VirtualMatterhornServer.cpp
index 2748a1abf..11471e281 100644
--- a/slsDetectorServers/matterhornServer/src/VirtualMatterhornServer.cpp
+++ b/slsDetectorServers/matterhornServer/src/VirtualMatterhornServer.cpp
@@ -1,4 +1,4 @@
-#include "VirtualMatterhornServer.h"
+#include "VirtualMatterhornServer.hpp"
 #include "helpers/Defs.hpp"
 #include "helpers/Helpers.hpp"
 #include "sls/ToString.h"
diff --git a/slsDetectorServers/matterhornServer/include/VirtualMatterhornServer.h b/slsDetectorServers/matterhornServer/src/VirtualMatterhornServer.hpp
similarity index 95%
rename from slsDetectorServers/matterhornServer/include/VirtualMatterhornServer.h
rename to slsDetectorServers/matterhornServer/src/VirtualMatterhornServer.hpp
index b1b45e3a0..5d97923b5 100644
--- a/slsDetectorServers/matterhornServer/include/VirtualMatterhornServer.h
+++ b/slsDetectorServers/matterhornServer/src/VirtualMatterhornServer.hpp
@@ -1,5 +1,5 @@
 
-#include "BaseMatterhornServer.h"
+#include "BaseMatterhornServer.hpp"
 #include "VirtualMatterhornServerImpl.hpp"
 
 namespace sls {
diff --git a/slsDetectorServers/matterhornServer/include/VirtualMatterhornServerImpl.cpp b/slsDetectorServers/matterhornServer/src/VirtualMatterhornServerImpl.cpp
similarity index 100%
rename from slsDetectorServers/matterhornServer/include/VirtualMatterhornServerImpl.cpp
rename to slsDetectorServers/matterhornServer/src/VirtualMatterhornServerImpl.cpp
diff --git a/slsDetectorServers/matterhornServer/include/VirtualMatterhornServerImpl.hpp b/slsDetectorServers/matterhornServer/src/VirtualMatterhornServerImpl.hpp
similarity index 100%
rename from slsDetectorServers/matterhornServer/include/VirtualMatterhornServerImpl.hpp
rename to slsDetectorServers/matterhornServer/src/VirtualMatterhornServerImpl.hpp
diff --git a/slsDetectorServers/matterhornServer/src/SPICommunication.cpp b/slsDetectorServers/matterhornServer/src/communication/SPICommunication.cpp
similarity index 99%
rename from slsDetectorServers/matterhornServer/src/SPICommunication.cpp
rename to slsDetectorServers/matterhornServer/src/communication/SPICommunication.cpp
index 8460714e0..8feaffa07 100644
--- a/slsDetectorServers/matterhornServer/src/SPICommunication.cpp
+++ b/slsDetectorServers/matterhornServer/src/communication/SPICommunication.cpp
@@ -1,4 +1,4 @@
-#include "SPICommunication.h"
+#include "SPICommunication.hpp"
 #include <algorithm>
 #include <fcntl.h>
 #include <linux/spi/spidev.h>
diff --git a/slsDetectorServers/matterhornServer/include/SPICommunication.h b/slsDetectorServers/matterhornServer/src/communication/SPICommunication.hpp
similarity index 99%
rename from slsDetectorServers/matterhornServer/include/SPICommunication.h
rename to slsDetectorServers/matterhornServer/src/communication/SPICommunication.hpp
index e10225c92..f74805db9 100644
--- a/slsDetectorServers/matterhornServer/include/SPICommunication.h
+++ b/slsDetectorServers/matterhornServer/src/communication/SPICommunication.hpp
@@ -1,7 +1,7 @@
-#include "MatterhornDefs.hpp"
 #include "MemoryModel.hpp"
-#include "SPIRegisterDefs.hpp"
 #include "SPIRegisterHelperStructs.hpp"
+#include "defs/MatterhornDefs.hpp"
+#include "defs/SPIRegisterDefs.hpp"
 #include "fmt/format.h"
 #include "sls/logger.h"
 #include "sls/sls_detector_exceptions.h"
diff --git a/slsDetectorServers/matterhornServer/include/SPIRegisterHelperStructs.hpp b/slsDetectorServers/matterhornServer/src/communication/SPIRegisterHelperStructs.hpp
similarity index 100%
rename from slsDetectorServers/matterhornServer/include/SPIRegisterHelperStructs.hpp
rename to slsDetectorServers/matterhornServer/src/communication/SPIRegisterHelperStructs.hpp
diff --git a/slsDetectorServers/matterhornServer/include/MatterhornDefs.hpp b/slsDetectorServers/matterhornServer/src/defs/MatterhornDefs.hpp
similarity index 100%
rename from slsDetectorServers/matterhornServer/include/MatterhornDefs.hpp
rename to slsDetectorServers/matterhornServer/src/defs/MatterhornDefs.hpp
diff --git a/slsDetectorServers/matterhornServer/include/RegisterDefs.hpp b/slsDetectorServers/matterhornServer/src/defs/RegisterDefs.hpp
similarity index 100%
rename from slsDetectorServers/matterhornServer/include/RegisterDefs.hpp
rename to slsDetectorServers/matterhornServer/src/defs/RegisterDefs.hpp
diff --git a/slsDetectorServers/matterhornServer/include/SPIRegisterDefs.hpp b/slsDetectorServers/matterhornServer/src/defs/SPIRegisterDefs.hpp
similarity index 100%
rename from slsDetectorServers/matterhornServer/include/SPIRegisterDefs.hpp
rename to slsDetectorServers/matterhornServer/src/defs/SPIRegisterDefs.hpp
diff --git a/slsDetectorServers/matterhornServer/src/HelperFunctions.cpp b/slsDetectorServers/matterhornServer/src/utils/HelperFunctions.cpp
similarity index 100%
rename from slsDetectorServers/matterhornServer/src/HelperFunctions.cpp
rename to slsDetectorServers/matterhornServer/src/utils/HelperFunctions.cpp
diff --git a/slsDetectorServers/matterhornServer/include/HelperFunctions.hpp b/slsDetectorServers/matterhornServer/src/utils/HelperFunctions.hpp
similarity index 100%
rename from slsDetectorServers/matterhornServer/include/HelperFunctions.hpp
rename to slsDetectorServers/matterhornServer/src/utils/HelperFunctions.hpp
diff --git a/slsDetectorServers/matterhornServer/include/utils/type_traits.hpp b/slsDetectorServers/matterhornServer/src/utils/type_traits.hpp
similarity index 100%
rename from slsDetectorServers/matterhornServer/include/utils/type_traits.hpp
rename to slsDetectorServers/matterhornServer/src/utils/type_traits.hpp
diff --git a/slsDetectorServers/matterhornServer/tests/CMakeLists.txt b/slsDetectorServers/matterhornServer/tests/CMakeLists.txt
index 5950f8994..e4b6e4cfb 100644
--- a/slsDetectorServers/matterhornServer/tests/CMakeLists.txt
+++ b/slsDetectorServers/matterhornServer/tests/CMakeLists.txt
@@ -1,9 +1,9 @@
 
 target_sources(tests PRIVATE 
     ${CMAKE_CURRENT_SOURCE_DIR}/test-HelperFunctions.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/../src/HelperFunctions.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/../src/utils/HelperFunctions.cpp
 )
 
 target_include_directories(tests 
     PUBLIC 
-        "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>")
\ No newline at end of file
+        "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../src/utils>")
diff --git a/slsDetectorServers/slsDetectorServer_cpp/include/CommandLineOptions.h b/slsDetectorServers/slsDetectorServer_cpp/include/CommandLineOptions.hpp
similarity index 100%
rename from slsDetectorServers/slsDetectorServer_cpp/include/CommandLineOptions.h
rename to slsDetectorServers/slsDetectorServer_cpp/include/CommandLineOptions.hpp
diff --git a/slsDetectorServers/slsDetectorServer_cpp/include/DetectorServer.h b/slsDetectorServers/slsDetectorServer_cpp/include/DetectorServer.hpp
similarity index 99%
rename from slsDetectorServers/slsDetectorServer_cpp/include/DetectorServer.h
rename to slsDetectorServers/slsDetectorServer_cpp/include/DetectorServer.hpp
index 3daf7cd01..6bdbc22c5 100644
--- a/slsDetectorServers/slsDetectorServer_cpp/include/DetectorServer.h
+++ b/slsDetectorServers/slsDetectorServer_cpp/include/DetectorServer.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include "DetectorServerImpl.hpp"
-#include "TCPInterface.h"
+#include "TCPInterface.hpp"
 #include "helpers/Helpers.hpp"
 #include "sls/logger.h"
 #include "sls/network_utils.h"
diff --git a/slsDetectorServers/slsDetectorServer_cpp/include/TCPInterface.h b/slsDetectorServers/slsDetectorServer_cpp/include/TCPInterface.hpp
similarity index 100%
rename from slsDetectorServers/slsDetectorServer_cpp/include/TCPInterface.h
rename to slsDetectorServers/slsDetectorServer_cpp/include/TCPInterface.hpp
diff --git a/slsDetectorServers/slsDetectorServer_cpp/src/CommandLineOptions.cpp b/slsDetectorServers/slsDetectorServer_cpp/src/CommandLineOptions.cpp
index 49d6a016b..1b0429c0a 100644
--- a/slsDetectorServers/slsDetectorServer_cpp/src/CommandLineOptions.cpp
+++ b/slsDetectorServers/slsDetectorServer_cpp/src/CommandLineOptions.cpp
@@ -1,4 +1,4 @@
-#include "CommandLineOptions.h"
+#include "CommandLineOptions.hpp"
 #include "sls/ToString.h"
 #include "sls/sls_detector_exceptions.h"
 
diff --git a/slsDetectorServers/slsDetectorServer_cpp/src/TCPInterface.cpp b/slsDetectorServers/slsDetectorServer_cpp/src/TCPInterface.cpp
index 665a7f0ac..2e7468060 100644
--- a/slsDetectorServers/slsDetectorServer_cpp/src/TCPInterface.cpp
+++ b/slsDetectorServers/slsDetectorServer_cpp/src/TCPInterface.cpp
@@ -1,4 +1,4 @@
-#include "TCPInterface.h"
+#include "TCPInterface.hpp"
 
 #include "fmt/format.h"
 #include "sls/logger.h"