diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0b41a81..1ad77251 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -125,28 +125,28 @@ add_executable(Bloom
     build/resources/TargetDescriptionFiles/AVR/Mapping.json
 
     # Debug servers
-    src/DebugServers/DebugServerComponent.cpp
-    src/DebugServers/GdbRsp/GdbRspDebugServer.cpp
-    src/DebugServers/GdbRsp/GdbDebugServerConfig.cpp
-    src/DebugServers/GdbRsp/Connection.cpp
-    src/DebugServers/GdbRsp/DebugSession.cpp
-    src/DebugServers/GdbRsp/CommandPackets/CommandPacket.cpp
-    src/DebugServers/GdbRsp/CommandPackets/SupportedFeaturesQuery.cpp
-    src/DebugServers/GdbRsp/CommandPackets/ReadRegisters.cpp
-    src/DebugServers/GdbRsp/CommandPackets/WriteRegister.cpp
-    src/DebugServers/GdbRsp/CommandPackets/ContinueExecution.cpp
-    src/DebugServers/GdbRsp/CommandPackets/StepExecution.cpp
-    src/DebugServers/GdbRsp/CommandPackets/InterruptExecution.cpp
-    src/DebugServers/GdbRsp/CommandPackets/SetBreakpoint.cpp
-    src/DebugServers/GdbRsp/CommandPackets/RemoveBreakpoint.cpp
-    src/DebugServers/GdbRsp/ResponsePackets/SupportedFeaturesResponse.cpp
+    src/DebugServer/DebugServerComponent.cpp
+    src/DebugServer/GdbRsp/GdbRspDebugServer.cpp
+    src/DebugServer/GdbRsp/GdbDebugServerConfig.cpp
+    src/DebugServer/GdbRsp/Connection.cpp
+    src/DebugServer/GdbRsp/DebugSession.cpp
+    src/DebugServer/GdbRsp/CommandPackets/CommandPacket.cpp
+    src/DebugServer/GdbRsp/CommandPackets/SupportedFeaturesQuery.cpp
+    src/DebugServer/GdbRsp/CommandPackets/ReadRegisters.cpp
+    src/DebugServer/GdbRsp/CommandPackets/WriteRegister.cpp
+    src/DebugServer/GdbRsp/CommandPackets/ContinueExecution.cpp
+    src/DebugServer/GdbRsp/CommandPackets/StepExecution.cpp
+    src/DebugServer/GdbRsp/CommandPackets/InterruptExecution.cpp
+    src/DebugServer/GdbRsp/CommandPackets/SetBreakpoint.cpp
+    src/DebugServer/GdbRsp/CommandPackets/RemoveBreakpoint.cpp
+    src/DebugServer/GdbRsp/ResponsePackets/SupportedFeaturesResponse.cpp
 
     # AVR GDB Server
-    src/DebugServers/GdbRsp/AvrGdb/AvrGdbRsp.cpp
-    src/DebugServers/GdbRsp/AvrGdb/TargetDescriptor.cpp
-    src/DebugServers/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.cpp
-    src/DebugServers/GdbRsp/AvrGdb/CommandPackets/ReadMemory.cpp
-    src/DebugServers/GdbRsp/AvrGdb/CommandPackets/WriteMemory.cpp
+    src/DebugServer/GdbRsp/AvrGdb/AvrGdbRsp.cpp
+    src/DebugServer/GdbRsp/AvrGdb/TargetDescriptor.cpp
+    src/DebugServer/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.cpp
+    src/DebugServer/GdbRsp/AvrGdb/CommandPackets/ReadMemory.cpp
+    src/DebugServer/GdbRsp/AvrGdb/CommandPackets/WriteMemory.cpp
 
     # Insight
     src/Insight/Insight.cpp
diff --git a/src/Application.hpp b/src/Application.hpp
index 7facc281..f6c6c980 100644
--- a/src/Application.hpp
+++ b/src/Application.hpp
@@ -10,7 +10,7 @@
 #include "src/Helpers/Thread.hpp"
 
 #include "src/TargetController/TargetController.hpp"
-#include "src/DebugServers/DebugServerComponent.hpp"
+#include "src/DebugServer/DebugServerComponent.hpp"
 #include "src/Insight/Insight.hpp"
 #include "src/SignalHandler/SignalHandler.hpp"
 
diff --git a/src/DebugServers/DebugServerComponent.cpp b/src/DebugServer/DebugServerComponent.cpp
similarity index 100%
rename from src/DebugServers/DebugServerComponent.cpp
rename to src/DebugServer/DebugServerComponent.cpp
diff --git a/src/DebugServers/DebugServerComponent.hpp b/src/DebugServer/DebugServerComponent.hpp
similarity index 100%
rename from src/DebugServers/DebugServerComponent.hpp
rename to src/DebugServer/DebugServerComponent.hpp
diff --git a/src/DebugServers/GdbRsp/AvrGdb/AvrGdbRsp.cpp b/src/DebugServer/GdbRsp/AvrGdb/AvrGdbRsp.cpp
similarity index 100%
rename from src/DebugServers/GdbRsp/AvrGdb/AvrGdbRsp.cpp
rename to src/DebugServer/GdbRsp/AvrGdb/AvrGdbRsp.cpp
diff --git a/src/DebugServers/GdbRsp/AvrGdb/AvrGdbRsp.hpp b/src/DebugServer/GdbRsp/AvrGdb/AvrGdbRsp.hpp
similarity index 97%
rename from src/DebugServers/GdbRsp/AvrGdb/AvrGdbRsp.hpp
rename to src/DebugServer/GdbRsp/AvrGdb/AvrGdbRsp.hpp
index 0bdff606..09682e33 100644
--- a/src/DebugServers/GdbRsp/AvrGdb/AvrGdbRsp.hpp
+++ b/src/DebugServer/GdbRsp/AvrGdb/AvrGdbRsp.hpp
@@ -4,7 +4,7 @@
 
 #include "TargetDescriptor.hpp"
 
-#include "src/DebugServers/GdbRsp/GdbRspDebugServer.hpp"
+#include "src/DebugServer/GdbRsp/GdbRspDebugServer.hpp"
 
 namespace Bloom::DebugServer::Gdb::AvrGdb
 {
diff --git a/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.cpp b/src/DebugServer/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.cpp
similarity index 57%
rename from src/DebugServers/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.cpp
rename to src/DebugServer/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.cpp
index 1372a1c7..bcf9243a 100644
--- a/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.cpp
+++ b/src/DebugServer/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.cpp
@@ -1,8 +1,8 @@
 #include "AbstractMemoryAccessPacket.hpp"
 
-#include "src/DebugServers/GdbRsp/ResponsePackets/TargetStopped.hpp"
-#include "src/DebugServers/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
-#include "src/DebugServers/GdbRsp/Signal.hpp"
+#include "src/DebugServer/GdbRsp/ResponsePackets/TargetStopped.hpp"
+#include "src/DebugServer/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
+#include "src/DebugServer/GdbRsp/Signal.hpp"
 
 #include "src/Logger/Logger.hpp"
 #include "src/Exceptions/Exception.hpp"
diff --git a/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.hpp b/src/DebugServer/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.hpp
similarity index 96%
rename from src/DebugServers/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.hpp
rename to src/DebugServer/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.hpp
index ef256dc5..40f94db3 100644
--- a/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.hpp
+++ b/src/DebugServer/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.hpp
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <optional>
 
-#include "src/DebugServers/GdbRsp/CommandPackets/CommandPacket.hpp"
+#include "src/DebugServer/GdbRsp/CommandPackets/CommandPacket.hpp"
 
 #include "src/Targets/TargetMemory.hpp"
 
diff --git a/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/ReadMemory.cpp b/src/DebugServer/GdbRsp/AvrGdb/CommandPackets/ReadMemory.cpp
similarity index 94%
rename from src/DebugServers/GdbRsp/AvrGdb/CommandPackets/ReadMemory.cpp
rename to src/DebugServer/GdbRsp/AvrGdb/CommandPackets/ReadMemory.cpp
index 81ab8a0e..3529c0fb 100644
--- a/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/ReadMemory.cpp
+++ b/src/DebugServer/GdbRsp/AvrGdb/CommandPackets/ReadMemory.cpp
@@ -1,7 +1,7 @@
 #include "ReadMemory.hpp"
 
-#include "src/DebugServers/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
-#include "src/DebugServers/GdbRsp/ResponsePackets/ResponsePacket.hpp"
+#include "src/DebugServer/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
+#include "src/DebugServer/GdbRsp/ResponsePackets/ResponsePacket.hpp"
 
 #include "src/Logger/Logger.hpp"
 #include "src/Exceptions/Exception.hpp"
diff --git a/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/ReadMemory.hpp b/src/DebugServer/GdbRsp/AvrGdb/CommandPackets/ReadMemory.hpp
similarity index 100%
rename from src/DebugServers/GdbRsp/AvrGdb/CommandPackets/ReadMemory.hpp
rename to src/DebugServer/GdbRsp/AvrGdb/CommandPackets/ReadMemory.hpp
diff --git a/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/WriteMemory.cpp b/src/DebugServer/GdbRsp/AvrGdb/CommandPackets/WriteMemory.cpp
similarity index 95%
rename from src/DebugServers/GdbRsp/AvrGdb/CommandPackets/WriteMemory.cpp
rename to src/DebugServer/GdbRsp/AvrGdb/CommandPackets/WriteMemory.cpp
index 6927d3d5..45faf534 100644
--- a/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/WriteMemory.cpp
+++ b/src/DebugServer/GdbRsp/AvrGdb/CommandPackets/WriteMemory.cpp
@@ -1,7 +1,7 @@
 #include "WriteMemory.hpp"
 
-#include "src/DebugServers/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
-#include "src/DebugServers/GdbRsp/ResponsePackets/OkResponsePacket.hpp"
+#include "src/DebugServer/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
+#include "src/DebugServer/GdbRsp/ResponsePackets/OkResponsePacket.hpp"
 
 #include "src/Logger/Logger.hpp"
 #include "src/Exceptions/Exception.hpp"
diff --git a/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/WriteMemory.hpp b/src/DebugServer/GdbRsp/AvrGdb/CommandPackets/WriteMemory.hpp
similarity index 100%
rename from src/DebugServers/GdbRsp/AvrGdb/CommandPackets/WriteMemory.hpp
rename to src/DebugServer/GdbRsp/AvrGdb/CommandPackets/WriteMemory.hpp
diff --git a/src/DebugServers/GdbRsp/AvrGdb/TargetDescriptor.cpp b/src/DebugServer/GdbRsp/AvrGdb/TargetDescriptor.cpp
similarity index 100%
rename from src/DebugServers/GdbRsp/AvrGdb/TargetDescriptor.cpp
rename to src/DebugServer/GdbRsp/AvrGdb/TargetDescriptor.cpp
diff --git a/src/DebugServers/GdbRsp/AvrGdb/TargetDescriptor.hpp b/src/DebugServer/GdbRsp/AvrGdb/TargetDescriptor.hpp
similarity index 97%
rename from src/DebugServers/GdbRsp/AvrGdb/TargetDescriptor.hpp
rename to src/DebugServer/GdbRsp/AvrGdb/TargetDescriptor.hpp
index 9057365b..3e8a1bd8 100644
--- a/src/DebugServers/GdbRsp/AvrGdb/TargetDescriptor.hpp
+++ b/src/DebugServer/GdbRsp/AvrGdb/TargetDescriptor.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "src/DebugServers/GdbRsp/TargetDescriptor.hpp"
+#include "src/DebugServer/GdbRsp/TargetDescriptor.hpp"
 
 #include "src/Helpers/BiMap.hpp"
 
diff --git a/src/DebugServers/GdbRsp/BreakpointType.hpp b/src/DebugServer/GdbRsp/BreakpointType.hpp
similarity index 100%
rename from src/DebugServers/GdbRsp/BreakpointType.hpp
rename to src/DebugServer/GdbRsp/BreakpointType.hpp
diff --git a/src/DebugServers/GdbRsp/CommandPackets/CommandPacket.cpp b/src/DebugServer/GdbRsp/CommandPackets/CommandPacket.cpp
similarity index 81%
rename from src/DebugServers/GdbRsp/CommandPackets/CommandPacket.cpp
rename to src/DebugServer/GdbRsp/CommandPackets/CommandPacket.cpp
index c8528192..6ac46431 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/CommandPacket.cpp
+++ b/src/DebugServer/GdbRsp/CommandPackets/CommandPacket.cpp
@@ -1,11 +1,11 @@
 #include "CommandPacket.hpp"
 
-#include "src/DebugServers/GdbRsp/ResponsePackets/ResponsePacket.hpp"
-#include "src/DebugServers/GdbRsp/ResponsePackets/OkResponsePacket.hpp"
-#include "src/DebugServers/GdbRsp/ResponsePackets/TargetStopped.hpp"
-#include "src/DebugServers/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
+#include "src/DebugServer/GdbRsp/ResponsePackets/ResponsePacket.hpp"
+#include "src/DebugServer/GdbRsp/ResponsePackets/OkResponsePacket.hpp"
+#include "src/DebugServer/GdbRsp/ResponsePackets/TargetStopped.hpp"
+#include "src/DebugServer/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
 
-#include "src/DebugServers/GdbRsp/Signal.hpp"
+#include "src/DebugServer/GdbRsp/Signal.hpp"
 
 #include "src/Logger/Logger.hpp"
 #include "src/Exceptions/Exception.hpp"
diff --git a/src/DebugServers/GdbRsp/CommandPackets/CommandPacket.hpp b/src/DebugServer/GdbRsp/CommandPackets/CommandPacket.hpp
similarity index 96%
rename from src/DebugServers/GdbRsp/CommandPackets/CommandPacket.hpp
rename to src/DebugServer/GdbRsp/CommandPackets/CommandPacket.hpp
index fbf248ae..67377d21 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/CommandPacket.hpp
+++ b/src/DebugServer/GdbRsp/CommandPackets/CommandPacket.hpp
@@ -3,8 +3,8 @@
 #include <vector>
 #include <memory>
 
-#include "src/DebugServers/GdbRsp/Packet.hpp"
-#include "src/DebugServers/GdbRsp/DebugSession.hpp"
+#include "src/DebugServer/GdbRsp/Packet.hpp"
+#include "src/DebugServer/GdbRsp/DebugSession.hpp"
 
 #include "src/TargetController/TargetControllerConsole.hpp"
 
diff --git a/src/DebugServers/GdbRsp/CommandPackets/ContinueExecution.cpp b/src/DebugServer/GdbRsp/CommandPackets/ContinueExecution.cpp
similarity index 93%
rename from src/DebugServers/GdbRsp/CommandPackets/ContinueExecution.cpp
rename to src/DebugServer/GdbRsp/CommandPackets/ContinueExecution.cpp
index 8c687650..32b68492 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/ContinueExecution.cpp
+++ b/src/DebugServer/GdbRsp/CommandPackets/ContinueExecution.cpp
@@ -1,6 +1,6 @@
 #include "ContinueExecution.hpp"
 
-#include "src/DebugServers/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
+#include "src/DebugServer/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
 
 #include "src/Logger/Logger.hpp"
 #include "src/Exceptions/Exception.hpp"
diff --git a/src/DebugServers/GdbRsp/CommandPackets/ContinueExecution.hpp b/src/DebugServer/GdbRsp/CommandPackets/ContinueExecution.hpp
similarity index 100%
rename from src/DebugServers/GdbRsp/CommandPackets/ContinueExecution.hpp
rename to src/DebugServer/GdbRsp/CommandPackets/ContinueExecution.hpp
diff --git a/src/DebugServers/GdbRsp/CommandPackets/InterruptExecution.cpp b/src/DebugServer/GdbRsp/CommandPackets/InterruptExecution.cpp
similarity index 82%
rename from src/DebugServers/GdbRsp/CommandPackets/InterruptExecution.cpp
rename to src/DebugServer/GdbRsp/CommandPackets/InterruptExecution.cpp
index 2a4d280b..e198cff1 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/InterruptExecution.cpp
+++ b/src/DebugServer/GdbRsp/CommandPackets/InterruptExecution.cpp
@@ -1,8 +1,8 @@
 #include "InterruptExecution.hpp"
 
-#include "src/DebugServers/GdbRsp/ResponsePackets/TargetStopped.hpp"
-#include "src/DebugServers/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
-#include "src/DebugServers/GdbRsp/Signal.hpp"
+#include "src/DebugServer/GdbRsp/ResponsePackets/TargetStopped.hpp"
+#include "src/DebugServer/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
+#include "src/DebugServer/GdbRsp/Signal.hpp"
 
 #include "src/Logger/Logger.hpp"
 #include "src/Exceptions/Exception.hpp"
diff --git a/src/DebugServers/GdbRsp/CommandPackets/InterruptExecution.hpp b/src/DebugServer/GdbRsp/CommandPackets/InterruptExecution.hpp
similarity index 100%
rename from src/DebugServers/GdbRsp/CommandPackets/InterruptExecution.hpp
rename to src/DebugServer/GdbRsp/CommandPackets/InterruptExecution.hpp
diff --git a/src/DebugServers/GdbRsp/CommandPackets/ReadRegisters.cpp b/src/DebugServer/GdbRsp/CommandPackets/ReadRegisters.cpp
similarity index 96%
rename from src/DebugServers/GdbRsp/CommandPackets/ReadRegisters.cpp
rename to src/DebugServer/GdbRsp/CommandPackets/ReadRegisters.cpp
index 10353df8..0c0c741e 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/ReadRegisters.cpp
+++ b/src/DebugServer/GdbRsp/CommandPackets/ReadRegisters.cpp
@@ -1,7 +1,7 @@
 #include "ReadRegisters.hpp"
 
-#include "src/DebugServers/GdbRsp/ResponsePackets/TargetStopped.hpp"
-#include "src/DebugServers/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
+#include "src/DebugServer/GdbRsp/ResponsePackets/TargetStopped.hpp"
+#include "src/DebugServer/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
 
 #include "src/Targets/TargetRegister.hpp"
 
diff --git a/src/DebugServers/GdbRsp/CommandPackets/ReadRegisters.hpp b/src/DebugServer/GdbRsp/CommandPackets/ReadRegisters.hpp
similarity index 95%
rename from src/DebugServers/GdbRsp/CommandPackets/ReadRegisters.hpp
rename to src/DebugServer/GdbRsp/CommandPackets/ReadRegisters.hpp
index 61a95798..0c6dcd1a 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/ReadRegisters.hpp
+++ b/src/DebugServer/GdbRsp/CommandPackets/ReadRegisters.hpp
@@ -4,7 +4,7 @@
 
 #include "CommandPacket.hpp"
 
-#include "src/DebugServers/GdbRsp/RegisterDescriptor.hpp"
+#include "src/DebugServer/GdbRsp/RegisterDescriptor.hpp"
 
 namespace Bloom::DebugServer::Gdb::CommandPackets
 {
diff --git a/src/DebugServers/GdbRsp/CommandPackets/RemoveBreakpoint.cpp b/src/DebugServer/GdbRsp/CommandPackets/RemoveBreakpoint.cpp
similarity index 93%
rename from src/DebugServers/GdbRsp/CommandPackets/RemoveBreakpoint.cpp
rename to src/DebugServer/GdbRsp/CommandPackets/RemoveBreakpoint.cpp
index 5263c073..3037cfcb 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/RemoveBreakpoint.cpp
+++ b/src/DebugServer/GdbRsp/CommandPackets/RemoveBreakpoint.cpp
@@ -2,8 +2,8 @@
 
 #include <QtCore/QString>
 
-#include "src/DebugServers/GdbRsp/ResponsePackets/OkResponsePacket.hpp"
-#include "src/DebugServers/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
+#include "src/DebugServer/GdbRsp/ResponsePackets/OkResponsePacket.hpp"
+#include "src/DebugServer/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
 
 #include "src/Targets/TargetBreakpoint.hpp"
 
diff --git a/src/DebugServers/GdbRsp/CommandPackets/RemoveBreakpoint.hpp b/src/DebugServer/GdbRsp/CommandPackets/RemoveBreakpoint.hpp
similarity index 94%
rename from src/DebugServers/GdbRsp/CommandPackets/RemoveBreakpoint.hpp
rename to src/DebugServer/GdbRsp/CommandPackets/RemoveBreakpoint.hpp
index d8be6c55..0dc23cea 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/RemoveBreakpoint.hpp
+++ b/src/DebugServer/GdbRsp/CommandPackets/RemoveBreakpoint.hpp
@@ -5,7 +5,7 @@
 #include <set>
 
 #include "CommandPacket.hpp"
-#include "src/DebugServers/GdbRsp/BreakpointType.hpp"
+#include "src/DebugServer/GdbRsp/BreakpointType.hpp"
 
 namespace Bloom::DebugServer::Gdb::CommandPackets
 {
diff --git a/src/DebugServers/GdbRsp/CommandPackets/SetBreakpoint.cpp b/src/DebugServer/GdbRsp/CommandPackets/SetBreakpoint.cpp
similarity index 93%
rename from src/DebugServers/GdbRsp/CommandPackets/SetBreakpoint.cpp
rename to src/DebugServer/GdbRsp/CommandPackets/SetBreakpoint.cpp
index cb622a84..65c64b4c 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/SetBreakpoint.cpp
+++ b/src/DebugServer/GdbRsp/CommandPackets/SetBreakpoint.cpp
@@ -2,8 +2,8 @@
 
 #include <QtCore/QString>
 
-#include "src/DebugServers/GdbRsp/ResponsePackets/OkResponsePacket.hpp"
-#include "src/DebugServers/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
+#include "src/DebugServer/GdbRsp/ResponsePackets/OkResponsePacket.hpp"
+#include "src/DebugServer/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
 
 #include "src/Targets/TargetBreakpoint.hpp"
 
diff --git a/src/DebugServers/GdbRsp/CommandPackets/SetBreakpoint.hpp b/src/DebugServer/GdbRsp/CommandPackets/SetBreakpoint.hpp
similarity index 94%
rename from src/DebugServers/GdbRsp/CommandPackets/SetBreakpoint.hpp
rename to src/DebugServer/GdbRsp/CommandPackets/SetBreakpoint.hpp
index b26c65d5..c3972412 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/SetBreakpoint.hpp
+++ b/src/DebugServer/GdbRsp/CommandPackets/SetBreakpoint.hpp
@@ -5,7 +5,7 @@
 #include <set>
 
 #include "CommandPacket.hpp"
-#include "src/DebugServers/GdbRsp/BreakpointType.hpp"
+#include "src/DebugServer/GdbRsp/BreakpointType.hpp"
 
 namespace Bloom::DebugServer::Gdb::CommandPackets
 {
diff --git a/src/DebugServers/GdbRsp/CommandPackets/StepExecution.cpp b/src/DebugServer/GdbRsp/CommandPackets/StepExecution.cpp
similarity index 93%
rename from src/DebugServers/GdbRsp/CommandPackets/StepExecution.cpp
rename to src/DebugServer/GdbRsp/CommandPackets/StepExecution.cpp
index 6ab4056b..046d67f6 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/StepExecution.cpp
+++ b/src/DebugServer/GdbRsp/CommandPackets/StepExecution.cpp
@@ -1,6 +1,6 @@
 #include "StepExecution.hpp"
 
-#include "src/DebugServers/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
+#include "src/DebugServer/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
 
 #include "src/Logger/Logger.hpp"
 #include "src/Exceptions/Exception.hpp"
diff --git a/src/DebugServers/GdbRsp/CommandPackets/StepExecution.hpp b/src/DebugServer/GdbRsp/CommandPackets/StepExecution.hpp
similarity index 100%
rename from src/DebugServers/GdbRsp/CommandPackets/StepExecution.hpp
rename to src/DebugServer/GdbRsp/CommandPackets/StepExecution.hpp
diff --git a/src/DebugServers/GdbRsp/CommandPackets/SupportedFeaturesQuery.cpp b/src/DebugServer/GdbRsp/CommandPackets/SupportedFeaturesQuery.cpp
similarity index 90%
rename from src/DebugServers/GdbRsp/CommandPackets/SupportedFeaturesQuery.cpp
rename to src/DebugServer/GdbRsp/CommandPackets/SupportedFeaturesQuery.cpp
index d1a913f0..c8f5ab11 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/SupportedFeaturesQuery.cpp
+++ b/src/DebugServer/GdbRsp/CommandPackets/SupportedFeaturesQuery.cpp
@@ -2,14 +2,14 @@
 
 #include <QtCore/QString>
 
-#include "src/DebugServers/GdbRsp/Feature.hpp"
+#include "src/DebugServer/GdbRsp/Feature.hpp"
 
-#include "src/DebugServers/GdbRsp/ResponsePackets/SupportedFeaturesResponse.hpp"
-#include "src/DebugServers/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
+#include "src/DebugServer/GdbRsp/ResponsePackets/SupportedFeaturesResponse.hpp"
+#include "src/DebugServer/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
 
 #include "src/Logger/Logger.hpp"
 #include "src/Exceptions/Exception.hpp"
-#include "src/DebugServers/GdbRsp/Exceptions/ClientNotSupported.hpp"
+#include "src/DebugServer/GdbRsp/Exceptions/ClientNotSupported.hpp"
 
 namespace Bloom::DebugServer::Gdb::CommandPackets
 {
diff --git a/src/DebugServers/GdbRsp/CommandPackets/SupportedFeaturesQuery.hpp b/src/DebugServer/GdbRsp/CommandPackets/SupportedFeaturesQuery.hpp
similarity index 100%
rename from src/DebugServers/GdbRsp/CommandPackets/SupportedFeaturesQuery.hpp
rename to src/DebugServer/GdbRsp/CommandPackets/SupportedFeaturesQuery.hpp
diff --git a/src/DebugServers/GdbRsp/CommandPackets/WriteRegister.cpp b/src/DebugServer/GdbRsp/CommandPackets/WriteRegister.cpp
similarity index 93%
rename from src/DebugServers/GdbRsp/CommandPackets/WriteRegister.cpp
rename to src/DebugServer/GdbRsp/CommandPackets/WriteRegister.cpp
index f28a3bd7..ebdfdfda 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/WriteRegister.cpp
+++ b/src/DebugServer/GdbRsp/CommandPackets/WriteRegister.cpp
@@ -1,8 +1,8 @@
 #include "WriteRegister.hpp"
 
-#include "src/DebugServers/GdbRsp/ResponsePackets/TargetStopped.hpp"
-#include "src/DebugServers/GdbRsp/ResponsePackets/OkResponsePacket.hpp"
-#include "src/DebugServers/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
+#include "src/DebugServer/GdbRsp/ResponsePackets/TargetStopped.hpp"
+#include "src/DebugServer/GdbRsp/ResponsePackets/OkResponsePacket.hpp"
+#include "src/DebugServer/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
 
 #include "src/Targets/TargetRegister.hpp"
 
diff --git a/src/DebugServers/GdbRsp/CommandPackets/WriteRegister.hpp b/src/DebugServer/GdbRsp/CommandPackets/WriteRegister.hpp
similarity index 100%
rename from src/DebugServers/GdbRsp/CommandPackets/WriteRegister.hpp
rename to src/DebugServer/GdbRsp/CommandPackets/WriteRegister.hpp
diff --git a/src/DebugServers/GdbRsp/Connection.cpp b/src/DebugServer/GdbRsp/Connection.cpp
similarity index 100%
rename from src/DebugServers/GdbRsp/Connection.cpp
rename to src/DebugServer/GdbRsp/Connection.cpp
diff --git a/src/DebugServers/GdbRsp/Connection.hpp b/src/DebugServer/GdbRsp/Connection.hpp
similarity index 97%
rename from src/DebugServers/GdbRsp/Connection.hpp
rename to src/DebugServer/GdbRsp/Connection.hpp
index e2214af9..c77398b4 100644
--- a/src/DebugServers/GdbRsp/Connection.hpp
+++ b/src/DebugServer/GdbRsp/Connection.hpp
@@ -12,8 +12,8 @@
 #include "src/Helpers/EventNotifier.hpp"
 #include "src/Helpers/EpollInstance.hpp"
 
-#include "src/DebugServers/GdbRsp/Packet.hpp"
-#include "src/DebugServers/GdbRsp/ResponsePackets/ResponsePacket.hpp"
+#include "src/DebugServer/GdbRsp/Packet.hpp"
+#include "src/DebugServer/GdbRsp/ResponsePackets/ResponsePacket.hpp"
 
 namespace Bloom::DebugServer::Gdb
 {
diff --git a/src/DebugServers/GdbRsp/DebugSession.cpp b/src/DebugServer/GdbRsp/DebugSession.cpp
similarity index 100%
rename from src/DebugServers/GdbRsp/DebugSession.cpp
rename to src/DebugServer/GdbRsp/DebugSession.cpp
diff --git a/src/DebugServers/GdbRsp/DebugSession.hpp b/src/DebugServer/GdbRsp/DebugSession.hpp
similarity index 100%
rename from src/DebugServers/GdbRsp/DebugSession.hpp
rename to src/DebugServer/GdbRsp/DebugSession.hpp
diff --git a/src/DebugServers/GdbRsp/Exceptions/ClientCommunicationError.hpp b/src/DebugServer/GdbRsp/Exceptions/ClientCommunicationError.hpp
similarity index 100%
rename from src/DebugServers/GdbRsp/Exceptions/ClientCommunicationError.hpp
rename to src/DebugServer/GdbRsp/Exceptions/ClientCommunicationError.hpp
diff --git a/src/DebugServers/GdbRsp/Exceptions/ClientDisconnected.hpp b/src/DebugServer/GdbRsp/Exceptions/ClientDisconnected.hpp
similarity index 100%
rename from src/DebugServers/GdbRsp/Exceptions/ClientDisconnected.hpp
rename to src/DebugServer/GdbRsp/Exceptions/ClientDisconnected.hpp
diff --git a/src/DebugServers/GdbRsp/Exceptions/ClientNotSupported.hpp b/src/DebugServer/GdbRsp/Exceptions/ClientNotSupported.hpp
similarity index 100%
rename from src/DebugServers/GdbRsp/Exceptions/ClientNotSupported.hpp
rename to src/DebugServer/GdbRsp/Exceptions/ClientNotSupported.hpp
diff --git a/src/DebugServers/GdbRsp/Exceptions/DebugSessionAborted.hpp b/src/DebugServer/GdbRsp/Exceptions/DebugSessionAborted.hpp
similarity index 100%
rename from src/DebugServers/GdbRsp/Exceptions/DebugSessionAborted.hpp
rename to src/DebugServer/GdbRsp/Exceptions/DebugSessionAborted.hpp
diff --git a/src/DebugServers/GdbRsp/Feature.hpp b/src/DebugServer/GdbRsp/Feature.hpp
similarity index 100%
rename from src/DebugServers/GdbRsp/Feature.hpp
rename to src/DebugServer/GdbRsp/Feature.hpp
diff --git a/src/DebugServers/GdbRsp/GdbDebugServerConfig.cpp b/src/DebugServer/GdbRsp/GdbDebugServerConfig.cpp
similarity index 100%
rename from src/DebugServers/GdbRsp/GdbDebugServerConfig.cpp
rename to src/DebugServer/GdbRsp/GdbDebugServerConfig.cpp
diff --git a/src/DebugServers/GdbRsp/GdbDebugServerConfig.hpp b/src/DebugServer/GdbRsp/GdbDebugServerConfig.hpp
similarity index 100%
rename from src/DebugServers/GdbRsp/GdbDebugServerConfig.hpp
rename to src/DebugServer/GdbRsp/GdbDebugServerConfig.hpp
diff --git a/src/DebugServers/GdbRsp/GdbRspDebugServer.cpp b/src/DebugServer/GdbRsp/GdbRspDebugServer.cpp
similarity index 100%
rename from src/DebugServers/GdbRsp/GdbRspDebugServer.cpp
rename to src/DebugServer/GdbRsp/GdbRspDebugServer.cpp
diff --git a/src/DebugServers/GdbRsp/GdbRspDebugServer.hpp b/src/DebugServer/GdbRsp/GdbRspDebugServer.hpp
similarity index 99%
rename from src/DebugServers/GdbRsp/GdbRspDebugServer.hpp
rename to src/DebugServer/GdbRsp/GdbRspDebugServer.hpp
index 9ae7a30e..deaaf02c 100644
--- a/src/DebugServers/GdbRsp/GdbRspDebugServer.hpp
+++ b/src/DebugServer/GdbRsp/GdbRspDebugServer.hpp
@@ -7,7 +7,7 @@
 #include <queue>
 #include <optional>
 
-#include "src/DebugServers/ServerInterface.hpp"
+#include "src/DebugServer/ServerInterface.hpp"
 
 #include "GdbDebugServerConfig.hpp"
 #include "src/EventManager/EventListener.hpp"
diff --git a/src/DebugServers/GdbRsp/Packet.hpp b/src/DebugServer/GdbRsp/Packet.hpp
similarity index 100%
rename from src/DebugServers/GdbRsp/Packet.hpp
rename to src/DebugServer/GdbRsp/Packet.hpp
diff --git a/src/DebugServers/GdbRsp/RegisterDescriptor.hpp b/src/DebugServer/GdbRsp/RegisterDescriptor.hpp
similarity index 100%
rename from src/DebugServers/GdbRsp/RegisterDescriptor.hpp
rename to src/DebugServer/GdbRsp/RegisterDescriptor.hpp
diff --git a/src/DebugServers/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp b/src/DebugServer/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp
similarity index 100%
rename from src/DebugServers/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp
rename to src/DebugServer/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp
diff --git a/src/DebugServers/GdbRsp/ResponsePackets/OkResponsePacket.hpp b/src/DebugServer/GdbRsp/ResponsePackets/OkResponsePacket.hpp
similarity index 100%
rename from src/DebugServers/GdbRsp/ResponsePackets/OkResponsePacket.hpp
rename to src/DebugServer/GdbRsp/ResponsePackets/OkResponsePacket.hpp
diff --git a/src/DebugServers/GdbRsp/ResponsePackets/ResponsePacket.hpp b/src/DebugServer/GdbRsp/ResponsePackets/ResponsePacket.hpp
similarity index 91%
rename from src/DebugServers/GdbRsp/ResponsePackets/ResponsePacket.hpp
rename to src/DebugServer/GdbRsp/ResponsePackets/ResponsePacket.hpp
index 7226598b..78a9cb22 100644
--- a/src/DebugServers/GdbRsp/ResponsePackets/ResponsePacket.hpp
+++ b/src/DebugServer/GdbRsp/ResponsePackets/ResponsePacket.hpp
@@ -3,7 +3,7 @@
 #include <vector>
 #include <memory>
 
-#include "src/DebugServers/GdbRsp/Packet.hpp"
+#include "src/DebugServer/GdbRsp/Packet.hpp"
 
 namespace Bloom::DebugServer::Gdb::ResponsePackets
 {
diff --git a/src/DebugServers/GdbRsp/ResponsePackets/SupportedFeaturesResponse.cpp b/src/DebugServer/GdbRsp/ResponsePackets/SupportedFeaturesResponse.cpp
similarity index 100%
rename from src/DebugServers/GdbRsp/ResponsePackets/SupportedFeaturesResponse.cpp
rename to src/DebugServer/GdbRsp/ResponsePackets/SupportedFeaturesResponse.cpp
diff --git a/src/DebugServers/GdbRsp/ResponsePackets/SupportedFeaturesResponse.hpp b/src/DebugServer/GdbRsp/ResponsePackets/SupportedFeaturesResponse.hpp
similarity index 100%
rename from src/DebugServers/GdbRsp/ResponsePackets/SupportedFeaturesResponse.hpp
rename to src/DebugServer/GdbRsp/ResponsePackets/SupportedFeaturesResponse.hpp
diff --git a/src/DebugServers/GdbRsp/ResponsePackets/TargetStopped.hpp b/src/DebugServer/GdbRsp/ResponsePackets/TargetStopped.hpp
similarity index 100%
rename from src/DebugServers/GdbRsp/ResponsePackets/TargetStopped.hpp
rename to src/DebugServer/GdbRsp/ResponsePackets/TargetStopped.hpp
diff --git a/src/DebugServers/GdbRsp/Signal.hpp b/src/DebugServer/GdbRsp/Signal.hpp
similarity index 100%
rename from src/DebugServers/GdbRsp/Signal.hpp
rename to src/DebugServer/GdbRsp/Signal.hpp
diff --git a/src/DebugServers/GdbRsp/StopReason.hpp b/src/DebugServer/GdbRsp/StopReason.hpp
similarity index 100%
rename from src/DebugServers/GdbRsp/StopReason.hpp
rename to src/DebugServer/GdbRsp/StopReason.hpp
diff --git a/src/DebugServers/GdbRsp/TargetDescriptor.hpp b/src/DebugServer/GdbRsp/TargetDescriptor.hpp
similarity index 100%
rename from src/DebugServers/GdbRsp/TargetDescriptor.hpp
rename to src/DebugServer/GdbRsp/TargetDescriptor.hpp
diff --git a/src/DebugServers/ServerInterface.hpp b/src/DebugServer/ServerInterface.hpp
similarity index 100%
rename from src/DebugServers/ServerInterface.hpp
rename to src/DebugServer/ServerInterface.hpp