diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 31ddc3f..bc503e5 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -7,40 +7,16 @@ add_subdirectory(qwt)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
+file(GLOB_RECURSE SOURCES "*.[hc]pp")
+file(GLOB_RECURSE UI_SOURCES "*.ui")
 file(GLOB_RECURSE SIM_SOURCES "simulators/*.[hc]pp")
 file(GLOB_RECURSE SIM_UI "simulators/*.ui")
 
 set(PROJECT_SOURCES
+        ${SOURCES}
+        ${UI_SOURCES}
         ${SIM_SOURCES}
         ${SIM_UI}
-
-        simulator_base.h
-        simulator_base.cpp
-        helpers.h
-        helpers.cpp
-        IterableEnum.hpp
-        hex_spinbox.h
-        hex_spinbox.cpp
-        better_radiobutton.h
-        better_radiobutton.cpp
-        led.h
-        led.cpp
-        
-        can_transceive.h
-        can_transceive.cpp
-        can_transceive.ui
-
-        networkerror.h
-        networkerror.cpp
-        networkerror.ui
-
-        web_socket_wrapper.h
-        web_socket_wrapper.cpp
-
-        mainwindow.h
-        mainwindow.cpp
-        mainwindow.ui
-        main.cpp
 )
 
 if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
diff --git a/client/better_radiobutton.cpp b/client/better_radiobutton.cpp
index 1e37a6c..7c57457 100644
--- a/client/better_radiobutton.cpp
+++ b/client/better_radiobutton.cpp
@@ -1,4 +1,4 @@
-#include "better_radiobutton.h"
+#include "better_radiobutton.hpp"
 
 Better_Radiobutton::Better_Radiobutton(QWidget *parent) : QWidget{parent}, m_radiobuttons{}
 {
diff --git a/client/better_radiobutton.h b/client/better_radiobutton.hpp
similarity index 100%
rename from client/better_radiobutton.h
rename to client/better_radiobutton.hpp
diff --git a/client/can_transceive.cpp b/client/can_transceive.cpp
index 5966115..649466d 100644
--- a/client/can_transceive.cpp
+++ b/client/can_transceive.cpp
@@ -1,4 +1,4 @@
-#include "can_transceive.h"
+#include "can_transceive.hpp"
 #include "ui_can_transceive.h"
 
 Can_Transceive::Can_Transceive(QWidget *parent) : QWidget(parent), ui(new Ui::Can_Transceive)
diff --git a/client/can_transceive.h b/client/can_transceive.hpp
similarity index 96%
rename from client/can_transceive.h
rename to client/can_transceive.hpp
index 318d2f0..ded2332 100644
--- a/client/can_transceive.h
+++ b/client/can_transceive.hpp
@@ -1,7 +1,7 @@
 #ifndef CAN_TRANSCEIVE_H
 #define CAN_TRANSCEIVE_H
 
-#include "hex_spinbox.h"
+#include "hex_spinbox.hpp"
 #include <QWidget>
 
 namespace Ui
diff --git a/client/can_transceive.ui b/client/can_transceive.ui
index 781026f..388c40f 100644
--- a/client/can_transceive.ui
+++ b/client/can_transceive.ui
@@ -351,7 +351,7 @@
   <customwidget>
    <class>HexSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>hex_spinbox.h</header>
+   <header>hex_spinbox.hpp</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/client/helpers.cpp b/client/helpers.cpp
index 022567c..bdae14b 100644
--- a/client/helpers.cpp
+++ b/client/helpers.cpp
@@ -1,4 +1,4 @@
-#include "helpers.h"
+#include "helpers.hpp"
 
 void create_dial_needle(QwtDial *dial)
 {
diff --git a/client/helpers.h b/client/helpers.hpp
similarity index 100%
rename from client/helpers.h
rename to client/helpers.hpp
diff --git a/client/hex_spinbox.cpp b/client/hex_spinbox.cpp
index 6ad9521..2dcee28 100644
--- a/client/hex_spinbox.cpp
+++ b/client/hex_spinbox.cpp
@@ -1,4 +1,4 @@
-#include "hex_spinbox.h"
+#include "hex_spinbox.hpp"
 
 HexSpinBox::HexSpinBox(QWidget *parent, bool showPrefix, const QString &format) : QSpinBox(parent), format(format)
 {
diff --git a/client/hex_spinbox.h b/client/hex_spinbox.hpp
similarity index 100%
rename from client/hex_spinbox.h
rename to client/hex_spinbox.hpp
diff --git a/client/led.cpp b/client/led.cpp
index 3ef56d2..c3c39e4 100644
--- a/client/led.cpp
+++ b/client/led.cpp
@@ -1,4 +1,4 @@
-#include "led.h"
+#include "led.hpp"
 
 Led::Led(QWidget *parrent) : QPushButton(parrent)
 {
diff --git a/client/led.h b/client/led.hpp
similarity index 100%
rename from client/led.h
rename to client/led.hpp
diff --git a/client/main.cpp b/client/main.cpp
index 676d8c2..b4ce939 100644
--- a/client/main.cpp
+++ b/client/main.cpp
@@ -1,4 +1,4 @@
-#include "mainwindow.h"
+#include "mainwindow.hpp"
 #include "spdlog/async.h"
 #include "spdlog/sinks/stdout_color_sinks.h"
 #include "spdlog/spdlog.h"
diff --git a/client/mainwindow.cpp b/client/mainwindow.cpp
index 0d83b2d..a5c8cb4 100644
--- a/client/mainwindow.cpp
+++ b/client/mainwindow.cpp
@@ -1,4 +1,4 @@
-#include "mainwindow.h"
+#include "mainwindow.hpp"
 #include "ui_mainwindow.h"
 
 #include "can_debugger.hpp"
diff --git a/client/mainwindow.h b/client/mainwindow.hpp
similarity index 92%
rename from client/mainwindow.h
rename to client/mainwindow.hpp
index fb65eed..08f1810 100644
--- a/client/mainwindow.h
+++ b/client/mainwindow.hpp
@@ -1,9 +1,9 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include "networkerror.h"
-#include "simulator_base.h"
-#include "web_socket_wrapper.h"
+#include "networkerror.hpp"
+#include "simulator_base.hpp"
+#include "web_socket_wrapper.hpp"
 #include <QMainWindow>
 #include <map>
 
diff --git a/client/networkerror.cpp b/client/networkerror.cpp
index e35364e..c1c517b 100644
--- a/client/networkerror.cpp
+++ b/client/networkerror.cpp
@@ -1,4 +1,4 @@
-#include "networkerror.h"
+#include "networkerror.hpp"
 #include "ui_networkerror.h"
 
 NetworkError::NetworkError(QWidget *parent) : QDialog(parent), ui(new Ui::NetworkError)
diff --git a/client/networkerror.h b/client/networkerror.hpp
similarity index 100%
rename from client/networkerror.h
rename to client/networkerror.hpp
diff --git a/client/simulator_base.cpp b/client/simulator_base.cpp
index b9c21c6..9343d29 100644
--- a/client/simulator_base.cpp
+++ b/client/simulator_base.cpp
@@ -1,5 +1,5 @@
-#include "simulator_base.h"
-#include "can_transceive.h"
+#include "simulator_base.hpp"
+#include "can_transceive.hpp"
 
 Simulator_base::Simulator_base(QString sim_name, Web_socket_wrapper *web_socket, QWidget *parent)
     : QMainWindow{parent}, m_error_dialog(new NetworkError(this)), m_timer_update(new QTimer()),
diff --git a/client/simulator_base.h b/client/simulator_base.hpp
similarity index 95%
rename from client/simulator_base.h
rename to client/simulator_base.hpp
index cf685c6..d7e0fdd 100644
--- a/client/simulator_base.h
+++ b/client/simulator_base.hpp
@@ -2,11 +2,11 @@
 #define SIMULATOR_BASE_H
 
 #include "IterableEnum.hpp"
-#include "helpers.h"
-#include "led.h"
-#include "networkerror.h"
+#include "helpers.hpp"
+#include "led.hpp"
+#include "networkerror.hpp"
 #include "spdlog/spdlog.h"
-#include "web_socket_wrapper.h"
+#include "web_socket_wrapper.hpp"
 #include <QMainWindow>
 #include <QWidget>
 #include <magic_enum/magic_enum.hpp>
diff --git a/client/simulators/can_debugger.hpp b/client/simulators/can_debugger.hpp
index e738571..e96a09b 100644
--- a/client/simulators/can_debugger.hpp
+++ b/client/simulators/can_debugger.hpp
@@ -1,7 +1,7 @@
 #ifndef SIM_CAN_DEBUGGER_H
 #define SIM_CAN_DEBUGGER_H
 
-#include "simulator_base.h"
+#include "simulator_base.hpp"
 #include <QMainWindow>
 
 namespace Ui
diff --git a/client/simulators/test.hpp b/client/simulators/test.hpp
index 602858b..a9656f3 100644
--- a/client/simulators/test.hpp
+++ b/client/simulators/test.hpp
@@ -1,8 +1,8 @@
 #ifndef SIM_TEST_H
 #define SIM_TEST_H
 
-#include "simulator_base.h"
-#include "web_socket_wrapper.h"
+#include "simulator_base.hpp"
+#include "web_socket_wrapper.hpp"
 #include <QMainWindow>
 
 namespace Ui
diff --git a/client/simulators/test.ui b/client/simulators/test.ui
index 4b2df7a..88d5d6d 100644
--- a/client/simulators/test.ui
+++ b/client/simulators/test.ui
@@ -134,7 +134,7 @@
   <customwidget>
    <class>Led</class>
    <extends>QPushButton</extends>
-   <header>led.h</header>
+   <header>led.hpp</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/client/web_socket_wrapper.cpp b/client/web_socket_wrapper.cpp
index bbb42d2..d4edc6c 100644
--- a/client/web_socket_wrapper.cpp
+++ b/client/web_socket_wrapper.cpp
@@ -1,4 +1,4 @@
-#include "web_socket_wrapper.h"
+#include "web_socket_wrapper.hpp"
 #include "spdlog/spdlog.h"
 #include <magic_enum/magic_enum.hpp>
 
diff --git a/client/web_socket_wrapper.h b/client/web_socket_wrapper.hpp
similarity index 100%
rename from client/web_socket_wrapper.h
rename to client/web_socket_wrapper.hpp