diff --git a/src/DebugToolDrivers/Microchip/AtmelICE/AtmelIce.cpp b/src/DebugToolDrivers/Microchip/AtmelICE/AtmelIce.cpp
index bdd3f63a..73e84433 100644
--- a/src/DebugToolDrivers/Microchip/AtmelICE/AtmelIce.cpp
+++ b/src/DebugToolDrivers/Microchip/AtmelICE/AtmelIce.cpp
@@ -1,6 +1,6 @@
 #include "AtmelIce.hpp"
 
-namespace DebugToolDrivers
+namespace DebugToolDrivers::Microchip
 {
     AtmelIce::AtmelIce()
         : EdbgDevice(
diff --git a/src/DebugToolDrivers/Microchip/AtmelICE/AtmelIce.hpp b/src/DebugToolDrivers/Microchip/AtmelICE/AtmelIce.hpp
index d50fa1f8..14b68db3 100644
--- a/src/DebugToolDrivers/Microchip/AtmelICE/AtmelIce.hpp
+++ b/src/DebugToolDrivers/Microchip/AtmelICE/AtmelIce.hpp
@@ -5,7 +5,7 @@
 
 #include "src/DebugToolDrivers/Microchip/EdbgDevice.hpp"
 
-namespace DebugToolDrivers
+namespace DebugToolDrivers::Microchip
 {
     /**
      * The Atmel-ICE device is an EDBG (Embedded Debugger) device.
diff --git a/src/DebugToolDrivers/Microchip/CuriosityNano/CuriosityNano.cpp b/src/DebugToolDrivers/Microchip/CuriosityNano/CuriosityNano.cpp
index d2ceabbf..833ea8e1 100644
--- a/src/DebugToolDrivers/Microchip/CuriosityNano/CuriosityNano.cpp
+++ b/src/DebugToolDrivers/Microchip/CuriosityNano/CuriosityNano.cpp
@@ -1,6 +1,6 @@
 #include "CuriosityNano.hpp"
 
-namespace DebugToolDrivers
+namespace DebugToolDrivers::Microchip
 {
     CuriosityNano::CuriosityNano()
         : EdbgDevice(
diff --git a/src/DebugToolDrivers/Microchip/CuriosityNano/CuriosityNano.hpp b/src/DebugToolDrivers/Microchip/CuriosityNano/CuriosityNano.hpp
index b62035de..b6b831af 100644
--- a/src/DebugToolDrivers/Microchip/CuriosityNano/CuriosityNano.hpp
+++ b/src/DebugToolDrivers/Microchip/CuriosityNano/CuriosityNano.hpp
@@ -5,7 +5,7 @@
 
 #include "src/DebugToolDrivers/Microchip/EdbgDevice.hpp"
 
-namespace DebugToolDrivers
+namespace DebugToolDrivers::Microchip
 {
     /**
      * The Curiosity Nano is an evaluation board featuring an on-board debugger. The debugger is EDBG-based.
diff --git a/src/DebugToolDrivers/Microchip/EdbgDevice.cpp b/src/DebugToolDrivers/Microchip/EdbgDevice.cpp
index 75dd1f81..16d82568 100644
--- a/src/DebugToolDrivers/Microchip/EdbgDevice.cpp
+++ b/src/DebugToolDrivers/Microchip/EdbgDevice.cpp
@@ -6,7 +6,7 @@
 #include "src/TargetController/Exceptions/DeviceFailure.hpp"
 #include "src/TargetController/Exceptions/DeviceInitializationFailure.hpp"
 
-namespace DebugToolDrivers
+namespace DebugToolDrivers::Microchip
 {
     using namespace Microchip::Protocols::Edbg::Avr;
 
diff --git a/src/DebugToolDrivers/Microchip/EdbgDevice.hpp b/src/DebugToolDrivers/Microchip/EdbgDevice.hpp
index 21bf8780..9d953d2f 100644
--- a/src/DebugToolDrivers/Microchip/EdbgDevice.hpp
+++ b/src/DebugToolDrivers/Microchip/EdbgDevice.hpp
@@ -12,7 +12,7 @@
 #include "Protocols/EDBG/AVR/EdbgAvrIspInterface.hpp"
 #include "Protocols/EDBG/EdbgTargetPowerManagementInterface.hpp"
 
-namespace DebugToolDrivers
+namespace DebugToolDrivers::Microchip
 {
     /**
      * Microchip EDBG (Embedded Debugger) devices implement the CMSIS-DAP interface. As well as the CMSIS-DAP protocol,
diff --git a/src/DebugToolDrivers/Microchip/JtagIce3/JtagIce3.cpp b/src/DebugToolDrivers/Microchip/JtagIce3/JtagIce3.cpp
index d0ce32dd..df2bb2f3 100644
--- a/src/DebugToolDrivers/Microchip/JtagIce3/JtagIce3.cpp
+++ b/src/DebugToolDrivers/Microchip/JtagIce3/JtagIce3.cpp
@@ -1,6 +1,6 @@
 #include "JtagIce3.hpp"
 
-namespace DebugToolDrivers
+namespace DebugToolDrivers::Microchip
 {
     JtagIce3::JtagIce3()
         : EdbgDevice(
diff --git a/src/DebugToolDrivers/Microchip/JtagIce3/JtagIce3.hpp b/src/DebugToolDrivers/Microchip/JtagIce3/JtagIce3.hpp
index 1cc7aff2..58a738e1 100644
--- a/src/DebugToolDrivers/Microchip/JtagIce3/JtagIce3.hpp
+++ b/src/DebugToolDrivers/Microchip/JtagIce3/JtagIce3.hpp
@@ -5,7 +5,7 @@
 
 #include "src/DebugToolDrivers/Microchip/EdbgDevice.hpp"
 
-namespace DebugToolDrivers
+namespace DebugToolDrivers::Microchip
 {
     /**
      * The JTAGICE3, from firmware version 3.x+, is an EDBG device.
diff --git a/src/DebugToolDrivers/Microchip/MplabPickit4/MplabPickit4.cpp b/src/DebugToolDrivers/Microchip/MplabPickit4/MplabPickit4.cpp
index 26878bdd..14fa5de0 100644
--- a/src/DebugToolDrivers/Microchip/MplabPickit4/MplabPickit4.cpp
+++ b/src/DebugToolDrivers/Microchip/MplabPickit4/MplabPickit4.cpp
@@ -3,7 +3,7 @@
 #include "src/TargetController/Exceptions/DeviceNotFound.hpp"
 #include "src/Services/PathService.hpp"
 
-namespace DebugToolDrivers
+namespace DebugToolDrivers::Microchip
 {
     MplabPickit4::MplabPickit4()
         : EdbgDevice(
diff --git a/src/DebugToolDrivers/Microchip/MplabPickit4/MplabPickit4.hpp b/src/DebugToolDrivers/Microchip/MplabPickit4/MplabPickit4.hpp
index b82bec29..2a142610 100644
--- a/src/DebugToolDrivers/Microchip/MplabPickit4/MplabPickit4.hpp
+++ b/src/DebugToolDrivers/Microchip/MplabPickit4/MplabPickit4.hpp
@@ -5,7 +5,7 @@
 
 #include "src/DebugToolDrivers/Microchip/EdbgDevice.hpp"
 
-namespace DebugToolDrivers
+namespace DebugToolDrivers::Microchip
 {
     /**
      * Like the MPLAB Snap, the PICkit 4 is a hybrid device. It can present itself as an EDBG (Embedded Debugger)
diff --git a/src/DebugToolDrivers/Microchip/MplabSnap/MplabSnap.cpp b/src/DebugToolDrivers/Microchip/MplabSnap/MplabSnap.cpp
index 1afd5e94..8444dd02 100644
--- a/src/DebugToolDrivers/Microchip/MplabSnap/MplabSnap.cpp
+++ b/src/DebugToolDrivers/Microchip/MplabSnap/MplabSnap.cpp
@@ -3,7 +3,7 @@
 #include "src/TargetController/Exceptions/DeviceNotFound.hpp"
 #include "src/Services/PathService.hpp"
 
-namespace DebugToolDrivers
+namespace DebugToolDrivers::Microchip
 {
     MplabSnap::MplabSnap()
         : EdbgDevice(
diff --git a/src/DebugToolDrivers/Microchip/MplabSnap/MplabSnap.hpp b/src/DebugToolDrivers/Microchip/MplabSnap/MplabSnap.hpp
index cb71536d..f38100ba 100644
--- a/src/DebugToolDrivers/Microchip/MplabSnap/MplabSnap.hpp
+++ b/src/DebugToolDrivers/Microchip/MplabSnap/MplabSnap.hpp
@@ -5,7 +5,7 @@
 
 #include "src/DebugToolDrivers/Microchip/EdbgDevice.hpp"
 
-namespace DebugToolDrivers
+namespace DebugToolDrivers::Microchip
 {
     /**
      * The MPLAB Snap device is a hybrid device - that is, it can present itself as an "MPLAB Snap ICD" device, as well
diff --git a/src/DebugToolDrivers/Microchip/PowerDebugger/PowerDebugger.cpp b/src/DebugToolDrivers/Microchip/PowerDebugger/PowerDebugger.cpp
index d06a3605..a03bd624 100644
--- a/src/DebugToolDrivers/Microchip/PowerDebugger/PowerDebugger.cpp
+++ b/src/DebugToolDrivers/Microchip/PowerDebugger/PowerDebugger.cpp
@@ -1,6 +1,6 @@
 #include "PowerDebugger.hpp"
 
-namespace DebugToolDrivers
+namespace DebugToolDrivers::Microchip
 {
     PowerDebugger::PowerDebugger()
         : EdbgDevice(
diff --git a/src/DebugToolDrivers/Microchip/PowerDebugger/PowerDebugger.hpp b/src/DebugToolDrivers/Microchip/PowerDebugger/PowerDebugger.hpp
index d8770eae..f4244b3a 100644
--- a/src/DebugToolDrivers/Microchip/PowerDebugger/PowerDebugger.hpp
+++ b/src/DebugToolDrivers/Microchip/PowerDebugger/PowerDebugger.hpp
@@ -5,7 +5,7 @@
 
 #include "src/DebugToolDrivers/Microchip/EdbgDevice.hpp"
 
-namespace DebugToolDrivers
+namespace DebugToolDrivers::Microchip
 {
     /**
      * The Power Debugger device is very similar to the Atmel-ICE. It is an EDBG device.
diff --git a/src/DebugToolDrivers/Microchip/XplainedMini/XplainedMini.cpp b/src/DebugToolDrivers/Microchip/XplainedMini/XplainedMini.cpp
index cdca0ae3..90adef06 100644
--- a/src/DebugToolDrivers/Microchip/XplainedMini/XplainedMini.cpp
+++ b/src/DebugToolDrivers/Microchip/XplainedMini/XplainedMini.cpp
@@ -1,6 +1,6 @@
 #include "XplainedMini.hpp"
 
-namespace DebugToolDrivers
+namespace DebugToolDrivers::Microchip
 {
     XplainedMini::XplainedMini()
         : EdbgDevice(
diff --git a/src/DebugToolDrivers/Microchip/XplainedMini/XplainedMini.hpp b/src/DebugToolDrivers/Microchip/XplainedMini/XplainedMini.hpp
index d6d94370..5b4213a6 100644
--- a/src/DebugToolDrivers/Microchip/XplainedMini/XplainedMini.hpp
+++ b/src/DebugToolDrivers/Microchip/XplainedMini/XplainedMini.hpp
@@ -5,7 +5,7 @@
 
 #include "src/DebugToolDrivers/Microchip/EdbgDevice.hpp"
 
-namespace DebugToolDrivers
+namespace DebugToolDrivers::Microchip
 {
     /**
      * The Xplained Mini is an evaluation board featuring an on-board debugger. The debugger is EDBG-based.
diff --git a/src/DebugToolDrivers/Microchip/XplainedNano/XplainedNano.cpp b/src/DebugToolDrivers/Microchip/XplainedNano/XplainedNano.cpp
index be519aed..2ed782e3 100644
--- a/src/DebugToolDrivers/Microchip/XplainedNano/XplainedNano.cpp
+++ b/src/DebugToolDrivers/Microchip/XplainedNano/XplainedNano.cpp
@@ -1,6 +1,6 @@
 #include "XplainedNano.hpp"
 
-namespace DebugToolDrivers
+namespace DebugToolDrivers::Microchip
 {
     XplainedNano::XplainedNano()
         : EdbgDevice(
diff --git a/src/DebugToolDrivers/Microchip/XplainedNano/XplainedNano.hpp b/src/DebugToolDrivers/Microchip/XplainedNano/XplainedNano.hpp
index bbdd0ad9..2089eaa1 100644
--- a/src/DebugToolDrivers/Microchip/XplainedNano/XplainedNano.hpp
+++ b/src/DebugToolDrivers/Microchip/XplainedNano/XplainedNano.hpp
@@ -5,7 +5,7 @@
 
 #include "src/DebugToolDrivers/Microchip/EdbgDevice.hpp"
 
-namespace DebugToolDrivers
+namespace DebugToolDrivers::Microchip
 {
     /**
      * The Xplained Nano is an evaluation board featuring an on-board debugger. The debugger is EDBG-based.
diff --git a/src/DebugToolDrivers/Microchip/XplainedPro/XplainedPro.cpp b/src/DebugToolDrivers/Microchip/XplainedPro/XplainedPro.cpp
index a6c833f1..7169f465 100644
--- a/src/DebugToolDrivers/Microchip/XplainedPro/XplainedPro.cpp
+++ b/src/DebugToolDrivers/Microchip/XplainedPro/XplainedPro.cpp
@@ -1,6 +1,6 @@
 #include "XplainedPro.hpp"
 
-namespace DebugToolDrivers
+namespace DebugToolDrivers::Microchip
 {
     XplainedPro::XplainedPro()
         : EdbgDevice(
diff --git a/src/DebugToolDrivers/Microchip/XplainedPro/XplainedPro.hpp b/src/DebugToolDrivers/Microchip/XplainedPro/XplainedPro.hpp
index 25cf6b67..35704f26 100644
--- a/src/DebugToolDrivers/Microchip/XplainedPro/XplainedPro.hpp
+++ b/src/DebugToolDrivers/Microchip/XplainedPro/XplainedPro.hpp
@@ -5,7 +5,7 @@
 
 #include "src/DebugToolDrivers/Microchip/EdbgDevice.hpp"
 
-namespace DebugToolDrivers
+namespace DebugToolDrivers::Microchip
 {
     /**
      * The Xplained Pro is an evaluation board featuring an on-board debugger. The debugger is EDBG-based.
diff --git a/src/TargetController/TargetControllerComponent.cpp b/src/TargetController/TargetControllerComponent.cpp
index f4b46a45..73d608fa 100644
--- a/src/TargetController/TargetControllerComponent.cpp
+++ b/src/TargetController/TargetControllerComponent.cpp
@@ -311,55 +311,55 @@ namespace TargetController
             {
                 "atmel-ice",
                 [] {
-                    return std::make_unique<DebugToolDrivers::AtmelIce>();
+                    return std::make_unique<DebugToolDrivers::Microchip::AtmelIce>();
                 }
             },
             {
                 "power-debugger",
                 [] {
-                    return std::make_unique<DebugToolDrivers::PowerDebugger>();
+                    return std::make_unique<DebugToolDrivers::Microchip::PowerDebugger>();
                 }
             },
             {
                 "snap",
                 [] {
-                    return std::make_unique<DebugToolDrivers::MplabSnap>();
+                    return std::make_unique<DebugToolDrivers::Microchip::MplabSnap>();
                 }
             },
             {
                 "pickit-4",
                 [] {
-                    return std::make_unique<DebugToolDrivers::MplabPickit4>();
+                    return std::make_unique<DebugToolDrivers::Microchip::MplabPickit4>();
                 }
             },
             {
                 "xplained-pro",
                 [] {
-                    return std::make_unique<DebugToolDrivers::XplainedPro>();
+                    return std::make_unique<DebugToolDrivers::Microchip::XplainedPro>();
                 }
             },
             {
                 "xplained-mini",
                 [] {
-                    return std::make_unique<DebugToolDrivers::XplainedMini>();
+                    return std::make_unique<DebugToolDrivers::Microchip::XplainedMini>();
                 }
             },
             {
                 "xplained-nano",
                 [] {
-                    return std::make_unique<DebugToolDrivers::XplainedNano>();
+                    return std::make_unique<DebugToolDrivers::Microchip::XplainedNano>();
                 }
             },
             {
                 "curiosity-nano",
                 [] {
-                    return std::make_unique<DebugToolDrivers::CuriosityNano>();
+                    return std::make_unique<DebugToolDrivers::Microchip::CuriosityNano>();
                 }
             },
             {
                 "jtagice3",
                 [] {
-                    return std::make_unique<DebugToolDrivers::JtagIce3>();
+                    return std::make_unique<DebugToolDrivers::Microchip::JtagIce3>();
                 }
             },
             {