diff --git a/meta-digi-dey/recipes-graphics/xinput-calibrator/ccardimx28js/pointercal.xinput b/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/ccardimx28js/2.6.35.14/pointercal.xinput
similarity index 100%
rename from meta-digi-dey/recipes-graphics/xinput-calibrator/ccardimx28js/pointercal.xinput
rename to meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/ccardimx28js/2.6.35.14/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/ccardimx28js/3.10/pointercal.xinput
new file mode 100644
index 000000000..5d99fa0ea
--- /dev/null
+++ b/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/ccardimx28js/3.10/pointercal.xinput
@@ -0,0 +1,2 @@
+xinput set-prop "mxs-lradc" "Evdev Axis Calibration" 4202 314 4061 274
+xinput set-prop "mxs-lradc" "Evdev Axes Swap" 1
diff --git a/meta-digi-dey/recipes-graphics/xinput-calibrator/ccimx51js/pointercal.xinput b/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/ccimx51js/pointercal.xinput
similarity index 100%
rename from meta-digi-dey/recipes-graphics/xinput-calibrator/ccimx51js/pointercal.xinput
rename to meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/ccimx51js/pointercal.xinput
diff --git a/meta-digi-dey/recipes-graphics/xinput-calibrator/ccimx53js/pointercal.xinput b/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/ccimx53js/pointercal.xinput
similarity index 100%
rename from meta-digi-dey/recipes-graphics/xinput-calibrator/ccimx53js/pointercal.xinput
rename to meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput/ccimx53js/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 11884dd9c..c3d73f6b7 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,6 +1,6 @@
 # Copyright (C) 2013 Digi International.
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${MACHINE}:"
-
 PRINC := "${@int(PRINC) + 1}"
 PR_append = "+${DISTRO}"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}/${PREFERRED_VERSION_linux-dey}:${THISDIR}/${PN}/${MACHINE}:"