diff --git a/meta/packages/feed-config/poky-feed-config-opkg_1.0.bb b/meta/recipes-core/feed-config/poky-feed-config-opkg_1.0.bb
similarity index 100%
rename from meta/packages/feed-config/poky-feed-config-opkg_1.0.bb
rename to meta/recipes-core/feed-config/poky-feed-config-opkg_1.0.bb
diff --git a/meta/packages/images/poky-image-core.bb b/meta/recipes-core/images/poky-image-core.bb
similarity index 100%
rename from meta/packages/images/poky-image-core.bb
rename to meta/recipes-core/images/poky-image-core.bb
diff --git a/meta/packages/tasks/task-poky-nfs.bb b/meta/recipes-core/tasks/task-poky-nfs.bb
similarity index 100%
rename from meta/packages/tasks/task-poky-nfs.bb
rename to meta/recipes-core/tasks/task-poky-nfs.bb
diff --git a/meta/packages/tasks/task-poky-sdk.bb b/meta/recipes-core/tasks/task-poky-sdk.bb
similarity index 100%
rename from meta/packages/tasks/task-poky-sdk.bb
rename to meta/recipes-core/tasks/task-poky-sdk.bb
diff --git a/meta/packages/tasks/task-poky-standalone-sdk-target.bb b/meta/recipes-core/tasks/task-poky-standalone-sdk-target.bb
similarity index 100%
rename from meta/packages/tasks/task-poky-standalone-sdk-target.bb
rename to meta/recipes-core/tasks/task-poky-standalone-sdk-target.bb
diff --git a/meta/packages/tasks/task-poky-tools.bb b/meta/recipes-core/tasks/task-poky-tools.bb
similarity index 100%
rename from meta/packages/tasks/task-poky-tools.bb
rename to meta/recipes-core/tasks/task-poky-tools.bb
diff --git a/meta/packages/tasks/task-sdk-host.bb b/meta/recipes-core/tasks/task-sdk-host.bb
similarity index 100%
rename from meta/packages/tasks/task-sdk-host.bb
rename to meta/recipes-core/tasks/task-sdk-host.bb
diff --git a/meta/packages/tasks/task-poky-sdk-gmae.bb b/meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb
similarity index 100%
rename from meta/packages/tasks/task-poky-sdk-gmae.bb
rename to meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb
diff --git a/meta/packages/tasks/task-poky-standalone-gmae-sdk-target.bb b/meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb
similarity index 100%
rename from meta/packages/tasks/task-poky-standalone-gmae-sdk-target.bb
rename to meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb
diff --git a/meta/packages/tasks/task-sdk-gmae.inc b/meta/recipes-gnome/tasks/task-sdk-gmae.inc
similarity index 100%
rename from meta/packages/tasks/task-sdk-gmae.inc
rename to meta/recipes-gnome/tasks/task-sdk-gmae.inc
diff --git a/meta/packages/images/poky-image-clutter.bb b/meta/recipes-graphics/images/poky-image-clutter.bb
similarity index 100%
rename from meta/packages/images/poky-image-clutter.bb
rename to meta/recipes-graphics/images/poky-image-clutter.bb
diff --git a/meta/packages/tasks/task-poky-clutter.bb b/meta/recipes-graphics/tasks/task-poky-clutter.bb
similarity index 100%
rename from meta/packages/tasks/task-poky-clutter.bb
rename to meta/recipes-graphics/tasks/task-poky-clutter.bb
diff --git a/meta/packages/tasks/task-poky.bb b/meta/recipes-sato/tasks/task-poky.bb
similarity index 100%
rename from meta/packages/tasks/task-poky.bb
rename to meta/recipes-sato/tasks/task-poky.bb
diff --git a/meta/packages/meta/external-csl-toolchain/SUPPORTED b/meta/recipes-tbd/meta/external-csl-toolchain/SUPPORTED
similarity index 100%
rename from meta/packages/meta/external-csl-toolchain/SUPPORTED
rename to meta/recipes-tbd/meta/external-csl-toolchain/SUPPORTED
diff --git a/meta/packages/meta/external-csl-toolchain_2006q3-27.bb b/meta/recipes-tbd/meta/external-csl-toolchain_2006q3-27.bb
similarity index 100%
rename from meta/packages/meta/external-csl-toolchain_2006q3-27.bb
rename to meta/recipes-tbd/meta/external-csl-toolchain_2006q3-27.bb
diff --git a/meta/packages/meta/external-csl-toolchain_2007q3-51.bb b/meta/recipes-tbd/meta/external-csl-toolchain_2007q3-51.bb
similarity index 100%
rename from meta/packages/meta/external-csl-toolchain_2007q3-51.bb
rename to meta/recipes-tbd/meta/external-csl-toolchain_2007q3-51.bb
diff --git a/meta/packages/meta/external-csl-toolchain_2008q3-72.bb b/meta/recipes-tbd/meta/external-csl-toolchain_2008q3-72.bb
similarity index 100%
rename from meta/packages/meta/external-csl-toolchain_2008q3-72.bb
rename to meta/recipes-tbd/meta/external-csl-toolchain_2008q3-72.bb
diff --git a/meta/packages/meta/external-poky-toolchain.bb b/meta/recipes-tbd/meta/external-poky-toolchain.bb
similarity index 100%
rename from meta/packages/meta/external-poky-toolchain.bb
rename to meta/recipes-tbd/meta/external-poky-toolchain.bb
diff --git a/meta/packages/meta/meta-ide-support.bb b/meta/recipes-tbd/meta/meta-ide-support.bb
similarity index 100%
rename from meta/packages/meta/meta-ide-support.bb
rename to meta/recipes-tbd/meta/meta-ide-support.bb
diff --git a/meta/packages/meta/meta-toolchain-sdk.bb b/meta/recipes-tbd/meta/meta-toolchain-sdk.bb
similarity index 100%
rename from meta/packages/meta/meta-toolchain-sdk.bb
rename to meta/recipes-tbd/meta/meta-toolchain-sdk.bb
diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/recipes-tbd/meta/meta-toolchain.bb
similarity index 100%
rename from meta/packages/meta/meta-toolchain.bb
rename to meta/recipes-tbd/meta/meta-toolchain.bb
diff --git a/meta/packages/meta/package-index.bb b/meta/recipes-tbd/meta/package-index.bb
similarity index 100%
rename from meta/packages/meta/package-index.bb
rename to meta/recipes-tbd/meta/package-index.bb
diff --git a/meta/packages/meta/run-postinsts/run-postinsts b/meta/recipes-tbd/meta/run-postinsts/run-postinsts
similarity index 100%
rename from meta/packages/meta/run-postinsts/run-postinsts
rename to meta/recipes-tbd/meta/run-postinsts/run-postinsts
diff --git a/meta/packages/meta/run-postinsts/run-postinsts.awk b/meta/recipes-tbd/meta/run-postinsts/run-postinsts.awk
similarity index 100%
rename from meta/packages/meta/run-postinsts/run-postinsts.awk
rename to meta/recipes-tbd/meta/run-postinsts/run-postinsts.awk
diff --git a/meta/packages/meta/run-postinsts_1.0.bb b/meta/recipes-tbd/meta/run-postinsts_1.0.bb
similarity index 100%
rename from meta/packages/meta/run-postinsts_1.0.bb
rename to meta/recipes-tbd/meta/run-postinsts_1.0.bb
diff --git a/meta/packages/meta/staging-linkage_1.0.bb b/meta/recipes-tbd/meta/staging-linkage_1.0.bb
similarity index 100%
rename from meta/packages/meta/staging-linkage_1.0.bb
rename to meta/recipes-tbd/meta/staging-linkage_1.0.bb