diff --git a/packages/kernels/mocaccino-lts/build.sh b/packages/kernels/mocaccino-lts/kernel/build.sh
similarity index 100%
rename from packages/kernels/mocaccino-lts/build.sh
rename to packages/kernels/mocaccino-lts/kernel/build.sh
diff --git a/packages/kernels/mocaccino-lts/build.yaml b/packages/kernels/mocaccino-lts/kernel/build.yaml
similarity index 100%
rename from packages/kernels/mocaccino-lts/build.yaml
rename to packages/kernels/mocaccino-lts/kernel/build.yaml
diff --git a/packages/kernels/mocaccino-lts/definition.yaml b/packages/kernels/mocaccino-lts/kernel/definition.yaml
similarity index 100%
rename from packages/kernels/mocaccino-lts/definition.yaml
rename to packages/kernels/mocaccino-lts/kernel/definition.yaml
diff --git a/packages/kernels/mocaccino-lts/finalize.yaml b/packages/kernels/mocaccino-lts/kernel/finalize.yaml
similarity index 100%
rename from packages/kernels/mocaccino-lts/finalize.yaml
rename to packages/kernels/mocaccino-lts/kernel/finalize.yaml
diff --git a/packages/kernels/mocaccino-lts/mocaccino-x86_64.config b/packages/kernels/mocaccino-lts/kernel/mocaccino-x86_64.config
similarity index 100%
rename from packages/kernels/mocaccino-lts/mocaccino-x86_64.config
rename to packages/kernels/mocaccino-lts/kernel/mocaccino-x86_64.config
diff --git a/packages/kernels/mocaccino-lts/prepare.sh b/packages/kernels/mocaccino-lts/kernel/prepare.sh
similarity index 100%
rename from packages/kernels/mocaccino-lts/prepare.sh
rename to packages/kernels/mocaccino-lts/kernel/prepare.sh
diff --git a/packages/kernels/mocaccino/build.sh b/packages/kernels/mocaccino/kernel/build.sh
similarity index 100%
rename from packages/kernels/mocaccino/build.sh
rename to packages/kernels/mocaccino/kernel/build.sh
diff --git a/packages/kernels/mocaccino/build.yaml b/packages/kernels/mocaccino/kernel/build.yaml
similarity index 100%
rename from packages/kernels/mocaccino/build.yaml
rename to packages/kernels/mocaccino/kernel/build.yaml
diff --git a/packages/kernels/mocaccino/definition.yaml b/packages/kernels/mocaccino/kernel/definition.yaml
similarity index 100%
rename from packages/kernels/mocaccino/definition.yaml
rename to packages/kernels/mocaccino/kernel/definition.yaml
diff --git a/packages/kernels/mocaccino/finalize.yaml b/packages/kernels/mocaccino/kernel/finalize.yaml
similarity index 100%
rename from packages/kernels/mocaccino/finalize.yaml
rename to packages/kernels/mocaccino/kernel/finalize.yaml
diff --git a/packages/kernels/mocaccino/mocaccino-x86_64.config b/packages/kernels/mocaccino/kernel/mocaccino-x86_64.config
similarity index 100%
rename from packages/kernels/mocaccino/mocaccino-x86_64.config
rename to packages/kernels/mocaccino/kernel/mocaccino-x86_64.config
diff --git a/packages/kernels/mocaccino/prepare.sh b/packages/kernels/mocaccino/kernel/prepare.sh
similarity index 100%
rename from packages/kernels/mocaccino/prepare.sh
rename to packages/kernels/mocaccino/kernel/prepare.sh