diff --git a/meta/classes/distutils.bbclass b/classes/distutils.bbclass
similarity index 100%
rename from meta/classes/distutils.bbclass
rename to classes/distutils.bbclass
diff --git a/meta/classes/easyinstall.bbclass b/classes/easyinstall.bbclass
similarity index 100%
rename from meta/classes/easyinstall.bbclass
rename to classes/easyinstall.bbclass
diff --git a/meta/recipes-core/images/core-image-ros.bb b/recipes-core/images/core-image-ros.bb
similarity index 100%
rename from meta/recipes-core/images/core-image-ros.bb
rename to recipes-core/images/core-image-ros.bb
diff --git a/meta/recipes-devtools/log4cxx/log4cxx/0001-log4cxx_0-10-0_add-missing-includes.patch b/recipes-devtools/log4cxx/log4cxx/0001-log4cxx_0-10-0_add-missing-includes.patch
similarity index 100%
rename from meta/recipes-devtools/log4cxx/log4cxx/0001-log4cxx_0-10-0_add-missing-includes.patch
rename to recipes-devtools/log4cxx/log4cxx/0001-log4cxx_0-10-0_add-missing-includes.patch
diff --git a/meta/recipes-devtools/log4cxx/log4cxx/0002-Remove-duplicates-from-makefile.patch b/recipes-devtools/log4cxx/log4cxx/0002-Remove-duplicates-from-makefile.patch
similarity index 100%
rename from meta/recipes-devtools/log4cxx/log4cxx/0002-Remove-duplicates-from-makefile.patch
rename to recipes-devtools/log4cxx/log4cxx/0002-Remove-duplicates-from-makefile.patch
diff --git a/meta/recipes-devtools/log4cxx/log4cxx/0003-log4cxx-0.10.0-add_stdio_header.patch b/recipes-devtools/log4cxx/log4cxx/0003-log4cxx-0.10.0-add_stdio_header.patch
similarity index 100%
rename from meta/recipes-devtools/log4cxx/log4cxx/0003-log4cxx-0.10.0-add_stdio_header.patch
rename to recipes-devtools/log4cxx/log4cxx/0003-log4cxx-0.10.0-add_stdio_header.patch
diff --git a/meta/recipes-devtools/log4cxx/log4cxx/log4cxx010.patch b/recipes-devtools/log4cxx/log4cxx/log4cxx010.patch
similarity index 100%
rename from meta/recipes-devtools/log4cxx/log4cxx/log4cxx010.patch
rename to recipes-devtools/log4cxx/log4cxx/log4cxx010.patch
diff --git a/meta/recipes-devtools/log4cxx/log4cxx/log4cxx097.patch b/recipes-devtools/log4cxx/log4cxx/log4cxx097.patch
similarity index 100%
rename from meta/recipes-devtools/log4cxx/log4cxx/log4cxx097.patch
rename to recipes-devtools/log4cxx/log4cxx/log4cxx097.patch
diff --git a/meta/recipes-devtools/log4cxx/log4cxx_0.10.0.bb b/recipes-devtools/log4cxx/log4cxx_0.10.0.bb
similarity index 100%
rename from meta/recipes-devtools/log4cxx/log4cxx_0.10.0.bb
rename to recipes-devtools/log4cxx/log4cxx_0.10.0.bb
diff --git a/meta/recipes-devtools/log4cxx/log4cxx_0.9.7.bb b/recipes-devtools/log4cxx/log4cxx_0.9.7.bb
similarity index 100%
rename from meta/recipes-devtools/log4cxx/log4cxx_0.9.7.bb
rename to recipes-devtools/log4cxx/log4cxx_0.9.7.bb
diff --git a/meta/recipes-devtools/log4cxx/log4cxx_svn.bb b/recipes-devtools/log4cxx/log4cxx_svn.bb
similarity index 100%
rename from meta/recipes-devtools/log4cxx/log4cxx_svn.bb
rename to recipes-devtools/log4cxx/log4cxx_svn.bb
diff --git a/meta/recipes-devtools/python/python-empy-native_3.3.bb b/recipes-devtools/python/python-empy-native_3.3.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-empy-native_3.3.bb
rename to recipes-devtools/python/python-empy-native_3.3.bb
diff --git a/meta/recipes-devtools/python/python-empy_3.3.bb b/recipes-devtools/python/python-empy_3.3.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-empy_3.3.bb
rename to recipes-devtools/python/python-empy_3.3.bb
diff --git a/meta/recipes-devtools/python/python-nose-native_1.2.1.bb b/recipes-devtools/python/python-nose-native_1.2.1.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-nose-native_1.2.1.bb
rename to recipes-devtools/python/python-nose-native_1.2.1.bb
diff --git a/meta/recipes-devtools/python/python-nose_1.2.1.bb b/recipes-devtools/python/python-nose_1.2.1.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-nose_1.2.1.bb
rename to recipes-devtools/python/python-nose_1.2.1.bb
diff --git a/meta/recipes-devtools/python/python-pyyaml-native_3.10.bb b/recipes-devtools/python/python-pyyaml-native_3.10.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-pyyaml-native_3.10.bb
rename to recipes-devtools/python/python-pyyaml-native_3.10.bb
diff --git a/meta/recipes-devtools/python/python-pyyaml_3.10.bb b/recipes-devtools/python/python-pyyaml_3.10.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-pyyaml_3.10.bb
rename to recipes-devtools/python/python-pyyaml_3.10.bb
diff --git a/meta/recipes-devtools/python/python-rosinstall_0.6.21.bb b/recipes-devtools/python/python-rosinstall_0.6.21.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-rosinstall_0.6.21.bb
rename to recipes-devtools/python/python-rosinstall_0.6.21.bb
diff --git a/meta/recipes-devtools/python/python-rospkg-native_1.0.15.bb b/recipes-devtools/python/python-rospkg-native_1.0.15.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-rospkg-native_1.0.15.bb
rename to recipes-devtools/python/python-rospkg-native_1.0.15.bb
diff --git a/meta/recipes-devtools/python/python-rospkg_1.0.15.bb b/recipes-devtools/python/python-rospkg_1.0.15.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-rospkg_1.0.15.bb
rename to recipes-devtools/python/python-rospkg_1.0.15.bb
diff --git a/meta/recipes-devtools/python/python-setuptools_0.6c11.bb b/recipes-devtools/python/python-setuptools_0.6c11.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-setuptools_0.6c11.bb
rename to recipes-devtools/python/python-setuptools_0.6c11.bb
diff --git a/meta/recipes-extended/ros/ros.bb b/recipes-extended/ros/ros.bb
similarity index 100%
rename from meta/recipes-extended/ros/ros.bb
rename to recipes-extended/ros/ros.bb
diff --git a/meta/recipes-extended/ros/ros/fuerte-ros-base.rosinstall b/recipes-extended/ros/ros/fuerte-ros-base.rosinstall
similarity index 100%
rename from meta/recipes-extended/ros/ros/fuerte-ros-base.rosinstall
rename to recipes-extended/ros/ros/fuerte-ros-base.rosinstall