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 93f83d861..f58443d54 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}/${BPN}/${PREFERRED_VERSION_linux-dey}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
 SRC_URI += " \
     file://asound.inline_play.state \
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.inline.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.inline.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.inline.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.inline.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.inline_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.inline_play.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.inline_play.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.inline_play.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.micro.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.micro.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.micro.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.micro.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.micro_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.micro_play.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.micro_play.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.micro_play.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.play.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.play.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.play.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.inline.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51/asound.inline.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.inline.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51/asound.inline.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.inline_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51/asound.inline_play.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.inline_play.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51/asound.inline_play.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.micro.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51/asound.micro.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.micro.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51/asound.micro.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.micro_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51/asound.micro_play.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.micro_play.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51/asound.micro_play.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51/asound.play.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.play.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51/asound.play.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.inline.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53/asound.inline.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.inline.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53/asound.inline.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.inline_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53/asound.inline_play.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.inline_play.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53/asound.inline_play.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.micro.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53/asound.micro.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.micro.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53/asound.micro.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.micro_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53/asound.micro_play.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.micro_play.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53/asound.micro_play.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53/asound.play.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.play.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53/asound.play.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.conf b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6/asound.conf
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.conf
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6/asound.conf
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.inline.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6/asound.inline.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.inline.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6/asound.inline.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.inline_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6/asound.inline_play.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.inline_play.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6/asound.inline_play.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.micro.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6/asound.micro.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.micro.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6/asound.micro.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.micro_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6/asound.micro_play.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.micro_play.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6/asound.micro_play.state
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6/asound.play.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.play.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6/asound.play.state