diff --git a/meta/conf/bblayers.conf.sample b/meta-yocto/conf/bblayers.conf.sample
similarity index 100%
rename from meta/conf/bblayers.conf.sample
rename to meta-yocto/conf/bblayers.conf.sample
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta-yocto/conf/distro/poky-bleeding.conf
similarity index 100%
rename from meta/conf/distro/poky-bleeding.conf
rename to meta-yocto/conf/distro/poky-bleeding.conf
diff --git a/meta/conf/distro/poky-lsb.conf b/meta-yocto/conf/distro/poky-lsb.conf
similarity index 100%
rename from meta/conf/distro/poky-lsb.conf
rename to meta-yocto/conf/distro/poky-lsb.conf
diff --git a/meta/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
similarity index 100%
rename from meta/conf/distro/poky.conf
rename to meta-yocto/conf/distro/poky.conf
diff --git a/meta/conf/local.conf.sample b/meta-yocto/conf/local.conf.sample
similarity index 100%
rename from meta/conf/local.conf.sample
rename to meta-yocto/conf/local.conf.sample
diff --git a/meta/conf/machine/atom-pc.conf b/meta-yocto/conf/machine/atom-pc.conf
similarity index 100%
rename from meta/conf/machine/atom-pc.conf
rename to meta-yocto/conf/machine/atom-pc.conf
diff --git a/meta/conf/machine/beagleboard.conf b/meta-yocto/conf/machine/beagleboard.conf
similarity index 100%
rename from meta/conf/machine/beagleboard.conf
rename to meta-yocto/conf/machine/beagleboard.conf
diff --git a/meta/conf/machine/mpc8315e-rdb.conf b/meta-yocto/conf/machine/mpc8315e-rdb.conf
similarity index 100%
rename from meta/conf/machine/mpc8315e-rdb.conf
rename to meta-yocto/conf/machine/mpc8315e-rdb.conf
diff --git a/meta/conf/machine/routerstationpro.conf b/meta-yocto/conf/machine/routerstationpro.conf
similarity index 100%
rename from meta/conf/machine/routerstationpro.conf
rename to meta-yocto/conf/machine/routerstationpro.conf
diff --git a/meta/conf/site.conf.sample b/meta-yocto/conf/site.conf.sample
similarity index 100%
rename from meta/conf/site.conf.sample
rename to meta-yocto/conf/site.conf.sample
diff --git a/scripts/poky-setup-builddir b/scripts/poky-setup-builddir
index 7a49a8fb9c..64240e1e5d 100755
--- a/scripts/poky-setup-builddir
+++ b/scripts/poky-setup-builddir
@@ -56,7 +56,7 @@ if [ "x" != "x$POKYCONF" ]; then
 fi
 
 if [ "x" = "x$POKYLOCALCONF" ]; then
-    POKYLOCALCONF="$OEROOT/meta/conf/local.conf.sample"
+    POKYLOCALCONF="$OEROOT/meta-yocto/conf/local.conf.sample"
 fi
 if ! (test -r "$BUILDDIR/conf/local.conf"); then
 cat <<EOM
@@ -74,7 +74,7 @@ EOM
 fi
 
 if [ "x" = "x$POKYLAYERCONF" ]; then
-    POKYLAYERCONF="$OEROOT/meta/conf/bblayers.conf.sample"
+    POKYLAYERCONF="$OEROOT/meta-yocto/conf/bblayers.conf.sample"
 fi
 if ! (test -r "$BUILDDIR/conf/bblayers.conf"); then
 cat <<EOM