diff --git a/recipes/images/bec-debug-image.bb b/recipes-core/images/bec-debug-image.bb
similarity index 100%
rename from recipes/images/bec-debug-image.bb
rename to recipes-core/images/bec-debug-image.bb
diff --git a/recipes/images/bec-simple-image.bb b/recipes-core/images/bec-simple-image.bb
similarity index 100%
rename from recipes/images/bec-simple-image.bb
rename to recipes-core/images/bec-simple-image.bb
diff --git a/recipes/images/initramfs-image-splash.bb b/recipes-core/images/initramfs-image-splash.bb
similarity index 100%
rename from recipes/images/initramfs-image-splash.bb
rename to recipes-core/images/initramfs-image-splash.bb
diff --git a/recipes/images/initramfs-image.bb b/recipes-core/images/initramfs-image.bb
similarity index 100%
rename from recipes/images/initramfs-image.bb
rename to recipes-core/images/initramfs-image.bb
diff --git a/recipes/network-hotplug/files/network.rules b/recipes-core/network-hotplug/files/network.rules
similarity index 100%
rename from recipes/network-hotplug/files/network.rules
rename to recipes-core/network-hotplug/files/network.rules
diff --git a/recipes/network-hotplug/files/network@.service b/recipes-core/network-hotplug/files/network@.service
similarity index 100%
rename from recipes/network-hotplug/files/network@.service
rename to recipes-core/network-hotplug/files/network@.service
diff --git a/recipes/network-hotplug/network-hotplug.bb b/recipes-core/network-hotplug/network-hotplug.bb
similarity index 100%
rename from recipes/network-hotplug/network-hotplug.bb
rename to recipes-core/network-hotplug/network-hotplug.bb
diff --git a/recipes-core/os-release/os-release.bbappend b/recipes-core/os-release/os-release.bbappend
new file mode 100644
index 000000000..eb04e0367
--- /dev/null
+++ b/recipes-core/os-release/os-release.bbappend
@@ -0,0 +1,4 @@
+OS_RELEASE_FIELDS_append = " HOME_URL SUPPORT_URL BUG_REPORT_URL"
+HOME_URL = "http://bec-systems.com"
+SUPPORT_URL = "http://bec-systems.com/support"
+BUG_REPORT_URL = "https://github.com/cbrake/meta-bec/issues"
diff --git a/recipes/systemd/systemd_%.bbappend b/recipes-core/systemd/systemd_%.bbappend
similarity index 100%
rename from recipes/systemd/systemd_%.bbappend
rename to recipes-core/systemd/systemd_%.bbappend
diff --git a/recipes/linux/linux-yocto_4.8.bb b/recipes-kernel/linux/linux-yocto_4.8.bb
similarity index 100%
rename from recipes/linux/linux-yocto_4.8.bb
rename to recipes-kernel/linux/linux-yocto_4.8.bb
diff --git a/recipes/updater/files/imx6ul-var-dart/init b/recipes-support/updater/files/imx6ul-var-dart/init
similarity index 100%
rename from recipes/updater/files/imx6ul-var-dart/init
rename to recipes-support/updater/files/imx6ul-var-dart/init
diff --git a/recipes/updater/files/imx6ul-var-dart/platform b/recipes-support/updater/files/imx6ul-var-dart/platform
similarity index 100%
rename from recipes/updater/files/imx6ul-var-dart/platform
rename to recipes-support/updater/files/imx6ul-var-dart/platform
diff --git a/recipes/updater/files/init b/recipes-support/updater/files/init
similarity index 100%
rename from recipes/updater/files/init
rename to recipes-support/updater/files/init
diff --git a/recipes/updater/files/platform b/recipes-support/updater/files/platform
similarity index 100%
rename from recipes/updater/files/platform
rename to recipes-support/updater/files/platform
diff --git a/recipes/updater/updater_1.0.bb b/recipes-support/updater/updater_1.0.bb
similarity index 100%
rename from recipes/updater/updater_1.0.bb
rename to recipes-support/updater/updater_1.0.bb
diff --git a/recipes/fs-stress-test/fs-stress-test_git.bb b/recipes-test/fs-stress-test/fs-stress-test_git.bb
similarity index 100%
rename from recipes/fs-stress-test/fs-stress-test_git.bb
rename to recipes-test/fs-stress-test/fs-stress-test_git.bb
diff --git a/recipes/lcd-test/lcd-test_git.bb b/recipes-test/lcd-test/lcd-test_git.bb
similarity index 100%
rename from recipes/lcd-test/lcd-test_git.bb
rename to recipes-test/lcd-test/lcd-test_git.bb
diff --git a/recipes/serial-test/serial-test_git.bb b/recipes-test/serial-test/serial-test_git.bb
similarity index 100%
rename from recipes/serial-test/serial-test_git.bb
rename to recipes-test/serial-test/serial-test_git.bb