diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend
index 367e77d21..93f83d861 100644
--- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend
+++ b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend
@@ -1,6 +1,6 @@
 # Copyright (C) 2013 Digi International.
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${PREFERRED_VERSION_linux-dey}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}/${PREFERRED_VERSION_linux-dey}:"
 
 SRC_URI += " \
     file://asound.inline_play.state \
diff --git a/meta-digi-arm/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-digi-arm/recipes-bsp/formfactor/formfactor_0.0.bbappend
index 69fd49209..67ee15d20 100644
--- a/meta-digi-arm/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ b/meta-digi-arm/recipes-bsp/formfactor/formfactor_0.0.bbappend
@@ -1,3 +1,3 @@
 # Copyright (C) 2014 Digi International.
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
diff --git a/meta-digi-arm/recipes-core/udev/udev-extraconf_1.1.bbappend b/meta-digi-arm/recipes-core/udev/udev-extraconf_1.1.bbappend
index ea48cb129..6f024355f 100644
--- a/meta-digi-arm/recipes-core/udev/udev-extraconf_1.1.bbappend
+++ b/meta-digi-arm/recipes-core/udev/udev-extraconf_1.1.bbappend
@@ -1,6 +1,6 @@
 # Copyright (C) 2013 Digi International.
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
 SRC_URI += "file://mount_bootparts.sh"
 
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-gpio/files/COPYING b/meta-digi-arm/recipes-kernel/kernel-module-gpio/kernel-module-gpio/COPYING
similarity index 100%
rename from meta-digi-arm/recipes-kernel/kernel-module-gpio/files/COPYING
rename to meta-digi-arm/recipes-kernel/kernel-module-gpio/kernel-module-gpio/COPYING
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-gpio/files/Makefile b/meta-digi-arm/recipes-kernel/kernel-module-gpio/kernel-module-gpio/Makefile
similarity index 100%
rename from meta-digi-arm/recipes-kernel/kernel-module-gpio/files/Makefile
rename to meta-digi-arm/recipes-kernel/kernel-module-gpio/kernel-module-gpio/Makefile
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-gpio/files/gpio.c b/meta-digi-arm/recipes-kernel/kernel-module-gpio/kernel-module-gpio/gpio.c
similarity index 100%
rename from meta-digi-arm/recipes-kernel/kernel-module-gpio/files/gpio.c
rename to meta-digi-arm/recipes-kernel/kernel-module-gpio/kernel-module-gpio/gpio.c
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-gpio/files/gpio.h b/meta-digi-arm/recipes-kernel/kernel-module-gpio/kernel-module-gpio/gpio.h
similarity index 100%
rename from meta-digi-arm/recipes-kernel/kernel-module-gpio/files/gpio.h
rename to meta-digi-arm/recipes-kernel/kernel-module-gpio/kernel-module-gpio/gpio.h
diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez4_%.bbappend b/meta-digi-dey/recipes-connectivity/bluez/bluez4_%.bbappend
index 42cea55a4..c91351349 100644
--- a/meta-digi-dey/recipes-connectivity/bluez/bluez4_%.bbappend
+++ b/meta-digi-dey/recipes-connectivity/bluez/bluez4_%.bbappend
@@ -1,6 +1,6 @@
 # Copyright (C) 2013 Digi International.
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
 EXTRA_OECONF_append = " --enable-health --enable-static"
 
diff --git a/meta-digi-dey/recipes-connectivity/btfilter/files/bluez-init b/meta-digi-dey/recipes-connectivity/btfilter/btfilter-v3.4p4-b3.4.0.158/bluez-init
similarity index 100%
rename from meta-digi-dey/recipes-connectivity/btfilter/files/bluez-init
rename to meta-digi-dey/recipes-connectivity/btfilter/btfilter-v3.4p4-b3.4.0.158/bluez-init
diff --git a/meta-digi-dey/recipes-connectivity/cherokee/files/cherokee.conf b/meta-digi-dey/recipes-connectivity/cherokee/cherokee/cherokee.conf
similarity index 100%
rename from meta-digi-dey/recipes-connectivity/cherokee/files/cherokee.conf
rename to meta-digi-dey/recipes-connectivity/cherokee/cherokee/cherokee.conf
diff --git a/meta-digi-dey/recipes-connectivity/cherokee/files/cherokee.pem b/meta-digi-dey/recipes-connectivity/cherokee/cherokee/cherokee.pem
similarity index 100%
rename from meta-digi-dey/recipes-connectivity/cherokee/files/cherokee.pem
rename to meta-digi-dey/recipes-connectivity/cherokee/cherokee/cherokee.pem
diff --git a/meta-digi-dey/recipes-connectivity/cherokee/files/digi.gif b/meta-digi-dey/recipes-connectivity/cherokee/cherokee/digi.gif
similarity index 100%
rename from meta-digi-dey/recipes-connectivity/cherokee/files/digi.gif
rename to meta-digi-dey/recipes-connectivity/cherokee/cherokee/digi.gif
diff --git a/meta-digi-dey/recipes-connectivity/cherokee/files/index.html b/meta-digi-dey/recipes-connectivity/cherokee/cherokee/index.html
similarity index 100%
rename from meta-digi-dey/recipes-connectivity/cherokee/files/index.html
rename to meta-digi-dey/recipes-connectivity/cherokee/cherokee/index.html
diff --git a/meta-digi-dey/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend b/meta-digi-dey/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend
index 03775a5d9..adf425795 100644
--- a/meta-digi-dey/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend
+++ b/meta-digi-dey/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend
@@ -1,6 +1,6 @@
 # Copyright (C) 2013 Digi International.
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
 SRC_URI += " \
     file://cherokee.conf \
diff --git a/meta-digi-dey/recipes-connectivity/vsftpd/files/init b/meta-digi-dey/recipes-connectivity/vsftpd/vsftpd/init
similarity index 100%
rename from meta-digi-dey/recipes-connectivity/vsftpd/files/init
rename to meta-digi-dey/recipes-connectivity/vsftpd/vsftpd/init
diff --git a/meta-digi-dey/recipes-connectivity/vsftpd/files/vsftpd.conf b/meta-digi-dey/recipes-connectivity/vsftpd/vsftpd/vsftpd.conf
similarity index 100%
rename from meta-digi-dey/recipes-connectivity/vsftpd/files/vsftpd.conf
rename to meta-digi-dey/recipes-connectivity/vsftpd/vsftpd/vsftpd.conf
diff --git a/meta-digi-dey/recipes-connectivity/vsftpd/vsftpd_%.bbappend b/meta-digi-dey/recipes-connectivity/vsftpd/vsftpd_%.bbappend
index bdf478174..831546ee2 100644
--- a/meta-digi-dey/recipes-connectivity/vsftpd/vsftpd_%.bbappend
+++ b/meta-digi-dey/recipes-connectivity/vsftpd/vsftpd_%.bbappend
@@ -1,3 +1,3 @@
 # Copyright (C) 2013 Digi International.
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
diff --git a/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend b/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend
index d12e41024..31c3c6ef8 100644
--- a/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend
+++ b/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend
@@ -1,6 +1,6 @@
 # Copyright (C) 2013 Digi International.
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
 SRC_URI += " \
     file://sysctl.conf \
diff --git a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
index d87b28ad2..efccebaf2 100644
--- a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
+++ b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
@@ -1,6 +1,6 @@
 # Copyright (C) 2013 Digi International.
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:"
 
 SRC_URI_append = " \
     file://interfaces.eth0.static \
diff --git a/meta-digi-dey/recipes-core/initscripts/initscripts_1.0.bbappend b/meta-digi-dey/recipes-core/initscripts/initscripts_1.0.bbappend
index 3eb7a4136..91197617c 100644
--- a/meta-digi-dey/recipes-core/initscripts/initscripts_1.0.bbappend
+++ b/meta-digi-dey/recipes-core/initscripts/initscripts_1.0.bbappend
@@ -1,6 +1,6 @@
 # Copyright (C) 2013 Digi International.
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:"
 
 SRC_URI += "file://device_table.txt \
 	    file://devtmpfs.sh"
diff --git a/meta-digi-dey/recipes-digi/fbtest/files/fbtest.c b/meta-digi-dey/recipes-digi/fbtest/fbtest/fbtest.c
similarity index 100%
rename from meta-digi-dey/recipes-digi/fbtest/files/fbtest.c
rename to meta-digi-dey/recipes-digi/fbtest/fbtest/fbtest.c
diff --git a/meta-digi-dey/recipes-graphics/microwindows/files/0001-defconfig.patch b/meta-digi-dey/recipes-graphics/microwindows/microwindows-0.91/0001-defconfig.patch
similarity index 100%
rename from meta-digi-dey/recipes-graphics/microwindows/files/0001-defconfig.patch
rename to meta-digi-dey/recipes-graphics/microwindows/microwindows-0.91/0001-defconfig.patch
diff --git a/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput_%.bbappend b/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput_%.bbappend
index 36ecd53b3..971ee089b 100644
--- a/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput_%.bbappend
+++ b/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput_%.bbappend
@@ -1,3 +1,3 @@
 # Copyright (C) 2013 Digi International.
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${PREFERRED_VERSION_linux-dey}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}/${PREFERRED_VERSION_linux-dey}:"
diff --git a/meta-digi-dey/recipes-qt/qt4/qt4-x11-free_%.bbappend b/meta-digi-dey/recipes-qt/qt4/qt4-x11-free_%.bbappend
index 4a6ab9711..d4f09e01b 100644
--- a/meta-digi-dey/recipes-qt/qt4/qt4-x11-free_%.bbappend
+++ b/meta-digi-dey/recipes-qt/qt4/qt4-x11-free_%.bbappend
@@ -4,7 +4,7 @@
 #
 # Origin: fsl-gui-extrafiles package (which was removed from meta-fsl-demos)
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
 SRC_URI += " \
     file://qtbrowser.desktop \
diff --git a/meta-digi-dey/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bbappend b/meta-digi-dey/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bbappend
index 69fd49209..67ee15d20 100644
--- a/meta-digi-dey/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bbappend
+++ b/meta-digi-dey/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bbappend
@@ -1,3 +1,3 @@
 # Copyright (C) 2014 Digi International.
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"