--- Downloads/gen_initramfs.sh	2016-08-27 15:16:53.876975660 -0700
+++ Downloads/gen_initramfs.sh	2016-08-27 15:08:44.070019632 -0700
@@ -569,7 +569,14 @@ 
         IFS=","
         for i in ${FIRMWARE_FILES}
         do
-            cp -L "${i}" ${TEMP}/initramfs-firmware-temp/lib/firmware/
+            if [ $(basename "$(dirname "${i}")") != "firmware" ]
+            then
+                mkdir -p ${TEMP}/initramfs-firmware-temp/lib/firmware/$(basename "$(dirname "${i}")")/
+                cp -L "${i}" ${TEMP}/initramfs-firmware-temp/lib/firmware/$(basename "$(dirname "${i}")")/
+            else
+                cp -L "${i}" ${TEMP}/initramfs-firmware-temp/lib/firmware/
+            fi
+
         done
         IFS=$OLD_IFS
     else