diff --git a/boot/core/boot/sabayon/grub.cfg b/boot/core/boot/sabayon/grub.cfg
index 24404ce..172f628 100644
--- a/boot/core/boot/sabayon/grub.cfg
+++ b/boot/core/boot/sabayon/grub.cfg
@@ -42,8 +42,8 @@ menuentry "Start Sabayon __VERSION__ SpinBase" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /kernel/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
-   initrd /kernel/sabayon.igz
+   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
+   initrd /boot/sabayon.igz
 }
 
 menuentry "Installation" {
@@ -52,8 +52,8 @@ menuentry "Installation" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /kernel/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet installer-text console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
-   initrd /kernel/sabayon.igz
+   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet installer-text console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
+   initrd /boot/sabayon.igz
 }
 
 submenu "Advanced Options" {
@@ -64,8 +64,8 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /kernel/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 checkdisc console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
-      initrd /kernel/sabayon.igz
+      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 checkdisc console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
+      initrd /boot/sabayon.igz
    }
 
    menuentry "Disable Kernel Mode Settings (for AMD Radeon GPUs with fglrx)" {
@@ -88,8 +88,8 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /kernel/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
-      initrd /kernel/sabayon.igz
+      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
+      initrd /boot/sabayon.igz
    }
 
    menuentry "Memory test" {
diff --git a/boot/core/isolinux/txt.cfg b/boot/core/isolinux/txt.cfg
index 66a747e..65b0cab 100644
--- a/boot/core/isolinux/txt.cfg
+++ b/boot/core/isolinux/txt.cfg
@@ -2,28 +2,28 @@ default console
 
 label console
   menu label Start Sabayon __VERSION__ SpinBase
-  kernel /kernel/sabayon
-  append initrd=/kernel/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- 
+  kernel /boot/sabayon
+  append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- 
 
 label text-install
   menu label ^Installation
-  kernel /kernel/sabayon
-  append initrd=/kernel/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet installer-text gentoo=nox nox --
+  kernel /boot/sabayon
+  append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet installer-text gentoo=nox nox --
 
 label genuine
   menu label Start in Safe ^Mode
-  kernel /kernel/sabayon
-  append initrd=/kernel/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=788 gfxpayload=800x600x16 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- 
+  kernel /boot/sabayon
+  append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=788 gfxpayload=800x600x16 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- 
 
 label checkdisk
   menu label ^Check disc for defects
-  kernel /kernel/sabayon
-  append initrd=/kernel/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 console=tty1 quiet checkdisc --
+  kernel /boot/sabayon
+  append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 console=tty1 quiet checkdisc --
 
 label debug
   menu label Deb^ug mode
-  kernel /kernel/sabayon
-  append initrd=/kernel/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug --
+  kernel /boot/sabayon
+  append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug --
 
 label memtest
   menu label Memory ^test
diff --git a/remaster/hardenedserver_grub.cfg b/remaster/hardenedserver_grub.cfg
index f93d525..d70c92b 100644
--- a/remaster/hardenedserver_grub.cfg
+++ b/remaster/hardenedserver_grub.cfg
@@ -41,8 +41,8 @@ menuentry "Start Sabayon __VERSION__ HardenedServer" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /kernel/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-   initrd /kernel/sabayon.igz
+   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+   initrd /boot/sabayon.igz
 }
 
 menuentry "Installation" {
@@ -51,8 +51,8 @@ menuentry "Installation" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /kernel/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-   initrd /kernel/sabayon.igz
+   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+   initrd /boot/sabayon.igz
 }
 
 
@@ -64,8 +64,8 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /kernel/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} gentoo=nox nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-      initrd /kernel/sabayon.igz
+      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} gentoo=nox nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+      initrd /boot/sabayon.igz
    }
 
    menuentry "Check disc for defects" {
@@ -74,8 +74,8 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /kernel/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-      initrd /kernel/sabayon.igz
+      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+      initrd /boot/sabayon.igz
    }
 
    menuentry "Disable Kernel Mode Settings (for AMD Radeon GPUs with fglrx)" {
@@ -98,8 +98,8 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /kernel/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
-      initrd /kernel/sabayon.igz
+      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
+      initrd /boot/sabayon.igz
    }
 
    menuentry "Memory test" {
diff --git a/remaster/minimal_amd64_x86_grub.cfg b/remaster/minimal_amd64_x86_grub.cfg
index c7a7a39..3cdbcf2 100644
--- a/remaster/minimal_amd64_x86_grub.cfg
+++ b/remaster/minimal_amd64_x86_grub.cfg
@@ -41,8 +41,8 @@ menuentry "Start Sabayon __VERSION__ x86_64 __FLAVOUR__" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /kernel/sabayon64 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-   initrd /kernel/sabayon64.igz
+   linux /boot/sabayon64 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+   initrd /boot/sabayon64.igz
 }
 
 menuentry "Start Sabayon __VERSION__ i686 __FLAVOUR__" {
@@ -51,8 +51,8 @@ menuentry "Start Sabayon __VERSION__ i686 __FLAVOUR__" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /kernel/sabayon32 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-   initrd /kernel/sabayon32.igz
+   linux /boot/sabayon32 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+   initrd /boot/sabayon32.igz
 }
 
 menuentry "Start Sabayon __VERSION__ x86_64 Media Center" {
@@ -61,8 +61,8 @@ menuentry "Start Sabayon __VERSION__ x86_64 Media Center" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /kernel/sabayon64 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} sabayonmce locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-   initrd /kernel/sabayon64.igz
+   linux /boot/sabayon64 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} sabayonmce locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+   initrd /boot/sabayon64.igz
 }
 
 menuentry "Start Sabayon __VERSION__ i686 Media Center" {
@@ -71,8 +71,8 @@ menuentry "Start Sabayon __VERSION__ i686 Media Center" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /kernel/sabayon32 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} sabayonmce locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-   initrd /kernel/sabayon32.igz
+   linux /boot/sabayon32 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} sabayonmce locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+   initrd /boot/sabayon32.igz
 }
 
 menuentry "Installation (x86_64)" {
@@ -81,8 +81,8 @@ menuentry "Installation (x86_64)" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /kernel/sabayon64 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-   initrd /kernel/sabayon64.igz
+   linux /boot/sabayon64 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+   initrd /boot/sabayon64.igz
 }
 
 menuentry "Installation (i686)" {
@@ -91,8 +91,8 @@ menuentry "Installation (i686)" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /kernel/sabayon32 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-   initrd /kernel/sabayon32.igz
+   linux /boot/sabayon32 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+   initrd /boot/sabayon32.igz
 }
 
 
@@ -104,8 +104,8 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /kernel/sabayon64 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} gentoo=nox nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-      initrd /kernel/sabayon64.igz
+      linux /boot/sabayon64 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} gentoo=nox nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+      initrd /boot/sabayon64.igz
    }
 
    menuentry "Console mode (i686)" {
@@ -114,8 +114,8 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /kernel/sabayon32 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} gentoo=nox nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-      initrd /kernel/sabayon32.igz
+      linux /boot/sabayon32 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} gentoo=nox nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+      initrd /boot/sabayon32.igz
    }
 
    menuentry "Check disc for defects (x86_64)" {
@@ -124,8 +124,8 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /kernel/sabayon64 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-      initrd /kernel/sabayon64.igz
+      linux /boot/sabayon64 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+      initrd /boot/sabayon64.igz
    }
 
    menuentry "Check disc for defects (i686)" {
@@ -134,8 +134,8 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /kernel/sabayon32 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-      initrd /kernel/sabayon32.igz
+      linux /boot/sabayon32 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+      initrd /boot/sabayon32.igz
    }
 
    menuentry "Disable Kernel Mode Settings (for AMD Radeon GPUs with fglrx)" {
@@ -158,8 +158,8 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /kernel/sabayon64 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
-      initrd /kernel/sabayon64.igz
+      linux /boot/sabayon64 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
+      initrd /boot/sabayon64.igz
    }
 
    menuentry "Debug mode (i686)" {
@@ -168,8 +168,8 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /kernel/sabayon32 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
-      initrd /kernel/sabayon32.igz
+      linux /boot/sabayon32 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
+      initrd /boot/sabayon32.igz
    }
 
    menuentry "Memory test" {
diff --git a/remaster/minimal_grub.cfg b/remaster/minimal_grub.cfg
index 2d55541..7fe0a6e 100644
--- a/remaster/minimal_grub.cfg
+++ b/remaster/minimal_grub.cfg
@@ -42,8 +42,8 @@ menuentry "Start Sabayon __VERSION__ __FLAVOUR__" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /kernel/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-   initrd /kernel/sabayon.igz
+   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+   initrd /boot/sabayon.igz
 }
 
 menuentry "Installation" {
@@ -52,8 +52,8 @@ menuentry "Installation" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /kernel/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-   initrd /kernel/sabayon.igz
+   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+   initrd /boot/sabayon.igz
 }
 
 
@@ -65,8 +65,8 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /kernel/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} gentoo=nox nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-      initrd /kernel/sabayon.igz
+      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} gentoo=nox nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+      initrd /boot/sabayon.igz
    }
 
    menuentry "Check disc for defects" {
@@ -75,8 +75,8 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /kernel/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-      initrd /kernel/sabayon.igz
+      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+      initrd /boot/sabayon.igz
    }
 
    menuentry "Disable Kernel Mode Settings (for AMD Radeon GPUs with fglrx)" {
@@ -99,8 +99,8 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /kernel/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
-      initrd /kernel/sabayon.igz
+      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
+      initrd /boot/sabayon.igz
    }
 
    menuentry "Memory test" {
diff --git a/remaster/serverbase_grub.cfg b/remaster/serverbase_grub.cfg
index 2e766a4..23e9e48 100644
--- a/remaster/serverbase_grub.cfg
+++ b/remaster/serverbase_grub.cfg
@@ -41,8 +41,8 @@ menuentry "Start Sabayon __VERSION__ ServerBase" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /kernel/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-   initrd /kernel/sabayon.igz
+   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+   initrd /boot/sabayon.igz
 }
 
 menuentry "Installation" {
@@ -51,8 +51,8 @@ menuentry "Installation" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /kernel/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-text locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-   initrd /kernel/sabayon.igz
+   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-text locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+   initrd /boot/sabayon.igz
 }
 
 submenu "Advanced Options" {
@@ -63,8 +63,8 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /kernel/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-      initrd /kernel/sabayon.igz
+      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+      initrd /boot/sabayon.igz
    }
 
    menuentry "Disable Kernel Mode Settings (for AMD Radeon GPUs with fglrx)" {
@@ -87,8 +87,8 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /kernel/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
-      initrd /kernel/sabayon.igz
+      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
+      initrd /boot/sabayon.igz
    }
 
    menuentry "Memory test" {
diff --git a/remaster/standard_grub.cfg b/remaster/standard_grub.cfg
index 7199a9a..eed4312 100644
--- a/remaster/standard_grub.cfg
+++ b/remaster/standard_grub.cfg
@@ -41,8 +41,8 @@ menuentry "Start Sabayon __VERSION__ __FLAVOUR__" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /kernel/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-   initrd /kernel/sabayon.igz
+   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+   initrd /boot/sabayon.igz
 }
 
 menuentry "Start Sabayon __VERSION__ Media Center" {
@@ -51,8 +51,8 @@ menuentry "Start Sabayon __VERSION__ Media Center" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /kernel/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} sabayonmce locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-   initrd /kernel/sabayon.igz
+   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} sabayonmce locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+   initrd /boot/sabayon.igz
 }
 
 menuentry "Installation" {
@@ -61,8 +61,8 @@ menuentry "Installation" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /kernel/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-   initrd /kernel/sabayon.igz
+   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+   initrd /boot/sabayon.igz
 }
 
 menuentry "Installation (Media Center)" {
@@ -71,8 +71,8 @@ menuentry "Installation (Media Center)" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /kernel/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-gui mceinstall locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-   initrd /kernel/sabayon.igz
+   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-gui mceinstall locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+   initrd /boot/sabayon.igz
 }
 
 submenu "Advanced Options" {
@@ -83,8 +83,8 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /kernel/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} gentoo=nox nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-      initrd /kernel/sabayon.igz
+      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} gentoo=nox nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+      initrd /boot/sabayon.igz
    }
 
    menuentry "Check disc for defects" {
@@ -93,8 +93,8 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /kernel/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-      initrd /kernel/sabayon.igz
+      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+      initrd /boot/sabayon.igz
    }
 
    menuentry "Disable Kernel Mode Settings (for AMD Radeon GPUs with fglrx)" {
@@ -117,8 +117,8 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /kernel/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
-      initrd /kernel/sabayon.igz
+      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
+      initrd /boot/sabayon.igz
    }
 
    menuentry "Memory test" {
diff --git a/scripts/amd64_x86_pre_iso_script.sh b/scripts/amd64_x86_pre_iso_script.sh
index 9c8c485..9901c4c 100755
--- a/scripts/amd64_x86_pre_iso_script.sh
+++ b/scripts/amd64_x86_pre_iso_script.sh
@@ -72,8 +72,8 @@ if [ -z "${tmp_dir}" ]; then
 	exit 1
 fi
 # also rename kernel and initramfs inside the CDROOT dir
-mv "${CDROOT_DIR}/kernel/sabayon" "${CDROOT_DIR}/kernel/sabayon${current_arch}" || exit 1
-mv "${CDROOT_DIR}/kernel/sabayon.igz" "${CDROOT_DIR}/kernel/sabayon${current_arch}.igz" || exit 1
+mv "${CDROOT_DIR}/boot/sabayon" "${CDROOT_DIR}/boot/sabayon${current_arch}" || exit 1
+mv "${CDROOT_DIR}/boot/sabayon.igz" "${CDROOT_DIR}/boot/sabayon${current_arch}.igz" || exit 1
 
 mount -o loop "${other_iso_path}" "${tmp_dir}" || exit 1
 other_squashfs_path="${tmp_dir}/livecd.squashfs"
@@ -83,8 +83,8 @@ if [ ! -f "${other_squashfs_path}" ]; then
 fi
 cp "${other_squashfs_path}" "${CDROOT_DIR}/livecd${other_arch}.squashfs" || exit 1
 # copy kernel and initramfs
-cp "${tmp_dir}/kernel/sabayon" "${CDROOT_DIR}/kernel/sabayon${other_arch}" || exit 1
-cp "${tmp_dir}/kernel/sabayon.igz" "${CDROOT_DIR}/kernel/sabayon${other_arch}.igz" || exit 1
+cp "${tmp_dir}/boot/sabayon" "${CDROOT_DIR}/boot/sabayon${other_arch}" || exit 1
+cp "${tmp_dir}/boot/sabayon.igz" "${CDROOT_DIR}/boot/sabayon${other_arch}.igz" || exit 1
 
 # copy back.jpg to proper location
 isolinux_img="${SABAYON_MOLECULE_HOME}/remaster/embedded_world/back.jpg"
diff --git a/scripts/generic_pre_iso_script.sh b/scripts/generic_pre_iso_script.sh
index 45231e2..f0f5b2c 100755
--- a/scripts/generic_pre_iso_script.sh
+++ b/scripts/generic_pre_iso_script.sh
@@ -23,16 +23,16 @@ elif [ "${remaster_type}" = "ServerBase" ]; then
 	echo "ServerBase trigger, copying server kernel over"
 	boot_kernel=$(find "${CHROOT_DIR}/boot" -name "kernel-*" | sort | head -n 1)
 	boot_ramfs=$(find "${CHROOT_DIR}/boot" -name "initramfs-*" | sort | head -n 1)
-	cp "${boot_kernel}" "${CDROOT_DIR}/kernel/sabayon" || exit 1
-	cp "${boot_ramfs}" "${CDROOT_DIR}/kernel/sabayon.igz" || exit 1
+	cp "${boot_kernel}" "${CDROOT_DIR}/boot/sabayon" || exit 1
+	cp "${boot_ramfs}" "${CDROOT_DIR}/boot/sabayon.igz" || exit 1
 	isolinux_source="${SABAYON_MOLECULE_HOME}/remaster/serverbase_isolinux.cfg"
 	grub_source="${SABAYON_MOLECULE_HOME}/remaster/serverbase_grub.cfg"
 elif [ "${remaster_type}" = "HardenedServer" ]; then
 	echo "HardenedServer trigger, copying server kernel over"
 	boot_kernel=$(find "${CHROOT_DIR}/boot" -name "kernel-*" | sort | head -n 1)
 	boot_ramfs=$(find "${CHROOT_DIR}/boot" -name "initramfs-*" | sort | head -n 1)
-	cp "${boot_kernel}" "${CDROOT_DIR}/kernel/sabayon" || exit 1
-	cp "${boot_ramfs}" "${CDROOT_DIR}/kernel/sabayon.igz" || exit 1
+	cp "${boot_kernel}" "${CDROOT_DIR}/boot/sabayon" || exit 1
+	cp "${boot_ramfs}" "${CDROOT_DIR}/boot/sabayon.igz" || exit 1
 	isolinux_source="${SABAYON_MOLECULE_HOME}/remaster/hardenedserver_isolinux.cfg"
 	grub_source="${SABAYON_MOLECULE_HOME}/remaster/hardenedserver_grub.cfg"
 fi
diff --git a/scripts/spinbase_pre_iso_script.sh b/scripts/spinbase_pre_iso_script.sh
index b0472e1..4151af4 100755
--- a/scripts/spinbase_pre_iso_script.sh
+++ b/scripts/spinbase_pre_iso_script.sh
@@ -8,7 +8,7 @@ SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
 export SABAYON_MOLECULE_HOME
 
 boot_dir="${CHROOT_DIR}/boot"
-cdroot_boot_dir="${CDROOT_DIR}/kernel"
+cdroot_boot_dir="${CDROOT_DIR}/boot"
 
 kernels=( "${boot_dir}"/kernel-* )
 # get the first one and see if it exists
@@ -26,8 +26,6 @@ if [ ! -f "${initramfs}" ]; then
 	exit 1
 fi
 
-mkdir -p "${cdroot_boot_dir}" || exit 1
-
 # copy kernel and initramfs
 cp "${kernel}" "${cdroot_boot_dir}"/sabayon || exit 1
 cp "${initramfs}" "${cdroot_boot_dir}"/sabayon.igz || exit 1