From c4af89946b1ee7f195fd493ec02102c051bc8b86 Mon Sep 17 00:00:00 2001
From: Aiken Harris <harraiken91@gmail.com>
Date: Sun, 5 Oct 2025 22:37:03 +0200
Subject: [PATCH] Restructure bootdata under boot directory

---
 CMakeLists.txt                                |  1 -
 README.md                                     | 21 ++++++++++---------
 boot/CMakeLists.txt                           |  1 +
 {bootdata => boot/bootdata}/CMakeLists.txt    |  0
 .../bootdata}/xtldr/CMakeLists.txt            |  0
 {bootdata => boot/bootdata}/xtldr/xtldr.ini   |  0
 6 files changed, 12 insertions(+), 11 deletions(-)
 rename {bootdata => boot/bootdata}/CMakeLists.txt (100%)
 rename {bootdata => boot/bootdata}/xtldr/CMakeLists.txt (100%)
 rename {bootdata => boot/bootdata}/xtldr/xtldr.ini (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa5d0089..26ea5ae8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,7 +64,6 @@ set_disk_image_size(48)
 
 # Build all subprojects
 add_subdirectory(boot)
-add_subdirectory(bootdata)
 add_subdirectory(drivers)
 add_subdirectory(sdk)
 add_subdirectory(xtldr)
diff --git a/README.md b/README.md
index bd71f4f4..6ee50996 100644
--- a/README.md
+++ b/README.md
@@ -57,16 +57,17 @@ ExectOS is in very early development stage, thus its requirements have been not
 design, it requires a modern EFI enabled hardware. It is not possible currently to boot ExectOS on a legacy BIOS.
 
 # Source structure
-| Directory   | Description                                              |
-|-------------|----------------------------------------------------------|
-| bootdata    | default configuration and data needed to boot XTOS       |
-| drivers     | XT native drivers source code                            |
-| sdk/cmake   | Host toolchain configuration and build-related functions |
-| sdk/xtdk    | XT Software Development Kit headers                      |
-| services    | integral subsystems services source code                 |
-| subsystems  | environment subsystems source code                       |
-| xtoskrnl    | XTOS kernel source code                                  |
-| xtldr       | XTOS boot loader source code                             |
+| Directory        | Description                                                  |
+|------------------|--------------------------------------------------------------|
+| boot/bootdata    | default configuration and data needed to boot XTOS           |
+| boot/bootsect    | boot sector code (MBR & VBR) initializing the boot process   |
+| drivers          | XT native drivers source code                                |
+| sdk/cmake        | Host toolchain configuration and build-related functions     |
+| sdk/xtdk         | XT Software Development Kit headers                          |
+| 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 074d682b..20afed02 100644
--- a/boot/CMakeLists.txt
+++ b/boot/CMakeLists.txt
@@ -1 +1,2 @@
+add_subdirectory(bootdata)
 add_subdirectory(bootsect)
diff --git a/bootdata/CMakeLists.txt b/boot/bootdata/CMakeLists.txt
similarity index 100%
rename from bootdata/CMakeLists.txt
rename to boot/bootdata/CMakeLists.txt
diff --git a/bootdata/xtldr/CMakeLists.txt b/boot/bootdata/xtldr/CMakeLists.txt
similarity index 100%
rename from bootdata/xtldr/CMakeLists.txt
rename to boot/bootdata/xtldr/CMakeLists.txt
diff --git a/bootdata/xtldr/xtldr.ini b/boot/bootdata/xtldr/xtldr.ini
similarity index 100%
rename from bootdata/xtldr/xtldr.ini
rename to boot/bootdata/xtldr/xtldr.ini