diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26ea5ae..c396e51 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,5 +66,4 @@ set_disk_image_size(48)
 add_subdirectory(boot)
 add_subdirectory(drivers)
 add_subdirectory(sdk)
-add_subdirectory(xtldr)
 add_subdirectory(xtoskrnl)
diff --git a/README.md b/README.md
index fa54647..2d70441 100644
--- a/README.md
+++ b/README.md
@@ -61,6 +61,7 @@ design, it requires a modern EFI enabled hardware. It is not possible currently
 |------------------|--------------------------------------------------------------|
 | boot/bootdata    | default configuration and data needed to boot XTOS           |
 | boot/bootsect    | boot sector code (MBR & VBR) initializing the boot process   |
+| boot/xtldr       | XTOS boot loader source code                                 |
 | drivers          | XT native drivers source code                                |
 | sdk/cmake        | host toolchain configuration and build-related functions     |
 | sdk/firmware     | firmware enabling XTOS to boot on virtual machines           |
@@ -68,7 +69,6 @@ design, it requires a modern EFI enabled hardware. It is not possible currently
 | services         | integral subsystems services source code                     |
 | subsystems       | environment subsystems source code                           |
 | xtoskrnl         | XTOS kernel source code                                      |
-| xtldr            | XTOS boot loader source code                                 |
 
 # Build
 XTOS can only be built using [XTchain](https://git.codingworkshop.eu.org/xt-sys/xtchain), a dedicated toolchain designed
diff --git a/boot/CMakeLists.txt b/boot/CMakeLists.txt
index 20afed0..acc4c37 100644
--- a/boot/CMakeLists.txt
+++ b/boot/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_subdirectory(bootdata)
 add_subdirectory(bootsect)
+add_subdirectory(xtldr)
diff --git a/xtldr/CMakeLists.txt b/boot/xtldr/CMakeLists.txt
similarity index 100%
rename from xtldr/CMakeLists.txt
rename to boot/xtldr/CMakeLists.txt
diff --git a/xtldr/README.md b/boot/xtldr/README.md
similarity index 100%
rename from xtldr/README.md
rename to boot/xtldr/README.md
diff --git a/xtldr/arch/amd64/memory.cc b/boot/xtldr/arch/amd64/memory.cc
similarity index 100%
rename from xtldr/arch/amd64/memory.cc
rename to boot/xtldr/arch/amd64/memory.cc
diff --git a/xtldr/arch/i686/memory.cc b/boot/xtldr/arch/i686/memory.cc
similarity index 100%
rename from xtldr/arch/i686/memory.cc
rename to boot/xtldr/arch/i686/memory.cc
diff --git a/xtldr/bootutil.cc b/boot/xtldr/bootutil.cc
similarity index 100%
rename from xtldr/bootutil.cc
rename to boot/xtldr/bootutil.cc
diff --git a/xtldr/config.cc b/boot/xtldr/config.cc
similarity index 100%
rename from xtldr/config.cc
rename to boot/xtldr/config.cc
diff --git a/xtldr/console.cc b/boot/xtldr/console.cc
similarity index 100%
rename from xtldr/console.cc
rename to boot/xtldr/console.cc
diff --git a/xtldr/data.cc b/boot/xtldr/data.cc
similarity index 100%
rename from xtldr/data.cc
rename to boot/xtldr/data.cc
diff --git a/xtldr/debug.cc b/boot/xtldr/debug.cc
similarity index 100%
rename from xtldr/debug.cc
rename to boot/xtldr/debug.cc
diff --git a/xtldr/efiutils.cc b/boot/xtldr/efiutils.cc
similarity index 100%
rename from xtldr/efiutils.cc
rename to boot/xtldr/efiutils.cc
diff --git a/xtldr/includes/libxtos.hh b/boot/xtldr/includes/libxtos.hh
similarity index 100%
rename from xtldr/includes/libxtos.hh
rename to boot/xtldr/includes/libxtos.hh
diff --git a/xtldr/includes/xtldr.hh b/boot/xtldr/includes/xtldr.hh
similarity index 100%
rename from xtldr/includes/xtldr.hh
rename to boot/xtldr/includes/xtldr.hh
diff --git a/xtldr/library/modproto.cc b/boot/xtldr/library/modproto.cc
similarity index 100%
rename from xtldr/library/modproto.cc
rename to boot/xtldr/library/modproto.cc
diff --git a/xtldr/memory.cc b/boot/xtldr/memory.cc
similarity index 100%
rename from xtldr/memory.cc
rename to boot/xtldr/memory.cc
diff --git a/xtldr/modules/CMakeLists.txt b/boot/xtldr/modules/CMakeLists.txt
similarity index 100%
rename from xtldr/modules/CMakeLists.txt
rename to boot/xtldr/modules/CMakeLists.txt
diff --git a/xtldr/modules/acpi/CMakeLists.txt b/boot/xtldr/modules/acpi/CMakeLists.txt
similarity index 100%
rename from xtldr/modules/acpi/CMakeLists.txt
rename to boot/xtldr/modules/acpi/CMakeLists.txt
diff --git a/xtldr/modules/acpi/acpi.cc b/boot/xtldr/modules/acpi/acpi.cc
similarity index 100%
rename from xtldr/modules/acpi/acpi.cc
rename to boot/xtldr/modules/acpi/acpi.cc
diff --git a/xtldr/modules/acpi/data.cc b/boot/xtldr/modules/acpi/data.cc
similarity index 100%
rename from xtldr/modules/acpi/data.cc
rename to boot/xtldr/modules/acpi/data.cc
diff --git a/xtldr/modules/acpi/includes/acpi.hh b/boot/xtldr/modules/acpi/includes/acpi.hh
similarity index 100%
rename from xtldr/modules/acpi/includes/acpi.hh
rename to boot/xtldr/modules/acpi/includes/acpi.hh
diff --git a/xtldr/modules/beep/CMakeLists.txt b/boot/xtldr/modules/beep/CMakeLists.txt
similarity index 100%
rename from xtldr/modules/beep/CMakeLists.txt
rename to boot/xtldr/modules/beep/CMakeLists.txt
diff --git a/xtldr/modules/beep/beep.cc b/boot/xtldr/modules/beep/beep.cc
similarity index 100%
rename from xtldr/modules/beep/beep.cc
rename to boot/xtldr/modules/beep/beep.cc
diff --git a/xtldr/modules/beep/data.cc b/boot/xtldr/modules/beep/data.cc
similarity index 100%
rename from xtldr/modules/beep/data.cc
rename to boot/xtldr/modules/beep/data.cc
diff --git a/xtldr/modules/beep/includes/beep.hh b/boot/xtldr/modules/beep/includes/beep.hh
similarity index 100%
rename from xtldr/modules/beep/includes/beep.hh
rename to boot/xtldr/modules/beep/includes/beep.hh
diff --git a/xtldr/modules/chainldr/CMakeLists.txt b/boot/xtldr/modules/chainldr/CMakeLists.txt
similarity index 100%
rename from xtldr/modules/chainldr/CMakeLists.txt
rename to boot/xtldr/modules/chainldr/CMakeLists.txt
diff --git a/xtldr/modules/chainldr/chainldr.cc b/boot/xtldr/modules/chainldr/chainldr.cc
similarity index 100%
rename from xtldr/modules/chainldr/chainldr.cc
rename to boot/xtldr/modules/chainldr/chainldr.cc
diff --git a/xtldr/modules/chainldr/data.cc b/boot/xtldr/modules/chainldr/data.cc
similarity index 100%
rename from xtldr/modules/chainldr/data.cc
rename to boot/xtldr/modules/chainldr/data.cc
diff --git a/xtldr/modules/chainldr/includes/chainldr.hh b/boot/xtldr/modules/chainldr/includes/chainldr.hh
similarity index 100%
rename from xtldr/modules/chainldr/includes/chainldr.hh
rename to boot/xtldr/modules/chainldr/includes/chainldr.hh
diff --git a/xtldr/modules/dummy/CMakeLists.txt b/boot/xtldr/modules/dummy/CMakeLists.txt
similarity index 100%
rename from xtldr/modules/dummy/CMakeLists.txt
rename to boot/xtldr/modules/dummy/CMakeLists.txt
diff --git a/xtldr/modules/dummy/data.cc b/boot/xtldr/modules/dummy/data.cc
similarity index 100%
rename from xtldr/modules/dummy/data.cc
rename to boot/xtldr/modules/dummy/data.cc
diff --git a/xtldr/modules/dummy/dummy.cc b/boot/xtldr/modules/dummy/dummy.cc
similarity index 100%
rename from xtldr/modules/dummy/dummy.cc
rename to boot/xtldr/modules/dummy/dummy.cc
diff --git a/xtldr/modules/dummy/includes/dummy.hh b/boot/xtldr/modules/dummy/includes/dummy.hh
similarity index 100%
rename from xtldr/modules/dummy/includes/dummy.hh
rename to boot/xtldr/modules/dummy/includes/dummy.hh
diff --git a/xtldr/modules/framebuf/CMakeLists.txt b/boot/xtldr/modules/framebuf/CMakeLists.txt
similarity index 100%
rename from xtldr/modules/framebuf/CMakeLists.txt
rename to boot/xtldr/modules/framebuf/CMakeLists.txt
diff --git a/xtldr/modules/framebuf/data.cc b/boot/xtldr/modules/framebuf/data.cc
similarity index 100%
rename from xtldr/modules/framebuf/data.cc
rename to boot/xtldr/modules/framebuf/data.cc
diff --git a/xtldr/modules/framebuf/framebuf.cc b/boot/xtldr/modules/framebuf/framebuf.cc
similarity index 100%
rename from xtldr/modules/framebuf/framebuf.cc
rename to boot/xtldr/modules/framebuf/framebuf.cc
diff --git a/xtldr/modules/framebuf/includes/framebuf.hh b/boot/xtldr/modules/framebuf/includes/framebuf.hh
similarity index 100%
rename from xtldr/modules/framebuf/includes/framebuf.hh
rename to boot/xtldr/modules/framebuf/includes/framebuf.hh
diff --git a/xtldr/modules/pecoff/CMakeLists.txt b/boot/xtldr/modules/pecoff/CMakeLists.txt
similarity index 100%
rename from xtldr/modules/pecoff/CMakeLists.txt
rename to boot/xtldr/modules/pecoff/CMakeLists.txt
diff --git a/xtldr/modules/pecoff/data.cc b/boot/xtldr/modules/pecoff/data.cc
similarity index 100%
rename from xtldr/modules/pecoff/data.cc
rename to boot/xtldr/modules/pecoff/data.cc
diff --git a/xtldr/modules/pecoff/includes/pecoff.hh b/boot/xtldr/modules/pecoff/includes/pecoff.hh
similarity index 100%
rename from xtldr/modules/pecoff/includes/pecoff.hh
rename to boot/xtldr/modules/pecoff/includes/pecoff.hh
diff --git a/xtldr/modules/pecoff/pecoff.cc b/boot/xtldr/modules/pecoff/pecoff.cc
similarity index 100%
rename from xtldr/modules/pecoff/pecoff.cc
rename to boot/xtldr/modules/pecoff/pecoff.cc
diff --git a/xtldr/modules/xtos_o/CMakeLists.txt b/boot/xtldr/modules/xtos_o/CMakeLists.txt
similarity index 100%
rename from xtldr/modules/xtos_o/CMakeLists.txt
rename to boot/xtldr/modules/xtos_o/CMakeLists.txt
diff --git a/xtldr/modules/xtos_o/amd64/memory.cc b/boot/xtldr/modules/xtos_o/amd64/memory.cc
similarity index 100%
rename from xtldr/modules/xtos_o/amd64/memory.cc
rename to boot/xtldr/modules/xtos_o/amd64/memory.cc
diff --git a/xtldr/modules/xtos_o/data.cc b/boot/xtldr/modules/xtos_o/data.cc
similarity index 100%
rename from xtldr/modules/xtos_o/data.cc
rename to boot/xtldr/modules/xtos_o/data.cc
diff --git a/xtldr/modules/xtos_o/i686/memory.cc b/boot/xtldr/modules/xtos_o/i686/memory.cc
similarity index 100%
rename from xtldr/modules/xtos_o/i686/memory.cc
rename to boot/xtldr/modules/xtos_o/i686/memory.cc
diff --git a/xtldr/modules/xtos_o/includes/xtos.hh b/boot/xtldr/modules/xtos_o/includes/xtos.hh
similarity index 100%
rename from xtldr/modules/xtos_o/includes/xtos.hh
rename to boot/xtldr/modules/xtos_o/includes/xtos.hh
diff --git a/xtldr/modules/xtos_o/xtos.cc b/boot/xtldr/modules/xtos_o/xtos.cc
similarity index 100%
rename from xtldr/modules/xtos_o/xtos.cc
rename to boot/xtldr/modules/xtos_o/xtos.cc
diff --git a/xtldr/protocol.cc b/boot/xtldr/protocol.cc
similarity index 100%
rename from xtldr/protocol.cc
rename to boot/xtldr/protocol.cc
diff --git a/xtldr/shell.cc b/boot/xtldr/shell.cc
similarity index 100%
rename from xtldr/shell.cc
rename to boot/xtldr/shell.cc
diff --git a/xtldr/textui.cc b/boot/xtldr/textui.cc
similarity index 100%
rename from xtldr/textui.cc
rename to boot/xtldr/textui.cc
diff --git a/xtldr/volume.cc b/boot/xtldr/volume.cc
similarity index 100%
rename from xtldr/volume.cc
rename to boot/xtldr/volume.cc
diff --git a/xtldr/xtldr.cc b/boot/xtldr/xtldr.cc
similarity index 100%
rename from xtldr/xtldr.cc
rename to boot/xtldr/xtldr.cc