diff --git a/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb
index e15ee93ee..8ce0abd2f 100644
--- a/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb
+++ b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb
@@ -14,19 +14,19 @@ SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '
 
 SRC_URI_external = "${DIGI_GITHUB_GIT}/atheros.git;protocol=git"
 SRC_URI_internal = "${DIGI_LOG_GIT}linux-modules/atheros.git;protocol=git"
-SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
+SRC_URI  = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
 SRC_URI += " \
-	file://atheros \
-	file://atheros.conf \
-	file://Makefile \
-	"
+    file://atheros \
+    file://atheros.conf \
+    file://Makefile \
+"
 
 S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "DEL_PLATFORM=${MACHINE} KLIB_BUILD=${STAGING_KERNEL_DIR}"
 
 do_configure_prepend() {
-	cp ${WORKDIR}/Makefile ${S}/Makefile
+	cp ${WORKDIR}/Makefile ${S}/
 }
 
 do_install_append() {
@@ -37,18 +37,10 @@ do_install_append() {
 }
 
 FILES_${PN} += " \
-	/lib/firmware/ath6k/AR6003/hw2.1.1/athtcmd_ram.bin \
-	/lib/firmware/ath6k/AR6003/hw2.1.1/athwlan.bin \
-	/lib/firmware/ath6k/AR6003/hw2.1.1/Digi_6203-6233-US.bin \
-	/lib/firmware/ath6k/AR6003/hw2.1.1/Digi_6203-6233-World.bin \
-	/lib/firmware/ath6k/AR6003/hw2.1.1/fw-4.bin \
-	/lib/firmware/ath6k/AR6003/hw2.1.1/nullTestFlow.bin \
-	/lib/firmware/ath6k/AR6003/hw2.1.1/utf.bin \
-	"
-FILES_${PN}_append_cpx2 = " \
-	/lib/firmware/ath6k/AR6003/hw2.1.1/calData_AR6103_Digi_X2e_B.bin \
-	/lib/firmware/ath6k/AR6003/hw2.1.1/calData_AR6103_Digi_X2e_B_world.bin \
-	"
+    ${base_libdir}/firmware/ \
+    ${sysconfdir}/modprobe.d/ \
+    ${sysconfdir}/network/ \
+"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(ccardimx28js|cpx2)"
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-atheros/files/Makefile b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/Makefile
similarity index 100%
rename from meta-digi-arm/recipes-kernel/kernel-module-atheros/files/Makefile
rename to meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/Makefile
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-atheros/files/atheros.conf b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/atheros.conf
similarity index 100%
rename from meta-digi-arm/recipes-kernel/kernel-module-atheros/files/atheros.conf
rename to meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/atheros.conf
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-atheros/ccardimx28js/atheros b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/ccardimx28js/atheros
similarity index 100%
rename from meta-digi-arm/recipes-kernel/kernel-module-atheros/ccardimx28js/atheros
rename to meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/ccardimx28js/atheros
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-atheros/cpx2/atheros b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/cpx2/atheros
similarity index 100%
rename from meta-digi-arm/recipes-kernel/kernel-module-atheros/cpx2/atheros
rename to meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/cpx2/atheros