diff --git a/root/lib/firmware/intel/ipts/MSHW0076/config.bin b/firmware/intel/ipts/MSHW0076/config.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0076/config.bin
rename to firmware/intel/ipts/MSHW0076/config.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0076/intel_desc.bin b/firmware/intel/ipts/MSHW0076/intel_desc.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0076/intel_desc.bin
rename to firmware/intel/ipts/MSHW0076/intel_desc.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0076/ipts_fw_config.bin b/firmware/intel/ipts/MSHW0076/ipts_fw_config.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0076/ipts_fw_config.bin
rename to firmware/intel/ipts/MSHW0076/ipts_fw_config.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0076/vendor_desc.bin b/firmware/intel/ipts/MSHW0076/vendor_desc.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0076/vendor_desc.bin
rename to firmware/intel/ipts/MSHW0076/vendor_desc.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0076/vendor_kernel.bin b/firmware/intel/ipts/MSHW0076/vendor_kernel.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0076/vendor_kernel.bin
rename to firmware/intel/ipts/MSHW0076/vendor_kernel.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0078/config.bin b/firmware/intel/ipts/MSHW0078/config.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0078/config.bin
rename to firmware/intel/ipts/MSHW0078/config.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0078/intel_desc.bin b/firmware/intel/ipts/MSHW0078/intel_desc.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0078/intel_desc.bin
rename to firmware/intel/ipts/MSHW0078/intel_desc.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0078/ipts_fw_config.bin b/firmware/intel/ipts/MSHW0078/ipts_fw_config.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0078/ipts_fw_config.bin
rename to firmware/intel/ipts/MSHW0078/ipts_fw_config.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0078/vendor_desc.bin b/firmware/intel/ipts/MSHW0078/vendor_desc.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0078/vendor_desc.bin
rename to firmware/intel/ipts/MSHW0078/vendor_desc.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0078/vendor_kernel.bin b/firmware/intel/ipts/MSHW0078/vendor_kernel.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0078/vendor_kernel.bin
rename to firmware/intel/ipts/MSHW0078/vendor_kernel.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0079/config.bin b/firmware/intel/ipts/MSHW0079/config.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0079/config.bin
rename to firmware/intel/ipts/MSHW0079/config.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0079/intel_desc.bin b/firmware/intel/ipts/MSHW0079/intel_desc.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0079/intel_desc.bin
rename to firmware/intel/ipts/MSHW0079/intel_desc.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0079/ipts_fw_config.bin b/firmware/intel/ipts/MSHW0079/ipts_fw_config.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0079/ipts_fw_config.bin
rename to firmware/intel/ipts/MSHW0079/ipts_fw_config.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0079/vendor_desc.bin b/firmware/intel/ipts/MSHW0079/vendor_desc.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0079/vendor_desc.bin
rename to firmware/intel/ipts/MSHW0079/vendor_desc.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0079/vendor_kernel.bin b/firmware/intel/ipts/MSHW0079/vendor_kernel.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0079/vendor_kernel.bin
rename to firmware/intel/ipts/MSHW0079/vendor_kernel.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0101/config.bin b/firmware/intel/ipts/MSHW0101/config.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0101/config.bin
rename to firmware/intel/ipts/MSHW0101/config.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0101/intel_desc.bin b/firmware/intel/ipts/MSHW0101/intel_desc.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0101/intel_desc.bin
rename to firmware/intel/ipts/MSHW0101/intel_desc.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0101/ipts_fw_config.bin b/firmware/intel/ipts/MSHW0101/ipts_fw_config.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0101/ipts_fw_config.bin
rename to firmware/intel/ipts/MSHW0101/ipts_fw_config.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0101/vendor_desc.bin b/firmware/intel/ipts/MSHW0101/vendor_desc.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0101/vendor_desc.bin
rename to firmware/intel/ipts/MSHW0101/vendor_desc.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0101/vendor_kernel.bin b/firmware/intel/ipts/MSHW0101/vendor_kernel.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0101/vendor_kernel.bin
rename to firmware/intel/ipts/MSHW0101/vendor_kernel.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0102/config.bin b/firmware/intel/ipts/MSHW0102/config.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0102/config.bin
rename to firmware/intel/ipts/MSHW0102/config.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0102/intel_desc.bin b/firmware/intel/ipts/MSHW0102/intel_desc.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0102/intel_desc.bin
rename to firmware/intel/ipts/MSHW0102/intel_desc.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0102/ipts_fw_config.bin b/firmware/intel/ipts/MSHW0102/ipts_fw_config.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0102/ipts_fw_config.bin
rename to firmware/intel/ipts/MSHW0102/ipts_fw_config.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0102/vendor_desc.bin b/firmware/intel/ipts/MSHW0102/vendor_desc.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0102/vendor_desc.bin
rename to firmware/intel/ipts/MSHW0102/vendor_desc.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0102/vendor_kernel.bin b/firmware/intel/ipts/MSHW0102/vendor_kernel.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0102/vendor_kernel.bin
rename to firmware/intel/ipts/MSHW0102/vendor_kernel.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0103/config.bin b/firmware/intel/ipts/MSHW0103/config.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0103/config.bin
rename to firmware/intel/ipts/MSHW0103/config.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0103/intel_desc.bin b/firmware/intel/ipts/MSHW0103/intel_desc.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0103/intel_desc.bin
rename to firmware/intel/ipts/MSHW0103/intel_desc.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0103/ipts_fw_config.bin b/firmware/intel/ipts/MSHW0103/ipts_fw_config.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0103/ipts_fw_config.bin
rename to firmware/intel/ipts/MSHW0103/ipts_fw_config.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0103/vendor_desc.bin b/firmware/intel/ipts/MSHW0103/vendor_desc.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0103/vendor_desc.bin
rename to firmware/intel/ipts/MSHW0103/vendor_desc.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0103/vendor_kernel.bin b/firmware/intel/ipts/MSHW0103/vendor_kernel.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0103/vendor_kernel.bin
rename to firmware/intel/ipts/MSHW0103/vendor_kernel.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0137/config.bin b/firmware/intel/ipts/MSHW0137/config.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0137/config.bin
rename to firmware/intel/ipts/MSHW0137/config.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0137/intel_desc.bin b/firmware/intel/ipts/MSHW0137/intel_desc.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0137/intel_desc.bin
rename to firmware/intel/ipts/MSHW0137/intel_desc.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0137/ipts_fw_config.bin b/firmware/intel/ipts/MSHW0137/ipts_fw_config.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0137/ipts_fw_config.bin
rename to firmware/intel/ipts/MSHW0137/ipts_fw_config.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0137/vendor_desc.bin b/firmware/intel/ipts/MSHW0137/vendor_desc.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0137/vendor_desc.bin
rename to firmware/intel/ipts/MSHW0137/vendor_desc.bin
diff --git a/root/lib/firmware/intel/ipts/MSHW0137/vendor_kernel.bin b/firmware/intel/ipts/MSHW0137/vendor_kernel.bin
similarity index 100%
rename from root/lib/firmware/intel/ipts/MSHW0137/vendor_kernel.bin
rename to firmware/intel/ipts/MSHW0137/vendor_kernel.bin
diff --git a/setup.sh b/setup.sh
index b9c6f1623..143d2b9dd 100644
--- a/setup.sh
+++ b/setup.sh
@@ -34,6 +34,9 @@ echo "\nContinuing setup...\n"
 echo "Copying the config files under root to where they belong...\n"
 for dir in $(ls root/); do cp -Rb root/$dir/* /$dir/; done
 
+echo "Copying firmware files under root...\n"
+cp -r firmware/* /lib/firmware/
+
 echo "Making /lib/systemd/system-sleep/sleep executable...\n"
 chmod a+x /lib/systemd/system-sleep/sleep