diff --git a/Host/Source/MainUnit.dfm b/Host/Source/MicroBoot/MainUnit.dfm
similarity index 100%
rename from Host/Source/MainUnit.dfm
rename to Host/Source/MicroBoot/MainUnit.dfm
diff --git a/Host/Source/MainUnit.pas b/Host/Source/MicroBoot/MainUnit.pas
similarity index 100%
rename from Host/Source/MainUnit.pas
rename to Host/Source/MicroBoot/MainUnit.pas
diff --git a/Host/Source/MicroBoot.cfg b/Host/Source/MicroBoot/MicroBoot.cfg
similarity index 100%
rename from Host/Source/MicroBoot.cfg
rename to Host/Source/MicroBoot/MicroBoot.cfg
diff --git a/Host/Source/MicroBoot.dof b/Host/Source/MicroBoot/MicroBoot.dof
similarity index 100%
rename from Host/Source/MicroBoot.dof
rename to Host/Source/MicroBoot/MicroBoot.dof
diff --git a/Host/Source/MicroBoot.dpr b/Host/Source/MicroBoot/MicroBoot.dpr
similarity index 100%
rename from Host/Source/MicroBoot.dpr
rename to Host/Source/MicroBoot/MicroBoot.dpr
diff --git a/Host/Source/MicroBoot.ico b/Host/Source/MicroBoot/MicroBoot.ico
similarity index 100%
rename from Host/Source/MicroBoot.ico
rename to Host/Source/MicroBoot/MicroBoot.ico
diff --git a/Host/Source/SettingsUnit.dfm b/Host/Source/MicroBoot/SettingsUnit.dfm
similarity index 100%
rename from Host/Source/SettingsUnit.dfm
rename to Host/Source/MicroBoot/SettingsUnit.dfm
diff --git a/Host/Source/SettingsUnit.pas b/Host/Source/MicroBoot/SettingsUnit.pas
similarity index 100%
rename from Host/Source/SettingsUnit.pas
rename to Host/Source/MicroBoot/SettingsUnit.pas
diff --git a/Host/Source/StopWatch.pas b/Host/Source/MicroBoot/StopWatch.pas
similarity index 100%
rename from Host/Source/StopWatch.pas
rename to Host/Source/MicroBoot/StopWatch.pas
diff --git a/Host/Source/interfaces/SRecReader.pas b/Host/Source/MicroBoot/interfaces/SRecReader.pas
similarity index 100%
rename from Host/Source/interfaces/SRecReader.pas
rename to Host/Source/MicroBoot/interfaces/SRecReader.pas
diff --git a/Host/Source/interfaces/XcpDataFile.pas b/Host/Source/MicroBoot/interfaces/XcpDataFile.pas
similarity index 100%
rename from Host/Source/interfaces/XcpDataFile.pas
rename to Host/Source/MicroBoot/interfaces/XcpDataFile.pas
diff --git a/Host/Source/interfaces/XcpIcon.bmp b/Host/Source/MicroBoot/interfaces/XcpIcon.bmp
similarity index 100%
rename from Host/Source/interfaces/XcpIcon.bmp
rename to Host/Source/MicroBoot/interfaces/XcpIcon.bmp
diff --git a/Host/Source/interfaces/XcpLoader.pas b/Host/Source/MicroBoot/interfaces/XcpLoader.pas
similarity index 100%
rename from Host/Source/interfaces/XcpLoader.pas
rename to Host/Source/MicroBoot/interfaces/XcpLoader.pas
diff --git a/Host/Source/interfaces/XcpProtection.pas b/Host/Source/MicroBoot/interfaces/XcpProtection.pas
similarity index 100%
rename from Host/Source/interfaces/XcpProtection.pas
rename to Host/Source/MicroBoot/interfaces/XcpProtection.pas
diff --git a/Host/Source/interfaces/can/peak/CANIcon.bmp b/Host/Source/MicroBoot/interfaces/can/peak/CANIcon.bmp
similarity index 100%
rename from Host/Source/interfaces/can/peak/CANIcon.bmp
rename to Host/Source/MicroBoot/interfaces/can/peak/CANIcon.bmp
diff --git a/Host/Source/interfaces/can/peak/PCANdrvD.pas b/Host/Source/MicroBoot/interfaces/can/peak/PCANdrvD.pas
similarity index 100%
rename from Host/Source/interfaces/can/peak/PCANdrvD.pas
rename to Host/Source/MicroBoot/interfaces/can/peak/PCANdrvD.pas
diff --git a/Host/Source/interfaces/can/peak/Pcan_usb.pas b/Host/Source/MicroBoot/interfaces/can/peak/Pcan_usb.pas
similarity index 100%
rename from Host/Source/interfaces/can/peak/Pcan_usb.pas
rename to Host/Source/MicroBoot/interfaces/can/peak/Pcan_usb.pas
diff --git a/Host/Source/interfaces/can/peak/XcpSettings.dfm b/Host/Source/MicroBoot/interfaces/can/peak/XcpSettings.dfm
similarity index 100%
rename from Host/Source/interfaces/can/peak/XcpSettings.dfm
rename to Host/Source/MicroBoot/interfaces/can/peak/XcpSettings.dfm
diff --git a/Host/Source/interfaces/can/peak/XcpSettings.pas b/Host/Source/MicroBoot/interfaces/can/peak/XcpSettings.pas
similarity index 100%
rename from Host/Source/interfaces/can/peak/XcpSettings.pas
rename to Host/Source/MicroBoot/interfaces/can/peak/XcpSettings.pas
diff --git a/Host/Source/interfaces/can/peak/XcpTransport.pas b/Host/Source/MicroBoot/interfaces/can/peak/XcpTransport.pas
similarity index 100%
rename from Host/Source/interfaces/can/peak/XcpTransport.pas
rename to Host/Source/MicroBoot/interfaces/can/peak/XcpTransport.pas
diff --git a/Host/Source/interfaces/can/peak/openblt_can_peak.cfg b/Host/Source/MicroBoot/interfaces/can/peak/openblt_can_peak.cfg
similarity index 100%
rename from Host/Source/interfaces/can/peak/openblt_can_peak.cfg
rename to Host/Source/MicroBoot/interfaces/can/peak/openblt_can_peak.cfg
diff --git a/Host/Source/interfaces/can/peak/openblt_can_peak.dof b/Host/Source/MicroBoot/interfaces/can/peak/openblt_can_peak.dof
similarity index 100%
rename from Host/Source/interfaces/can/peak/openblt_can_peak.dof
rename to Host/Source/MicroBoot/interfaces/can/peak/openblt_can_peak.dof
diff --git a/Host/Source/interfaces/can/peak/openblt_can_peak.dpr b/Host/Source/MicroBoot/interfaces/can/peak/openblt_can_peak.dpr
similarity index 100%
rename from Host/Source/interfaces/can/peak/openblt_can_peak.dpr
rename to Host/Source/MicroBoot/interfaces/can/peak/openblt_can_peak.dpr
diff --git a/Host/Source/interfaces/can/vector/CANIcon.bmp b/Host/Source/MicroBoot/interfaces/can/vector/CANIcon.bmp
similarity index 100%
rename from Host/Source/interfaces/can/vector/CANIcon.bmp
rename to Host/Source/MicroBoot/interfaces/can/vector/CANIcon.bmp
diff --git a/Host/Source/interfaces/can/vector/CANdrvD.pas b/Host/Source/MicroBoot/interfaces/can/vector/CANdrvD.pas
similarity index 100%
rename from Host/Source/interfaces/can/vector/CANdrvD.pas
rename to Host/Source/MicroBoot/interfaces/can/vector/CANdrvD.pas
diff --git a/Host/Source/interfaces/can/vector/CANlibD.pas b/Host/Source/MicroBoot/interfaces/can/vector/CANlibD.pas
similarity index 100%
rename from Host/Source/interfaces/can/vector/CANlibD.pas
rename to Host/Source/MicroBoot/interfaces/can/vector/CANlibD.pas
diff --git a/Host/Source/interfaces/can/vector/XcpSettings.dfm b/Host/Source/MicroBoot/interfaces/can/vector/XcpSettings.dfm
similarity index 100%
rename from Host/Source/interfaces/can/vector/XcpSettings.dfm
rename to Host/Source/MicroBoot/interfaces/can/vector/XcpSettings.dfm
diff --git a/Host/Source/interfaces/can/vector/XcpSettings.pas b/Host/Source/MicroBoot/interfaces/can/vector/XcpSettings.pas
similarity index 100%
rename from Host/Source/interfaces/can/vector/XcpSettings.pas
rename to Host/Source/MicroBoot/interfaces/can/vector/XcpSettings.pas
diff --git a/Host/Source/interfaces/can/vector/XcpTransport.pas b/Host/Source/MicroBoot/interfaces/can/vector/XcpTransport.pas
similarity index 100%
rename from Host/Source/interfaces/can/vector/XcpTransport.pas
rename to Host/Source/MicroBoot/interfaces/can/vector/XcpTransport.pas
diff --git a/Host/Source/interfaces/can/vector/openblt_can_vector.cfg b/Host/Source/MicroBoot/interfaces/can/vector/openblt_can_vector.cfg
similarity index 100%
rename from Host/Source/interfaces/can/vector/openblt_can_vector.cfg
rename to Host/Source/MicroBoot/interfaces/can/vector/openblt_can_vector.cfg
diff --git a/Host/Source/interfaces/can/vector/openblt_can_vector.dof b/Host/Source/MicroBoot/interfaces/can/vector/openblt_can_vector.dof
similarity index 100%
rename from Host/Source/interfaces/can/vector/openblt_can_vector.dof
rename to Host/Source/MicroBoot/interfaces/can/vector/openblt_can_vector.dof
diff --git a/Host/Source/interfaces/can/vector/openblt_can_vector.dpr b/Host/Source/MicroBoot/interfaces/can/vector/openblt_can_vector.dpr
similarity index 100%
rename from Host/Source/interfaces/can/vector/openblt_can_vector.dpr
rename to Host/Source/MicroBoot/interfaces/can/vector/openblt_can_vector.dpr
diff --git a/Host/Source/interfaces/uart/CPDrv.ico b/Host/Source/MicroBoot/interfaces/uart/CPDrv.ico
similarity index 100%
rename from Host/Source/interfaces/uart/CPDrv.ico
rename to Host/Source/MicroBoot/interfaces/uart/CPDrv.ico
diff --git a/Host/Source/interfaces/uart/CPDrv.pas b/Host/Source/MicroBoot/interfaces/uart/CPDrv.pas
similarity index 100%
rename from Host/Source/interfaces/uart/CPDrv.pas
rename to Host/Source/MicroBoot/interfaces/uart/CPDrv.pas
diff --git a/Host/Source/interfaces/uart/XcpSettings.dfm b/Host/Source/MicroBoot/interfaces/uart/XcpSettings.dfm
similarity index 100%
rename from Host/Source/interfaces/uart/XcpSettings.dfm
rename to Host/Source/MicroBoot/interfaces/uart/XcpSettings.dfm
diff --git a/Host/Source/interfaces/uart/XcpSettings.pas b/Host/Source/MicroBoot/interfaces/uart/XcpSettings.pas
similarity index 100%
rename from Host/Source/interfaces/uart/XcpSettings.pas
rename to Host/Source/MicroBoot/interfaces/uart/XcpSettings.pas
diff --git a/Host/Source/interfaces/uart/XcpTransport.pas b/Host/Source/MicroBoot/interfaces/uart/XcpTransport.pas
similarity index 100%
rename from Host/Source/interfaces/uart/XcpTransport.pas
rename to Host/Source/MicroBoot/interfaces/uart/XcpTransport.pas
diff --git a/Host/Source/interfaces/uart/openblt_uart.cfg b/Host/Source/MicroBoot/interfaces/uart/openblt_uart.cfg
similarity index 100%
rename from Host/Source/interfaces/uart/openblt_uart.cfg
rename to Host/Source/MicroBoot/interfaces/uart/openblt_uart.cfg
diff --git a/Host/Source/interfaces/uart/openblt_uart.dof b/Host/Source/MicroBoot/interfaces/uart/openblt_uart.dof
similarity index 100%
rename from Host/Source/interfaces/uart/openblt_uart.dof
rename to Host/Source/MicroBoot/interfaces/uart/openblt_uart.dof
diff --git a/Host/Source/interfaces/uart/openblt_uart.dpr b/Host/Source/MicroBoot/interfaces/uart/openblt_uart.dpr
similarity index 100%
rename from Host/Source/interfaces/uart/openblt_uart.dpr
rename to Host/Source/MicroBoot/interfaces/uart/openblt_uart.dpr
diff --git a/Host/Source/interfaces/usb/UsbBulkLib.pas b/Host/Source/MicroBoot/interfaces/usb/UsbBulkLib.pas
similarity index 100%
rename from Host/Source/interfaces/usb/UsbBulkLib.pas
rename to Host/Source/MicroBoot/interfaces/usb/UsbBulkLib.pas
diff --git a/Host/Source/interfaces/usb/XcpSettings.dfm b/Host/Source/MicroBoot/interfaces/usb/XcpSettings.dfm
similarity index 100%
rename from Host/Source/interfaces/usb/XcpSettings.dfm
rename to Host/Source/MicroBoot/interfaces/usb/XcpSettings.dfm
diff --git a/Host/Source/interfaces/usb/XcpSettings.pas b/Host/Source/MicroBoot/interfaces/usb/XcpSettings.pas
similarity index 100%
rename from Host/Source/interfaces/usb/XcpSettings.pas
rename to Host/Source/MicroBoot/interfaces/usb/XcpSettings.pas
diff --git a/Host/Source/interfaces/usb/XcpTransport.pas b/Host/Source/MicroBoot/interfaces/usb/XcpTransport.pas
similarity index 100%
rename from Host/Source/interfaces/usb/XcpTransport.pas
rename to Host/Source/MicroBoot/interfaces/usb/XcpTransport.pas
diff --git a/Host/Source/interfaces/usb/openblt_usb.cfg b/Host/Source/MicroBoot/interfaces/usb/openblt_usb.cfg
similarity index 100%
rename from Host/Source/interfaces/usb/openblt_usb.cfg
rename to Host/Source/MicroBoot/interfaces/usb/openblt_usb.cfg
diff --git a/Host/Source/interfaces/usb/openblt_usb.dof b/Host/Source/MicroBoot/interfaces/usb/openblt_usb.dof
similarity index 100%
rename from Host/Source/interfaces/usb/openblt_usb.dof
rename to Host/Source/MicroBoot/interfaces/usb/openblt_usb.dof
diff --git a/Host/Source/interfaces/usb/openblt_usb.dpr b/Host/Source/MicroBoot/interfaces/usb/openblt_usb.dpr
similarity index 100%
rename from Host/Source/interfaces/usb/openblt_usb.dpr
rename to Host/Source/MicroBoot/interfaces/usb/openblt_usb.dpr
diff --git a/Host/Source/uBootInterface.pas b/Host/Source/MicroBoot/uBootInterface.pas
similarity index 100%
rename from Host/Source/uBootInterface.pas
rename to Host/Source/MicroBoot/uBootInterface.pas