diff --git a/Host/Source/Library/FirmwareData/pas/FirmwareData.pas b/Host/Source/MicroBoot/interfaces/FirmwareData.pas
similarity index 100%
rename from Host/Source/Library/FirmwareData/pas/FirmwareData.pas
rename to Host/Source/MicroBoot/interfaces/FirmwareData.pas
diff --git a/Host/Source/MicroBoot/interfaces/can/kvaser/openblt_can_kvaser.dpr b/Host/Source/MicroBoot/interfaces/can/kvaser/openblt_can_kvaser.dpr
index bca41c61..ff2852d7 100644
--- a/Host/Source/MicroBoot/interfaces/can/kvaser/openblt_can_kvaser.dpr
+++ b/Host/Source/MicroBoot/interfaces/can/kvaser/openblt_can_kvaser.dpr
@@ -49,8 +49,7 @@ uses
   XcpLoader in '..\..\XcpLoader.pas',
   XcpTransport in 'XcpTransport.pas',
   XcpSettings in 'XcpSettings.pas' {XcpSettingsForm},
-  FirmwareData in '..\..\..\..\Library\FirmwareData\pas\FirmwareData.pas';
-
+  FirmwareData in '..\..\FirmwareData.pas';
 
 //***************************************************************************************
 // Global Constants
diff --git a/Host/Source/MicroBoot/interfaces/can/kvaser/openblt_can_kvaser.dproj b/Host/Source/MicroBoot/interfaces/can/kvaser/openblt_can_kvaser.dproj
index c2d3529e..bbb33559 100644
--- a/Host/Source/MicroBoot/interfaces/can/kvaser/openblt_can_kvaser.dproj
+++ b/Host/Source/MicroBoot/interfaces/can/kvaser/openblt_can_kvaser.dproj
@@ -87,7 +87,7 @@
         <DCCReference Include="XcpSettings.pas">
             <Form>XcpSettingsForm</Form>
         </DCCReference>
-        <DCCReference Include="..\..\..\..\Library\FirmwareData\pas\FirmwareData.pas"/>
+        <DCCReference Include="..\..\FirmwareData.pas"/>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
diff --git a/Host/Source/MicroBoot/interfaces/can/lawicel/openblt_can_lawicel.dpr b/Host/Source/MicroBoot/interfaces/can/lawicel/openblt_can_lawicel.dpr
index f938b072..367e72b3 100644
--- a/Host/Source/MicroBoot/interfaces/can/lawicel/openblt_can_lawicel.dpr
+++ b/Host/Source/MicroBoot/interfaces/can/lawicel/openblt_can_lawicel.dpr
@@ -49,7 +49,7 @@ uses
   XcpLoader in '..\..\XcpLoader.pas',
   XcpTransport in 'XcpTransport.pas',
   XcpSettings in 'XcpSettings.pas' {XcpSettingsForm},
-  FirmwareData in '..\..\..\..\Library\FirmwareData\pas\FirmwareData.pas';
+  FirmwareData in '..\..\FirmwareData.pas';
 
 //***************************************************************************************
 // Global Constants
diff --git a/Host/Source/MicroBoot/interfaces/can/lawicel/openblt_can_lawicel.dproj b/Host/Source/MicroBoot/interfaces/can/lawicel/openblt_can_lawicel.dproj
index 786f7ce8..c176cd41 100644
--- a/Host/Source/MicroBoot/interfaces/can/lawicel/openblt_can_lawicel.dproj
+++ b/Host/Source/MicroBoot/interfaces/can/lawicel/openblt_can_lawicel.dproj
@@ -87,7 +87,7 @@
         <DCCReference Include="XcpSettings.pas">
             <Form>XcpSettingsForm</Form>
         </DCCReference>
-        <DCCReference Include="..\..\..\..\Library\FirmwareData\pas\FirmwareData.pas"/>
+        <DCCReference Include="..\..\FirmwareData.pas"/>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
diff --git a/Host/Source/MicroBoot/interfaces/can/peak/openblt_can_peak.dpr b/Host/Source/MicroBoot/interfaces/can/peak/openblt_can_peak.dpr
index 0dfa67a1..2c7cb362 100644
--- a/Host/Source/MicroBoot/interfaces/can/peak/openblt_can_peak.dpr
+++ b/Host/Source/MicroBoot/interfaces/can/peak/openblt_can_peak.dpr
@@ -50,7 +50,7 @@ uses
   XcpTransport in 'XcpTransport.pas',
   XcpSettings in 'XcpSettings.pas' {XcpSettingsForm},
   PCANBasic in 'PCANBasic.pas',
-  FirmwareData in '..\..\..\..\Library\FirmwareData\pas\FirmwareData.pas';
+  FirmwareData in '..\..\FirmwareData.pas';
 
 //***************************************************************************************
 // Global Constants
diff --git a/Host/Source/MicroBoot/interfaces/can/peak/openblt_can_peak.dproj b/Host/Source/MicroBoot/interfaces/can/peak/openblt_can_peak.dproj
index 2f51eb84..ee26432f 100644
--- a/Host/Source/MicroBoot/interfaces/can/peak/openblt_can_peak.dproj
+++ b/Host/Source/MicroBoot/interfaces/can/peak/openblt_can_peak.dproj
@@ -88,7 +88,7 @@
             <Form>XcpSettingsForm</Form>
         </DCCReference>
         <DCCReference Include="PCANBasic.pas"/>
-        <DCCReference Include="..\..\..\..\Library\FirmwareData\pas\FirmwareData.pas"/>
+        <DCCReference Include="..\..\FirmwareData.pas"/>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
diff --git a/Host/Source/MicroBoot/interfaces/net/openblt_net.dpr b/Host/Source/MicroBoot/interfaces/net/openblt_net.dpr
index 2172b302..38bda578 100644
--- a/Host/Source/MicroBoot/interfaces/net/openblt_net.dpr
+++ b/Host/Source/MicroBoot/interfaces/net/openblt_net.dpr
@@ -50,7 +50,7 @@ uses
   XcpTransport in 'XcpTransport.pas',
   XcpSettings in 'XcpSettings.pas' {XcpSettingsForm},
   WSockets in 'WSockets.pas',
-  FirmwareData in '..\..\..\Library\FirmwareData\pas\FirmwareData.pas';
+  FirmwareData in '..\FirmwareData.pas';
 
 //***************************************************************************************
 // Global Constants
diff --git a/Host/Source/MicroBoot/interfaces/net/openblt_net.dproj b/Host/Source/MicroBoot/interfaces/net/openblt_net.dproj
index ea98e2d8..1a5e6dbc 100644
--- a/Host/Source/MicroBoot/interfaces/net/openblt_net.dproj
+++ b/Host/Source/MicroBoot/interfaces/net/openblt_net.dproj
@@ -88,7 +88,7 @@
             <Form>XcpSettingsForm</Form>
         </DCCReference>
         <DCCReference Include="WSockets.pas"/>
-        <DCCReference Include="..\..\..\Library\FirmwareData\pas\FirmwareData.pas"/>
+        <DCCReference Include="..\FirmwareData.pas"/>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
diff --git a/Host/Source/MicroBoot/interfaces/uart/openblt_uart.dpr b/Host/Source/MicroBoot/interfaces/uart/openblt_uart.dpr
index 7e2b54a4..70a166d1 100644
--- a/Host/Source/MicroBoot/interfaces/uart/openblt_uart.dpr
+++ b/Host/Source/MicroBoot/interfaces/uart/openblt_uart.dpr
@@ -50,7 +50,7 @@ uses
   XcpTransport in 'XcpTransport.pas',
   XcpSettings in 'XcpSettings.pas' {XcpSettingsForm},
   CPort in 'CPort.pas',
-  FirmwareData in '..\..\..\Library\FirmwareData\pas\FirmwareData.pas';
+  FirmwareData in '..\FirmwareData.pas';
 
 //***************************************************************************************
 // Global Constants
diff --git a/Host/Source/MicroBoot/interfaces/uart/openblt_uart.dproj b/Host/Source/MicroBoot/interfaces/uart/openblt_uart.dproj
index c3fe0b58..a227eea6 100644
--- a/Host/Source/MicroBoot/interfaces/uart/openblt_uart.dproj
+++ b/Host/Source/MicroBoot/interfaces/uart/openblt_uart.dproj
@@ -88,7 +88,7 @@
             <Form>XcpSettingsForm</Form>
         </DCCReference>
         <DCCReference Include="CPort.pas"/>
-        <DCCReference Include="..\..\..\Library\FirmwareData\pas\FirmwareData.pas"/>
+        <DCCReference Include="..\FirmwareData.pas"/>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
diff --git a/Host/Source/MicroBoot/interfaces/usb/openblt_usb.dpr b/Host/Source/MicroBoot/interfaces/usb/openblt_usb.dpr
index 7a34587f..352826b4 100644
--- a/Host/Source/MicroBoot/interfaces/usb/openblt_usb.dpr
+++ b/Host/Source/MicroBoot/interfaces/usb/openblt_usb.dpr
@@ -50,7 +50,7 @@ uses
   XcpTransport in 'XcpTransport.pas',
   XcpSettings in 'XcpSettings.pas' {XcpSettingsForm},
   UsbBulkLib in 'UsbBulkLib.pas',
-  FirmwareData in '..\..\..\Library\FirmwareData\pas\FirmwareData.pas';
+  FirmwareData in '..\FirmwareData.pas';
 
 //***************************************************************************************
 // Global Constants
diff --git a/Host/Source/MicroBoot/interfaces/usb/openblt_usb.dproj b/Host/Source/MicroBoot/interfaces/usb/openblt_usb.dproj
index 4a8d109e..2a2953e3 100644
--- a/Host/Source/MicroBoot/interfaces/usb/openblt_usb.dproj
+++ b/Host/Source/MicroBoot/interfaces/usb/openblt_usb.dproj
@@ -88,7 +88,7 @@
             <Form>XcpSettingsForm</Form>
         </DCCReference>
         <DCCReference Include="UsbBulkLib.pas"/>
-        <DCCReference Include="..\..\..\Library\FirmwareData\pas\FirmwareData.pas"/>
+        <DCCReference Include="..\FirmwareData.pas"/>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
diff --git a/Host/openblt_can_kvaser.dll b/Host/openblt_can_kvaser.dll
index e52cfa55..a1fdaaa8 100644
Binary files a/Host/openblt_can_kvaser.dll and b/Host/openblt_can_kvaser.dll differ
diff --git a/Host/openblt_can_lawicel.dll b/Host/openblt_can_lawicel.dll
index 8795cb23..c24cde49 100644
Binary files a/Host/openblt_can_lawicel.dll and b/Host/openblt_can_lawicel.dll differ
diff --git a/Host/openblt_can_peak.dll b/Host/openblt_can_peak.dll
index 7b10514f..0d794485 100644
Binary files a/Host/openblt_can_peak.dll and b/Host/openblt_can_peak.dll differ
diff --git a/Host/openblt_net.dll b/Host/openblt_net.dll
index f73d78ca..5d42bc3f 100644
Binary files a/Host/openblt_net.dll and b/Host/openblt_net.dll differ
diff --git a/Host/openblt_uart.dll b/Host/openblt_uart.dll
index bab6170d..3e74f443 100644
Binary files a/Host/openblt_uart.dll and b/Host/openblt_uart.dll differ
diff --git a/Host/openblt_usb.dll b/Host/openblt_usb.dll
index ca837301..bc39769b 100644
Binary files a/Host/openblt_usb.dll and b/Host/openblt_usb.dll differ