diff --git a/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/ccardimx28js/2.6.35.14/pointercal.xinput b/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/2.6.35.14/ccardimx28/pointercal.xinput
similarity index 100%
rename from meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/ccardimx28js/2.6.35.14/pointercal.xinput
rename to meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/2.6.35.14/ccardimx28/pointercal.xinput
diff --git a/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/ccimx51js/pointercal.xinput b/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/2.6.35.14/ccimx51/pointercal.xinput
similarity index 100%
rename from meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/ccimx51js/pointercal.xinput
rename to meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/2.6.35.14/ccimx51/pointercal.xinput
diff --git a/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/ccimx53js/pointercal.xinput b/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/2.6.35.14/ccimx53/pointercal.xinput
similarity index 100%
rename from meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/ccimx53js/pointercal.xinput
rename to meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/2.6.35.14/ccimx53/pointercal.xinput
diff --git a/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/ccardimx28js/3.10/pointercal.xinput b/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/3.10/ccardimx28/pointercal.xinput
similarity index 100%
rename from meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/ccardimx28js/3.10/pointercal.xinput
rename to meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/3.10/ccardimx28/pointercal.xinput
diff --git a/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bbappend b/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bbappend
index 57db9762f..36ecd53b3 100644
--- a/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bbappend
+++ b/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bbappend
@@ -1,3 +1,3 @@
 # Copyright (C) 2013 Digi International.
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}/${PREFERRED_VERSION_linux-dey}:${THISDIR}/${PN}/${MACHINE}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${PREFERRED_VERSION_linux-dey}:"