diff --git a/beaglebone/boot/MLO b/boot/arm/beaglebone/MLO
similarity index 100%
rename from beaglebone/boot/MLO
rename to boot/arm/beaglebone/MLO
diff --git a/beaglebone/boot/u-boot.img b/boot/arm/beaglebone/u-boot.img
similarity index 100%
rename from beaglebone/boot/u-boot.img
rename to boot/arm/beaglebone/u-boot.img
diff --git a/beaglebone/boot/uEnv.txt b/boot/arm/beaglebone/uEnv.txt
similarity index 100%
rename from beaglebone/boot/uEnv.txt
rename to boot/arm/beaglebone/uEnv.txt
diff --git a/molecules/sabayon-arm-beaglebone-base-16G.spec b/molecules/sabayon-arm-beaglebone-base-16G.spec
index 4f4fedb..a399e4c 100644
--- a/molecules/sabayon-arm-beaglebone-base-16G.spec
+++ b/molecules/sabayon-arm-beaglebone-base-16G.spec
@@ -16,7 +16,7 @@ image_name: Sabayon_Linux_8_armv7a_BeagleBone_Base_16GB.img
 image_mb: 16000
 
 # Path to boot partition data (MLO, u-boot.img etc)
-source_boot_directory: /sabayon/beaglebone/boot
+source_boot_directory: /sabayon/boot/arm/beaglebone
 
 # External script that will generate the image file.
 # The same can be copied onto a MMC by using dd
diff --git a/molecules/sabayon-arm-beaglebone-base-4G.spec b/molecules/sabayon-arm-beaglebone-base-4G.spec
index 02c79cc..f46a59f 100644
--- a/molecules/sabayon-arm-beaglebone-base-4G.spec
+++ b/molecules/sabayon-arm-beaglebone-base-4G.spec
@@ -16,7 +16,7 @@ image_name: Sabayon_Linux_8_armv7a_BeagleBone_Base_4GB.img
 image_mb: 3800
 
 # Path to boot partition data (MLO, u-boot.img etc)
-source_boot_directory: /sabayon/beaglebone/boot
+source_boot_directory: /sabayon/boot/arm/beaglebone
 
 # External script that will generate the image file.
 # The same can be copied onto a MMC by using dd
diff --git a/molecules/sabayon-arm-beaglebone-base-8G.spec b/molecules/sabayon-arm-beaglebone-base-8G.spec
index 79250ce..c3efa69 100644
--- a/molecules/sabayon-arm-beaglebone-base-8G.spec
+++ b/molecules/sabayon-arm-beaglebone-base-8G.spec
@@ -16,7 +16,7 @@ image_name: Sabayon_Linux_8_armv7a_BeagleBone_Base_8GB.img
 image_mb: 7800
 
 # Path to boot partition data (MLO, u-boot.img etc)
-source_boot_directory: /sabayon/beaglebone/boot
+source_boot_directory: /sabayon/boot/arm/beaglebone
 
 # External script that will generate the image file.
 # The same can be copied onto a MMC by using dd