diff --git a/meta-emenlow/packages/formfactor/files/emenlow/config b/meta-emenlow/packages/formfactor/formfactor/emenlow/config
similarity index 100%
rename from meta-emenlow/packages/formfactor/files/emenlow/config
rename to meta-emenlow/packages/formfactor/formfactor/emenlow/config
diff --git a/meta-emenlow/packages/formfactor/formfactor_0.0.bbappend b/meta-emenlow/packages/formfactor/formfactor_0.0.bbappend
index 77958e87cc..cd5d96eb55 100644
--- a/meta-emenlow/packages/formfactor/formfactor_0.0.bbappend
+++ b/meta-emenlow/packages/formfactor/formfactor_0.0.bbappend
@@ -1,3 +1,4 @@
-FILESPATH := "${FILESPATH}:${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
 
 PR = "r26"