diff --git a/generic/Containerfile b/bootc/base/Containerfile
similarity index 100%
rename from generic/Containerfile
rename to bootc/base/Containerfile
diff --git a/generic/env.sh b/bootc/base/env.sh
similarity index 100%
rename from generic/env.sh
rename to bootc/base/env.sh
diff --git a/generic/root/etc/ssh/sshd_config.d/00-authorized_keys.conf b/bootc/base/root/etc/ssh/sshd_config.d/00-authorized_keys.conf
similarity index 100%
rename from generic/root/etc/ssh/sshd_config.d/00-authorized_keys.conf
rename to bootc/base/root/etc/ssh/sshd_config.d/00-authorized_keys.conf
diff --git a/generic/root/etc/sudoers b/bootc/base/root/etc/sudoers
similarity index 100%
rename from generic/root/etc/sudoers
rename to bootc/base/root/etc/sudoers
diff --git a/generic/root/etc/vconsole.conf b/bootc/base/root/etc/vconsole.conf
similarity index 100%
rename from generic/root/etc/vconsole.conf
rename to bootc/base/root/etc/vconsole.conf
diff --git a/generic/root/usr/lib/bootc/kargs.d/00-console.toml b/bootc/base/root/usr/lib/bootc/kargs.d/00-console.toml
similarity index 100%
rename from generic/root/usr/lib/bootc/kargs.d/00-console.toml
rename to bootc/base/root/usr/lib/bootc/kargs.d/00-console.toml
diff --git a/config.env b/bootc/config.env
similarity index 100%
rename from config.env
rename to bootc/config.env
diff --git a/scenario1/Containerfile b/bootc/scenario1/Containerfile
similarity index 100%
rename from scenario1/Containerfile
rename to bootc/scenario1/Containerfile
diff --git a/scenario1/env.sh b/bootc/scenario1/env.sh
similarity index 100%
rename from scenario1/env.sh
rename to bootc/scenario1/env.sh
diff --git a/scenario1/root/etc/containers/systemd/configs/odoo-config.env b/bootc/scenario1/root/etc/containers/systemd/configs/odoo-config.env
similarity index 100%
rename from scenario1/root/etc/containers/systemd/configs/odoo-config.env
rename to bootc/scenario1/root/etc/containers/systemd/configs/odoo-config.env
diff --git a/scenario1/root/etc/containers/systemd/configs/odoo-db.env b/bootc/scenario1/root/etc/containers/systemd/configs/odoo-db.env
similarity index 100%
rename from scenario1/root/etc/containers/systemd/configs/odoo-db.env
rename to bootc/scenario1/root/etc/containers/systemd/configs/odoo-db.env
diff --git a/scenario1/root/etc/containers/systemd/odoo-app.container b/bootc/scenario1/root/etc/containers/systemd/odoo-app.container
similarity index 100%
rename from scenario1/root/etc/containers/systemd/odoo-app.container
rename to bootc/scenario1/root/etc/containers/systemd/odoo-app.container
diff --git a/scenario1/root/etc/containers/systemd/odoo-db.container b/bootc/scenario1/root/etc/containers/systemd/odoo-db.container
similarity index 100%
rename from scenario1/root/etc/containers/systemd/odoo-db.container
rename to bootc/scenario1/root/etc/containers/systemd/odoo-db.container
diff --git a/scenario1/root/etc/containers/systemd/odoo-init.container b/bootc/scenario1/root/etc/containers/systemd/odoo-init.container
similarity index 100%
rename from scenario1/root/etc/containers/systemd/odoo-init.container
rename to bootc/scenario1/root/etc/containers/systemd/odoo-init.container
diff --git a/scenario1/root/etc/greenboot/check/required.d/odoo-check.sh b/bootc/scenario1/root/etc/greenboot/check/required.d/odoo-check.sh
similarity index 100%
rename from scenario1/root/etc/greenboot/check/required.d/odoo-check.sh
rename to bootc/scenario1/root/etc/greenboot/check/required.d/odoo-check.sh
diff --git a/scenario1/root/etc/odoo/init.sh b/bootc/scenario1/root/etc/odoo/init.sh
similarity index 100%
rename from scenario1/root/etc/odoo/init.sh
rename to bootc/scenario1/root/etc/odoo/init.sh
diff --git a/scenario1/root/etc/odoo/odoo.conf b/bootc/scenario1/root/etc/odoo/odoo.conf
similarity index 100%
rename from scenario1/root/etc/odoo/odoo.conf
rename to bootc/scenario1/root/etc/odoo/odoo.conf
diff --git a/scenario1/root/etc/systemd/system/odoo.target b/bootc/scenario1/root/etc/systemd/system/odoo.target
similarity index 100%
rename from scenario1/root/etc/systemd/system/odoo.target
rename to bootc/scenario1/root/etc/systemd/system/odoo.target
diff --git a/scripts/build.sh b/bootc/scripts/build.sh
similarity index 100%
rename from scripts/build.sh
rename to bootc/scripts/build.sh
diff --git a/scripts/buildall.sh b/bootc/scripts/buildall.sh
old mode 100755
new mode 100644
similarity index 92%
rename from scripts/buildall.sh
rename to bootc/scripts/buildall.sh
index e09221e..291976d
--- a/scripts/buildall.sh
+++ b/bootc/scripts/buildall.sh
@@ -12,7 +12,7 @@ PROJECT_DIR="$(dirname "$SCRIPT_DIR")"
 
 . "$PROJECT_DIR/config.env"
 
-for dir in "$PROJECT_DIR"/{generic,scenario*}; do
+for dir in "$PROJECT_DIR"/{base,scenario*}; do
   if [ -d "$dir" -a -f "$dir/Containerfile" ]; then
     export SCENARIO="${dir##*/}"
     TARGET_IMAGE="$(echo -n "$TARGET_IMAGE_TEMPLATE" | envsubst)"