diff --git a/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/3.10/ccardimx28/pointercal.xinput b/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/ccardimx28/pointercal.xinput
similarity index 100%
rename from meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/3.10/ccardimx28/pointercal.xinput
rename to meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/ccardimx28/pointercal.xinput
diff --git a/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/2.6.35.14/ccimx51/pointercal.xinput b/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/ccimx51/pointercal.xinput
similarity index 100%
rename from meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/2.6.35.14/ccimx51/pointercal.xinput
rename to meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/ccimx51/pointercal.xinput
diff --git a/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/2.6.35.14/ccimx53/pointercal.xinput b/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/ccimx53/pointercal.xinput
similarity index 100%
rename from meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/2.6.35.14/ccimx53/pointercal.xinput
rename to meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/ccimx53/pointercal.xinput
diff --git a/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/3.10/ccimx6/pointercal.xinput b/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/ccimx6/pointercal.xinput
similarity index 100%
rename from meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/3.10/ccimx6/pointercal.xinput
rename to meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/ccimx6/pointercal.xinput
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 971ee089b..831546ee2 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}/${BPN}/${PREFERRED_VERSION_linux-dey}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"