diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ad77251..6999b0ce 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,27 +126,27 @@ add_executable(Bloom
 
     # Debug servers
     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
+    src/DebugServer/Gdb/GdbRspDebugServer.cpp
+    src/DebugServer/Gdb/GdbDebugServerConfig.cpp
+    src/DebugServer/Gdb/Connection.cpp
+    src/DebugServer/Gdb/DebugSession.cpp
+    src/DebugServer/Gdb/CommandPackets/CommandPacket.cpp
+    src/DebugServer/Gdb/CommandPackets/SupportedFeaturesQuery.cpp
+    src/DebugServer/Gdb/CommandPackets/ReadRegisters.cpp
+    src/DebugServer/Gdb/CommandPackets/WriteRegister.cpp
+    src/DebugServer/Gdb/CommandPackets/ContinueExecution.cpp
+    src/DebugServer/Gdb/CommandPackets/StepExecution.cpp
+    src/DebugServer/Gdb/CommandPackets/InterruptExecution.cpp
+    src/DebugServer/Gdb/CommandPackets/SetBreakpoint.cpp
+    src/DebugServer/Gdb/CommandPackets/RemoveBreakpoint.cpp
+    src/DebugServer/Gdb/ResponsePackets/SupportedFeaturesResponse.cpp
 
     # AVR GDB Server
-    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
+    src/DebugServer/Gdb/AvrGdb/AvrGdbRsp.cpp
+    src/DebugServer/Gdb/AvrGdb/TargetDescriptor.cpp
+    src/DebugServer/Gdb/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.cpp
+    src/DebugServer/Gdb/AvrGdb/CommandPackets/ReadMemory.cpp
+    src/DebugServer/Gdb/AvrGdb/CommandPackets/WriteMemory.cpp
 
     # Insight
     src/Insight/Insight.cpp
diff --git a/src/DebugServer/DebugServerComponent.cpp b/src/DebugServer/DebugServerComponent.cpp
index 265823f2..926a1572 100644
--- a/src/DebugServer/DebugServerComponent.cpp
+++ b/src/DebugServer/DebugServerComponent.cpp
@@ -3,7 +3,7 @@
 #include <variant>
 
 // Debug server implementations
-#include "GdbRsp/AvrGdb/AvrGdbRsp.hpp"
+#include "Gdb/AvrGdb/AvrGdbRsp.hpp"
 
 #include "src/Exceptions/InvalidConfig.hpp"
 #include "src/Logger/Logger.hpp"
diff --git a/src/DebugServer/GdbRsp/AvrGdb/AvrGdbRsp.cpp b/src/DebugServer/Gdb/AvrGdb/AvrGdbRsp.cpp
similarity index 100%
rename from src/DebugServer/GdbRsp/AvrGdb/AvrGdbRsp.cpp
rename to src/DebugServer/Gdb/AvrGdb/AvrGdbRsp.cpp
diff --git a/src/DebugServer/GdbRsp/AvrGdb/AvrGdbRsp.hpp b/src/DebugServer/Gdb/AvrGdb/AvrGdbRsp.hpp
similarity index 97%
rename from src/DebugServer/GdbRsp/AvrGdb/AvrGdbRsp.hpp
rename to src/DebugServer/Gdb/AvrGdb/AvrGdbRsp.hpp
index 09682e33..3481de47 100644
--- a/src/DebugServer/GdbRsp/AvrGdb/AvrGdbRsp.hpp
+++ b/src/DebugServer/Gdb/AvrGdb/AvrGdbRsp.hpp
@@ -4,7 +4,7 @@
 
 #include "TargetDescriptor.hpp"
 
-#include "src/DebugServer/GdbRsp/GdbRspDebugServer.hpp"
+#include "src/DebugServer/Gdb/GdbRspDebugServer.hpp"
 
 namespace Bloom::DebugServer::Gdb::AvrGdb
 {
diff --git a/src/DebugServer/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.cpp b/src/DebugServer/Gdb/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.cpp
similarity index 57%
rename from src/DebugServer/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.cpp
rename to src/DebugServer/Gdb/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.cpp
index bcf9243a..e0dc7597 100644
--- a/src/DebugServer/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.cpp
+++ b/src/DebugServer/Gdb/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.cpp
@@ -1,8 +1,8 @@
 #include "AbstractMemoryAccessPacket.hpp"
 
-#include "src/DebugServer/GdbRsp/ResponsePackets/TargetStopped.hpp"
-#include "src/DebugServer/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
-#include "src/DebugServer/GdbRsp/Signal.hpp"
+#include "src/DebugServer/Gdb/ResponsePackets/TargetStopped.hpp"
+#include "src/DebugServer/Gdb/ResponsePackets/ErrorResponsePacket.hpp"
+#include "src/DebugServer/Gdb/Signal.hpp"
 
 #include "src/Logger/Logger.hpp"
 #include "src/Exceptions/Exception.hpp"
diff --git a/src/DebugServer/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.hpp b/src/DebugServer/Gdb/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.hpp
similarity index 96%
rename from src/DebugServer/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.hpp
rename to src/DebugServer/Gdb/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.hpp
index 40f94db3..ca0b8bf3 100644
--- a/src/DebugServer/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.hpp
+++ b/src/DebugServer/Gdb/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.hpp
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <optional>
 
-#include "src/DebugServer/GdbRsp/CommandPackets/CommandPacket.hpp"
+#include "src/DebugServer/Gdb/CommandPackets/CommandPacket.hpp"
 
 #include "src/Targets/TargetMemory.hpp"
 
diff --git a/src/DebugServer/GdbRsp/AvrGdb/CommandPackets/ReadMemory.cpp b/src/DebugServer/Gdb/AvrGdb/CommandPackets/ReadMemory.cpp
similarity index 94%
rename from src/DebugServer/GdbRsp/AvrGdb/CommandPackets/ReadMemory.cpp
rename to src/DebugServer/Gdb/AvrGdb/CommandPackets/ReadMemory.cpp
index 3529c0fb..167e3c0c 100644
--- a/src/DebugServer/GdbRsp/AvrGdb/CommandPackets/ReadMemory.cpp
+++ b/src/DebugServer/Gdb/AvrGdb/CommandPackets/ReadMemory.cpp
@@ -1,7 +1,7 @@
 #include "ReadMemory.hpp"
 
-#include "src/DebugServer/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
-#include "src/DebugServer/GdbRsp/ResponsePackets/ResponsePacket.hpp"
+#include "src/DebugServer/Gdb/ResponsePackets/ErrorResponsePacket.hpp"
+#include "src/DebugServer/Gdb/ResponsePackets/ResponsePacket.hpp"
 
 #include "src/Logger/Logger.hpp"
 #include "src/Exceptions/Exception.hpp"
diff --git a/src/DebugServer/GdbRsp/AvrGdb/CommandPackets/ReadMemory.hpp b/src/DebugServer/Gdb/AvrGdb/CommandPackets/ReadMemory.hpp
similarity index 100%
rename from src/DebugServer/GdbRsp/AvrGdb/CommandPackets/ReadMemory.hpp
rename to src/DebugServer/Gdb/AvrGdb/CommandPackets/ReadMemory.hpp
diff --git a/src/DebugServer/GdbRsp/AvrGdb/CommandPackets/WriteMemory.cpp b/src/DebugServer/Gdb/AvrGdb/CommandPackets/WriteMemory.cpp
similarity index 95%
rename from src/DebugServer/GdbRsp/AvrGdb/CommandPackets/WriteMemory.cpp
rename to src/DebugServer/Gdb/AvrGdb/CommandPackets/WriteMemory.cpp
index 45faf534..d77261be 100644
--- a/src/DebugServer/GdbRsp/AvrGdb/CommandPackets/WriteMemory.cpp
+++ b/src/DebugServer/Gdb/AvrGdb/CommandPackets/WriteMemory.cpp
@@ -1,7 +1,7 @@
 #include "WriteMemory.hpp"
 
-#include "src/DebugServer/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
-#include "src/DebugServer/GdbRsp/ResponsePackets/OkResponsePacket.hpp"
+#include "src/DebugServer/Gdb/ResponsePackets/ErrorResponsePacket.hpp"
+#include "src/DebugServer/Gdb/ResponsePackets/OkResponsePacket.hpp"
 
 #include "src/Logger/Logger.hpp"
 #include "src/Exceptions/Exception.hpp"
diff --git a/src/DebugServer/GdbRsp/AvrGdb/CommandPackets/WriteMemory.hpp b/src/DebugServer/Gdb/AvrGdb/CommandPackets/WriteMemory.hpp
similarity index 100%
rename from src/DebugServer/GdbRsp/AvrGdb/CommandPackets/WriteMemory.hpp
rename to src/DebugServer/Gdb/AvrGdb/CommandPackets/WriteMemory.hpp
diff --git a/src/DebugServer/GdbRsp/AvrGdb/TargetDescriptor.cpp b/src/DebugServer/Gdb/AvrGdb/TargetDescriptor.cpp
similarity index 100%
rename from src/DebugServer/GdbRsp/AvrGdb/TargetDescriptor.cpp
rename to src/DebugServer/Gdb/AvrGdb/TargetDescriptor.cpp
diff --git a/src/DebugServer/GdbRsp/AvrGdb/TargetDescriptor.hpp b/src/DebugServer/Gdb/AvrGdb/TargetDescriptor.hpp
similarity index 97%
rename from src/DebugServer/GdbRsp/AvrGdb/TargetDescriptor.hpp
rename to src/DebugServer/Gdb/AvrGdb/TargetDescriptor.hpp
index 3e8a1bd8..9ab7031b 100644
--- a/src/DebugServer/GdbRsp/AvrGdb/TargetDescriptor.hpp
+++ b/src/DebugServer/Gdb/AvrGdb/TargetDescriptor.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "src/DebugServer/GdbRsp/TargetDescriptor.hpp"
+#include "src/DebugServer/Gdb/TargetDescriptor.hpp"
 
 #include "src/Helpers/BiMap.hpp"
 
diff --git a/src/DebugServer/GdbRsp/BreakpointType.hpp b/src/DebugServer/Gdb/BreakpointType.hpp
similarity index 100%
rename from src/DebugServer/GdbRsp/BreakpointType.hpp
rename to src/DebugServer/Gdb/BreakpointType.hpp
diff --git a/src/DebugServer/GdbRsp/CommandPackets/CommandPacket.cpp b/src/DebugServer/Gdb/CommandPackets/CommandPacket.cpp
similarity index 81%
rename from src/DebugServer/GdbRsp/CommandPackets/CommandPacket.cpp
rename to src/DebugServer/Gdb/CommandPackets/CommandPacket.cpp
index 6ac46431..7248c8e5 100644
--- a/src/DebugServer/GdbRsp/CommandPackets/CommandPacket.cpp
+++ b/src/DebugServer/Gdb/CommandPackets/CommandPacket.cpp
@@ -1,11 +1,11 @@
 #include "CommandPacket.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/DebugServer/Gdb/ResponsePackets/ResponsePacket.hpp"
+#include "src/DebugServer/Gdb/ResponsePackets/OkResponsePacket.hpp"
+#include "src/DebugServer/Gdb/ResponsePackets/TargetStopped.hpp"
+#include "src/DebugServer/Gdb/ResponsePackets/ErrorResponsePacket.hpp"
 
-#include "src/DebugServer/GdbRsp/Signal.hpp"
+#include "src/DebugServer/Gdb/Signal.hpp"
 
 #include "src/Logger/Logger.hpp"
 #include "src/Exceptions/Exception.hpp"
diff --git a/src/DebugServer/GdbRsp/CommandPackets/CommandPacket.hpp b/src/DebugServer/Gdb/CommandPackets/CommandPacket.hpp
similarity index 96%
rename from src/DebugServer/GdbRsp/CommandPackets/CommandPacket.hpp
rename to src/DebugServer/Gdb/CommandPackets/CommandPacket.hpp
index 67377d21..64167973 100644
--- a/src/DebugServer/GdbRsp/CommandPackets/CommandPacket.hpp
+++ b/src/DebugServer/Gdb/CommandPackets/CommandPacket.hpp
@@ -3,8 +3,8 @@
 #include <vector>
 #include <memory>
 
-#include "src/DebugServer/GdbRsp/Packet.hpp"
-#include "src/DebugServer/GdbRsp/DebugSession.hpp"
+#include "src/DebugServer/Gdb/Packet.hpp"
+#include "src/DebugServer/Gdb/DebugSession.hpp"
 
 #include "src/TargetController/TargetControllerConsole.hpp"
 
diff --git a/src/DebugServer/GdbRsp/CommandPackets/ContinueExecution.cpp b/src/DebugServer/Gdb/CommandPackets/ContinueExecution.cpp
similarity index 93%
rename from src/DebugServer/GdbRsp/CommandPackets/ContinueExecution.cpp
rename to src/DebugServer/Gdb/CommandPackets/ContinueExecution.cpp
index 32b68492..c3a5dcf4 100644
--- a/src/DebugServer/GdbRsp/CommandPackets/ContinueExecution.cpp
+++ b/src/DebugServer/Gdb/CommandPackets/ContinueExecution.cpp
@@ -1,6 +1,6 @@
 #include "ContinueExecution.hpp"
 
-#include "src/DebugServer/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
+#include "src/DebugServer/Gdb/ResponsePackets/ErrorResponsePacket.hpp"
 
 #include "src/Logger/Logger.hpp"
 #include "src/Exceptions/Exception.hpp"
diff --git a/src/DebugServer/GdbRsp/CommandPackets/ContinueExecution.hpp b/src/DebugServer/Gdb/CommandPackets/ContinueExecution.hpp
similarity index 100%
rename from src/DebugServer/GdbRsp/CommandPackets/ContinueExecution.hpp
rename to src/DebugServer/Gdb/CommandPackets/ContinueExecution.hpp
diff --git a/src/DebugServer/GdbRsp/CommandPackets/InterruptExecution.cpp b/src/DebugServer/Gdb/CommandPackets/InterruptExecution.cpp
similarity index 82%
rename from src/DebugServer/GdbRsp/CommandPackets/InterruptExecution.cpp
rename to src/DebugServer/Gdb/CommandPackets/InterruptExecution.cpp
index e198cff1..e7aad6af 100644
--- a/src/DebugServer/GdbRsp/CommandPackets/InterruptExecution.cpp
+++ b/src/DebugServer/Gdb/CommandPackets/InterruptExecution.cpp
@@ -1,8 +1,8 @@
 #include "InterruptExecution.hpp"
 
-#include "src/DebugServer/GdbRsp/ResponsePackets/TargetStopped.hpp"
-#include "src/DebugServer/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
-#include "src/DebugServer/GdbRsp/Signal.hpp"
+#include "src/DebugServer/Gdb/ResponsePackets/TargetStopped.hpp"
+#include "src/DebugServer/Gdb/ResponsePackets/ErrorResponsePacket.hpp"
+#include "src/DebugServer/Gdb/Signal.hpp"
 
 #include "src/Logger/Logger.hpp"
 #include "src/Exceptions/Exception.hpp"
diff --git a/src/DebugServer/GdbRsp/CommandPackets/InterruptExecution.hpp b/src/DebugServer/Gdb/CommandPackets/InterruptExecution.hpp
similarity index 100%
rename from src/DebugServer/GdbRsp/CommandPackets/InterruptExecution.hpp
rename to src/DebugServer/Gdb/CommandPackets/InterruptExecution.hpp
diff --git a/src/DebugServer/GdbRsp/CommandPackets/ReadRegisters.cpp b/src/DebugServer/Gdb/CommandPackets/ReadRegisters.cpp
similarity index 96%
rename from src/DebugServer/GdbRsp/CommandPackets/ReadRegisters.cpp
rename to src/DebugServer/Gdb/CommandPackets/ReadRegisters.cpp
index 0c0c741e..5467f558 100644
--- a/src/DebugServer/GdbRsp/CommandPackets/ReadRegisters.cpp
+++ b/src/DebugServer/Gdb/CommandPackets/ReadRegisters.cpp
@@ -1,7 +1,7 @@
 #include "ReadRegisters.hpp"
 
-#include "src/DebugServer/GdbRsp/ResponsePackets/TargetStopped.hpp"
-#include "src/DebugServer/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
+#include "src/DebugServer/Gdb/ResponsePackets/TargetStopped.hpp"
+#include "src/DebugServer/Gdb/ResponsePackets/ErrorResponsePacket.hpp"
 
 #include "src/Targets/TargetRegister.hpp"
 
diff --git a/src/DebugServer/GdbRsp/CommandPackets/ReadRegisters.hpp b/src/DebugServer/Gdb/CommandPackets/ReadRegisters.hpp
similarity index 95%
rename from src/DebugServer/GdbRsp/CommandPackets/ReadRegisters.hpp
rename to src/DebugServer/Gdb/CommandPackets/ReadRegisters.hpp
index 0c6dcd1a..87931feb 100644
--- a/src/DebugServer/GdbRsp/CommandPackets/ReadRegisters.hpp
+++ b/src/DebugServer/Gdb/CommandPackets/ReadRegisters.hpp
@@ -4,7 +4,7 @@
 
 #include "CommandPacket.hpp"
 
-#include "src/DebugServer/GdbRsp/RegisterDescriptor.hpp"
+#include "src/DebugServer/Gdb/RegisterDescriptor.hpp"
 
 namespace Bloom::DebugServer::Gdb::CommandPackets
 {
diff --git a/src/DebugServer/GdbRsp/CommandPackets/RemoveBreakpoint.cpp b/src/DebugServer/Gdb/CommandPackets/RemoveBreakpoint.cpp
similarity index 93%
rename from src/DebugServer/GdbRsp/CommandPackets/RemoveBreakpoint.cpp
rename to src/DebugServer/Gdb/CommandPackets/RemoveBreakpoint.cpp
index 3037cfcb..904b49f0 100644
--- a/src/DebugServer/GdbRsp/CommandPackets/RemoveBreakpoint.cpp
+++ b/src/DebugServer/Gdb/CommandPackets/RemoveBreakpoint.cpp
@@ -2,8 +2,8 @@
 
 #include <QtCore/QString>
 
-#include "src/DebugServer/GdbRsp/ResponsePackets/OkResponsePacket.hpp"
-#include "src/DebugServer/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
+#include "src/DebugServer/Gdb/ResponsePackets/OkResponsePacket.hpp"
+#include "src/DebugServer/Gdb/ResponsePackets/ErrorResponsePacket.hpp"
 
 #include "src/Targets/TargetBreakpoint.hpp"
 
diff --git a/src/DebugServer/GdbRsp/CommandPackets/RemoveBreakpoint.hpp b/src/DebugServer/Gdb/CommandPackets/RemoveBreakpoint.hpp
similarity index 94%
rename from src/DebugServer/GdbRsp/CommandPackets/RemoveBreakpoint.hpp
rename to src/DebugServer/Gdb/CommandPackets/RemoveBreakpoint.hpp
index 0dc23cea..fe46aa35 100644
--- a/src/DebugServer/GdbRsp/CommandPackets/RemoveBreakpoint.hpp
+++ b/src/DebugServer/Gdb/CommandPackets/RemoveBreakpoint.hpp
@@ -5,7 +5,7 @@
 #include <set>
 
 #include "CommandPacket.hpp"
-#include "src/DebugServer/GdbRsp/BreakpointType.hpp"
+#include "src/DebugServer/Gdb/BreakpointType.hpp"
 
 namespace Bloom::DebugServer::Gdb::CommandPackets
 {
diff --git a/src/DebugServer/GdbRsp/CommandPackets/SetBreakpoint.cpp b/src/DebugServer/Gdb/CommandPackets/SetBreakpoint.cpp
similarity index 93%
rename from src/DebugServer/GdbRsp/CommandPackets/SetBreakpoint.cpp
rename to src/DebugServer/Gdb/CommandPackets/SetBreakpoint.cpp
index 65c64b4c..61ca4b55 100644
--- a/src/DebugServer/GdbRsp/CommandPackets/SetBreakpoint.cpp
+++ b/src/DebugServer/Gdb/CommandPackets/SetBreakpoint.cpp
@@ -2,8 +2,8 @@
 
 #include <QtCore/QString>
 
-#include "src/DebugServer/GdbRsp/ResponsePackets/OkResponsePacket.hpp"
-#include "src/DebugServer/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
+#include "src/DebugServer/Gdb/ResponsePackets/OkResponsePacket.hpp"
+#include "src/DebugServer/Gdb/ResponsePackets/ErrorResponsePacket.hpp"
 
 #include "src/Targets/TargetBreakpoint.hpp"
 
diff --git a/src/DebugServer/GdbRsp/CommandPackets/SetBreakpoint.hpp b/src/DebugServer/Gdb/CommandPackets/SetBreakpoint.hpp
similarity index 94%
rename from src/DebugServer/GdbRsp/CommandPackets/SetBreakpoint.hpp
rename to src/DebugServer/Gdb/CommandPackets/SetBreakpoint.hpp
index c3972412..08312197 100644
--- a/src/DebugServer/GdbRsp/CommandPackets/SetBreakpoint.hpp
+++ b/src/DebugServer/Gdb/CommandPackets/SetBreakpoint.hpp
@@ -5,7 +5,7 @@
 #include <set>
 
 #include "CommandPacket.hpp"
-#include "src/DebugServer/GdbRsp/BreakpointType.hpp"
+#include "src/DebugServer/Gdb/BreakpointType.hpp"
 
 namespace Bloom::DebugServer::Gdb::CommandPackets
 {
diff --git a/src/DebugServer/GdbRsp/CommandPackets/StepExecution.cpp b/src/DebugServer/Gdb/CommandPackets/StepExecution.cpp
similarity index 93%
rename from src/DebugServer/GdbRsp/CommandPackets/StepExecution.cpp
rename to src/DebugServer/Gdb/CommandPackets/StepExecution.cpp
index 046d67f6..d21a6f9f 100644
--- a/src/DebugServer/GdbRsp/CommandPackets/StepExecution.cpp
+++ b/src/DebugServer/Gdb/CommandPackets/StepExecution.cpp
@@ -1,6 +1,6 @@
 #include "StepExecution.hpp"
 
-#include "src/DebugServer/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
+#include "src/DebugServer/Gdb/ResponsePackets/ErrorResponsePacket.hpp"
 
 #include "src/Logger/Logger.hpp"
 #include "src/Exceptions/Exception.hpp"
diff --git a/src/DebugServer/GdbRsp/CommandPackets/StepExecution.hpp b/src/DebugServer/Gdb/CommandPackets/StepExecution.hpp
similarity index 100%
rename from src/DebugServer/GdbRsp/CommandPackets/StepExecution.hpp
rename to src/DebugServer/Gdb/CommandPackets/StepExecution.hpp
diff --git a/src/DebugServer/GdbRsp/CommandPackets/SupportedFeaturesQuery.cpp b/src/DebugServer/Gdb/CommandPackets/SupportedFeaturesQuery.cpp
similarity index 90%
rename from src/DebugServer/GdbRsp/CommandPackets/SupportedFeaturesQuery.cpp
rename to src/DebugServer/Gdb/CommandPackets/SupportedFeaturesQuery.cpp
index c8f5ab11..9bef4c1d 100644
--- a/src/DebugServer/GdbRsp/CommandPackets/SupportedFeaturesQuery.cpp
+++ b/src/DebugServer/Gdb/CommandPackets/SupportedFeaturesQuery.cpp
@@ -2,14 +2,14 @@
 
 #include <QtCore/QString>
 
-#include "src/DebugServer/GdbRsp/Feature.hpp"
+#include "src/DebugServer/Gdb/Feature.hpp"
 
-#include "src/DebugServer/GdbRsp/ResponsePackets/SupportedFeaturesResponse.hpp"
-#include "src/DebugServer/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
+#include "src/DebugServer/Gdb/ResponsePackets/SupportedFeaturesResponse.hpp"
+#include "src/DebugServer/Gdb/ResponsePackets/ErrorResponsePacket.hpp"
 
 #include "src/Logger/Logger.hpp"
 #include "src/Exceptions/Exception.hpp"
-#include "src/DebugServer/GdbRsp/Exceptions/ClientNotSupported.hpp"
+#include "src/DebugServer/Gdb/Exceptions/ClientNotSupported.hpp"
 
 namespace Bloom::DebugServer::Gdb::CommandPackets
 {
diff --git a/src/DebugServer/GdbRsp/CommandPackets/SupportedFeaturesQuery.hpp b/src/DebugServer/Gdb/CommandPackets/SupportedFeaturesQuery.hpp
similarity index 100%
rename from src/DebugServer/GdbRsp/CommandPackets/SupportedFeaturesQuery.hpp
rename to src/DebugServer/Gdb/CommandPackets/SupportedFeaturesQuery.hpp
diff --git a/src/DebugServer/GdbRsp/CommandPackets/WriteRegister.cpp b/src/DebugServer/Gdb/CommandPackets/WriteRegister.cpp
similarity index 93%
rename from src/DebugServer/GdbRsp/CommandPackets/WriteRegister.cpp
rename to src/DebugServer/Gdb/CommandPackets/WriteRegister.cpp
index ebdfdfda..a3e8d7e2 100644
--- a/src/DebugServer/GdbRsp/CommandPackets/WriteRegister.cpp
+++ b/src/DebugServer/Gdb/CommandPackets/WriteRegister.cpp
@@ -1,8 +1,8 @@
 #include "WriteRegister.hpp"
 
-#include "src/DebugServer/GdbRsp/ResponsePackets/TargetStopped.hpp"
-#include "src/DebugServer/GdbRsp/ResponsePackets/OkResponsePacket.hpp"
-#include "src/DebugServer/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp"
+#include "src/DebugServer/Gdb/ResponsePackets/TargetStopped.hpp"
+#include "src/DebugServer/Gdb/ResponsePackets/OkResponsePacket.hpp"
+#include "src/DebugServer/Gdb/ResponsePackets/ErrorResponsePacket.hpp"
 
 #include "src/Targets/TargetRegister.hpp"
 
diff --git a/src/DebugServer/GdbRsp/CommandPackets/WriteRegister.hpp b/src/DebugServer/Gdb/CommandPackets/WriteRegister.hpp
similarity index 100%
rename from src/DebugServer/GdbRsp/CommandPackets/WriteRegister.hpp
rename to src/DebugServer/Gdb/CommandPackets/WriteRegister.hpp
diff --git a/src/DebugServer/GdbRsp/Connection.cpp b/src/DebugServer/Gdb/Connection.cpp
similarity index 100%
rename from src/DebugServer/GdbRsp/Connection.cpp
rename to src/DebugServer/Gdb/Connection.cpp
diff --git a/src/DebugServer/GdbRsp/Connection.hpp b/src/DebugServer/Gdb/Connection.hpp
similarity index 97%
rename from src/DebugServer/GdbRsp/Connection.hpp
rename to src/DebugServer/Gdb/Connection.hpp
index c77398b4..b986bcb0 100644
--- a/src/DebugServer/GdbRsp/Connection.hpp
+++ b/src/DebugServer/Gdb/Connection.hpp
@@ -12,8 +12,8 @@
 #include "src/Helpers/EventNotifier.hpp"
 #include "src/Helpers/EpollInstance.hpp"
 
-#include "src/DebugServer/GdbRsp/Packet.hpp"
-#include "src/DebugServer/GdbRsp/ResponsePackets/ResponsePacket.hpp"
+#include "src/DebugServer/Gdb/Packet.hpp"
+#include "src/DebugServer/Gdb/ResponsePackets/ResponsePacket.hpp"
 
 namespace Bloom::DebugServer::Gdb
 {
diff --git a/src/DebugServer/GdbRsp/DebugSession.cpp b/src/DebugServer/Gdb/DebugSession.cpp
similarity index 100%
rename from src/DebugServer/GdbRsp/DebugSession.cpp
rename to src/DebugServer/Gdb/DebugSession.cpp
diff --git a/src/DebugServer/GdbRsp/DebugSession.hpp b/src/DebugServer/Gdb/DebugSession.hpp
similarity index 100%
rename from src/DebugServer/GdbRsp/DebugSession.hpp
rename to src/DebugServer/Gdb/DebugSession.hpp
diff --git a/src/DebugServer/GdbRsp/Exceptions/ClientCommunicationError.hpp b/src/DebugServer/Gdb/Exceptions/ClientCommunicationError.hpp
similarity index 100%
rename from src/DebugServer/GdbRsp/Exceptions/ClientCommunicationError.hpp
rename to src/DebugServer/Gdb/Exceptions/ClientCommunicationError.hpp
diff --git a/src/DebugServer/GdbRsp/Exceptions/ClientDisconnected.hpp b/src/DebugServer/Gdb/Exceptions/ClientDisconnected.hpp
similarity index 100%
rename from src/DebugServer/GdbRsp/Exceptions/ClientDisconnected.hpp
rename to src/DebugServer/Gdb/Exceptions/ClientDisconnected.hpp
diff --git a/src/DebugServer/GdbRsp/Exceptions/ClientNotSupported.hpp b/src/DebugServer/Gdb/Exceptions/ClientNotSupported.hpp
similarity index 100%
rename from src/DebugServer/GdbRsp/Exceptions/ClientNotSupported.hpp
rename to src/DebugServer/Gdb/Exceptions/ClientNotSupported.hpp
diff --git a/src/DebugServer/GdbRsp/Exceptions/DebugSessionAborted.hpp b/src/DebugServer/Gdb/Exceptions/DebugSessionAborted.hpp
similarity index 100%
rename from src/DebugServer/GdbRsp/Exceptions/DebugSessionAborted.hpp
rename to src/DebugServer/Gdb/Exceptions/DebugSessionAborted.hpp
diff --git a/src/DebugServer/GdbRsp/Feature.hpp b/src/DebugServer/Gdb/Feature.hpp
similarity index 100%
rename from src/DebugServer/GdbRsp/Feature.hpp
rename to src/DebugServer/Gdb/Feature.hpp
diff --git a/src/DebugServer/GdbRsp/GdbDebugServerConfig.cpp b/src/DebugServer/Gdb/GdbDebugServerConfig.cpp
similarity index 100%
rename from src/DebugServer/GdbRsp/GdbDebugServerConfig.cpp
rename to src/DebugServer/Gdb/GdbDebugServerConfig.cpp
diff --git a/src/DebugServer/GdbRsp/GdbDebugServerConfig.hpp b/src/DebugServer/Gdb/GdbDebugServerConfig.hpp
similarity index 100%
rename from src/DebugServer/GdbRsp/GdbDebugServerConfig.hpp
rename to src/DebugServer/Gdb/GdbDebugServerConfig.hpp
diff --git a/src/DebugServer/GdbRsp/GdbRspDebugServer.cpp b/src/DebugServer/Gdb/GdbRspDebugServer.cpp
similarity index 100%
rename from src/DebugServer/GdbRsp/GdbRspDebugServer.cpp
rename to src/DebugServer/Gdb/GdbRspDebugServer.cpp
diff --git a/src/DebugServer/GdbRsp/GdbRspDebugServer.hpp b/src/DebugServer/Gdb/GdbRspDebugServer.hpp
similarity index 100%
rename from src/DebugServer/GdbRsp/GdbRspDebugServer.hpp
rename to src/DebugServer/Gdb/GdbRspDebugServer.hpp
diff --git a/src/DebugServer/GdbRsp/Packet.hpp b/src/DebugServer/Gdb/Packet.hpp
similarity index 100%
rename from src/DebugServer/GdbRsp/Packet.hpp
rename to src/DebugServer/Gdb/Packet.hpp
diff --git a/src/DebugServer/GdbRsp/RegisterDescriptor.hpp b/src/DebugServer/Gdb/RegisterDescriptor.hpp
similarity index 100%
rename from src/DebugServer/GdbRsp/RegisterDescriptor.hpp
rename to src/DebugServer/Gdb/RegisterDescriptor.hpp
diff --git a/src/DebugServer/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp b/src/DebugServer/Gdb/ResponsePackets/ErrorResponsePacket.hpp
similarity index 100%
rename from src/DebugServer/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp
rename to src/DebugServer/Gdb/ResponsePackets/ErrorResponsePacket.hpp
diff --git a/src/DebugServer/GdbRsp/ResponsePackets/OkResponsePacket.hpp b/src/DebugServer/Gdb/ResponsePackets/OkResponsePacket.hpp
similarity index 100%
rename from src/DebugServer/GdbRsp/ResponsePackets/OkResponsePacket.hpp
rename to src/DebugServer/Gdb/ResponsePackets/OkResponsePacket.hpp
diff --git a/src/DebugServer/GdbRsp/ResponsePackets/ResponsePacket.hpp b/src/DebugServer/Gdb/ResponsePackets/ResponsePacket.hpp
similarity index 91%
rename from src/DebugServer/GdbRsp/ResponsePackets/ResponsePacket.hpp
rename to src/DebugServer/Gdb/ResponsePackets/ResponsePacket.hpp
index 78a9cb22..78a4d08e 100644
--- a/src/DebugServer/GdbRsp/ResponsePackets/ResponsePacket.hpp
+++ b/src/DebugServer/Gdb/ResponsePackets/ResponsePacket.hpp
@@ -3,7 +3,7 @@
 #include <vector>
 #include <memory>
 
-#include "src/DebugServer/GdbRsp/Packet.hpp"
+#include "src/DebugServer/Gdb/Packet.hpp"
 
 namespace Bloom::DebugServer::Gdb::ResponsePackets
 {
diff --git a/src/DebugServer/GdbRsp/ResponsePackets/SupportedFeaturesResponse.cpp b/src/DebugServer/Gdb/ResponsePackets/SupportedFeaturesResponse.cpp
similarity index 100%
rename from src/DebugServer/GdbRsp/ResponsePackets/SupportedFeaturesResponse.cpp
rename to src/DebugServer/Gdb/ResponsePackets/SupportedFeaturesResponse.cpp
diff --git a/src/DebugServer/GdbRsp/ResponsePackets/SupportedFeaturesResponse.hpp b/src/DebugServer/Gdb/ResponsePackets/SupportedFeaturesResponse.hpp
similarity index 100%
rename from src/DebugServer/GdbRsp/ResponsePackets/SupportedFeaturesResponse.hpp
rename to src/DebugServer/Gdb/ResponsePackets/SupportedFeaturesResponse.hpp
diff --git a/src/DebugServer/GdbRsp/ResponsePackets/TargetStopped.hpp b/src/DebugServer/Gdb/ResponsePackets/TargetStopped.hpp
similarity index 100%
rename from src/DebugServer/GdbRsp/ResponsePackets/TargetStopped.hpp
rename to src/DebugServer/Gdb/ResponsePackets/TargetStopped.hpp
diff --git a/src/DebugServer/GdbRsp/Signal.hpp b/src/DebugServer/Gdb/Signal.hpp
similarity index 100%
rename from src/DebugServer/GdbRsp/Signal.hpp
rename to src/DebugServer/Gdb/Signal.hpp
diff --git a/src/DebugServer/GdbRsp/StopReason.hpp b/src/DebugServer/Gdb/StopReason.hpp
similarity index 100%
rename from src/DebugServer/GdbRsp/StopReason.hpp
rename to src/DebugServer/Gdb/StopReason.hpp
diff --git a/src/DebugServer/GdbRsp/TargetDescriptor.hpp b/src/DebugServer/Gdb/TargetDescriptor.hpp
similarity index 100%
rename from src/DebugServer/GdbRsp/TargetDescriptor.hpp
rename to src/DebugServer/Gdb/TargetDescriptor.hpp
diff --git a/src/DebugServer/README.md b/src/DebugServer/README.md
index 1b913484..22074285 100644
--- a/src/DebugServer/README.md
+++ b/src/DebugServer/README.md
@@ -5,7 +5,7 @@ DebugServer runs on a dedicated thread. The entry point is `DebugServerComponent
 the DebugServer thread once the TargetController has been started. See `Applciation::startDebugServer()` for more.
 
 The DebugServer is designed to accommodate numerous server implementations. The interface exposed by the server is 
-implementation-defined. For example, the [AVR GDB server](./GdbRsp/AvrGdb/AvrGdbRsp.hpp) exposes an interface to the 
+implementation-defined. For example, the [AVR GDB server](./Gdb/AvrGdb/AvrGdbRsp.hpp) exposes an interface to the 
 connected AVR target, by implementing the 
 [GDB Remote Serial Protocol](https://sourceware.org/gdb/onlinedocs/gdb/Remote-Protocol.html), over a TCP/IP connection.
 Each server must implement the interface defined in the [`ServerInterface` class](./ServerInterface.hpp).
@@ -51,8 +51,8 @@ Key points:
 With an `EventNotifer` and `EpollInstance`, one can perform a blocking I/O operation which can be interrupted by an 
 event. For an example of this, see the AVR GDB server implementation - it employs the method described above to allow 
 the interruption of blocking I/O operations when an event is triggered. Specifically, 
-[`GdbRspDebugServer::waitForConnection()`](./GdbRsp/GdbRspDebugServer.hpp) or 
-[`Gdb::Connection::read()`](./GdbRsp/Connection.hpp).
+[`GdbRspDebugServer::waitForConnection()`](./Gdb/GdbRspDebugServer.hpp) or
+[`Gdb::Connection::read()`](./Gdb/Connection.hpp).
 
 ### Server implementations
 
diff --git a/src/Insight/UserInterfaces/InsightWindow/Images/curiosity-nano-700-160.png b/src/Insight/UserInterfaces/InsightWindow/Images/curiosity-nano-700-160.png
new file mode 100644
index 00000000..3a0f10a1
Binary files /dev/null and b/src/Insight/UserInterfaces/InsightWindow/Images/curiosity-nano-700-160.png differ