diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 18acc74..aeb304a 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -70,7 +70,7 @@ foreach(sim ${sims})
     # Create a library for each .cpp file
     add_library(sim_${LIB_NAME} SHARED ${CMAKE_CURRENT_SOURCE_DIR}/simulators/${LIB_NAME}.hpp ${CMAKE_CURRENT_SOURCE_DIR}/simulators/${LIB_NAME}.cpp)
     target_link_libraries(sim_${LIB_NAME} PRIVATE Qt::SerialBus magic_enum::magic_enum nlohmann_json::nlohmann_json)
-    target_include_directories(sim_${LIB_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/CAN ${CMAKE_SOURCE_DIR}/VISA ${CMAKE_SOURCE_DIR}/GPIO ${CMAKE_SOURCE_DIR}/UI ${CMAKE_SOURCE_DIR}/external/color ${CMAKE_SOURCE_DIR}/external/spdlog/include)
+    target_include_directories(sim_${LIB_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/extensions ${CMAKE_CURRENT_LIST_DIR}/extensions/CAN_R1 ${CMAKE_SOURCE_DIR}/UI ${CMAKE_SOURCE_DIR}/external/color ${CMAKE_SOURCE_DIR}/external/spdlog/include)
     add_custom_command(TARGET sim_${LIB_NAME} POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_if_different
         $<TARGET_FILE:sim_${LIB_NAME}>
diff --git a/server/extensions/CAN/CAN_interface.cpp b/server/extensions/CAN_interface.cpp
similarity index 100%
rename from server/extensions/CAN/CAN_interface.cpp
rename to server/extensions/CAN_interface.cpp
diff --git a/server/extensions/CAN/CAN_interface.hpp b/server/extensions/CAN_interface.hpp
similarity index 100%
rename from server/extensions/CAN/CAN_interface.hpp
rename to server/extensions/CAN_interface.hpp
diff --git a/server/extensions/visa.cpp b/server/extensions/visa.cpp
index 01c6ac3..c35eecc 100644
--- a/server/extensions/visa.cpp
+++ b/server/extensions/visa.cpp
@@ -56,18 +56,4 @@ void Visa::send(QString data)
     data.append('\n');
     m_tcp_socket->write(data.toUtf8());
     m_tcp_socket->waitForBytesWritten();
-}
-
-QString Visa::query(QString data)
-{
-    uint32_t counter = 0;
-    m_data.clear();
-    send(data);
-    while (!m_data_ready && counter < 1024)
-    {
-        QCoreApplication::processEvents();
-        counter++;
-    }
-
-    return m_data;
-}
+}
\ No newline at end of file
diff --git a/server/extensions/visa.hpp b/server/extensions/visa.hpp
index e2257f1..099e133 100644
--- a/server/extensions/visa.hpp
+++ b/server/extensions/visa.hpp
@@ -50,13 +50,6 @@ class Visa : public QObject
      * @param data The data to send
      */
     void send(QString data);
-    /**
-     * @brief Query the VISA device
-     *
-     * @param data The query data
-     * @return QString The response from the device
-     */
-    QString query(QString data);
 
   signals:
     /**
diff --git a/server/simulator_base.cpp b/server/simulator_base.cpp
index 81fbd3b..a71f721 100644
--- a/server/simulator_base.cpp
+++ b/server/simulator_base.cpp
@@ -72,7 +72,7 @@ void Simulator_base::reboot()
     system("reboot");
 }
 
-bool Simulator_base::check_input_high(uint32_t data, uint16_t pinnummer)
+constexpr bool Simulator_base::check_input_high(uint32_t data, uint16_t pinnummer)
 {
     return (data & (1 << pinnummer));
 }
diff --git a/server/simulator_base.hpp b/server/simulator_base.hpp
index 74f0155..a996754 100644
--- a/server/simulator_base.hpp
+++ b/server/simulator_base.hpp
@@ -11,7 +11,7 @@
 
 using json = nlohmann::json;
 
-#include "CAN_interface.hpp"
+#include "extensions/CAN_interface.hpp"
 Q_FORWARD_DECLARE_OBJC_CLASS(UI_item);
 #endif
 
@@ -160,7 +160,7 @@ class Simulator_base : public QObject
      * @return true If the bit is high
      * @return false If the bit is low
      */
-    bool check_input_high(uint32_t data, uint16_t pinnummer);
+    constexpr bool check_input_high(uint32_t data, uint16_t pinnummer);
   signals:
     /**
      * @brief Signal emitted when the ui of the simulator changes
diff --git a/server/simulators.cpp b/server/simulators.cpp
index 1254423..2699c78 100644
--- a/server/simulators.cpp
+++ b/server/simulators.cpp
@@ -1,5 +1,4 @@
 #include "simulators.hpp"
-#include "CAN_wrapper.hpp"
 #include "simulator_base.hpp"
 #include "websocket.hpp"
 #include <QDirIterator>