diff --git a/assemble_firmware.sh b/assemble_firmware.sh
index 105eec49da..5a0a165b01 100755
--- a/assemble_firmware.sh
+++ b/assemble_firmware.sh
@@ -15,7 +15,7 @@ set -e
 IB_FILE=""
 PROFILES=""
 TEMP_DIR=""
-PKGLIST_DIR="$(dirname "$0")/imagetypes"
+PKGLIST_DIR="$(dirname "$0")/packagelists"
 DEST_DIR="$(dirname "$0")/firmwares"
 DEBUG=""
 USECASES=""
diff --git a/imagetypes/manual.txt b/packagelists/manual.txt
similarity index 100%
rename from imagetypes/manual.txt
rename to packagelists/manual.txt
diff --git a/imagetypes/manual_4MB.sh b/packagelists/manual_4MB.sh
similarity index 100%
rename from imagetypes/manual_4MB.sh
rename to packagelists/manual_4MB.sh
diff --git a/imagetypes/manual_4MB.txt b/packagelists/manual_4MB.txt
similarity index 100%
rename from imagetypes/manual_4MB.txt
rename to packagelists/manual_4MB.txt
diff --git a/imagetypes/mesh_4MB.txt b/packagelists/mesh_4MB.txt
similarity index 100%
rename from imagetypes/mesh_4MB.txt
rename to packagelists/mesh_4MB.txt
diff --git a/imagetypes/notunnel.txt b/packagelists/notunnel.txt
similarity index 100%
rename from imagetypes/notunnel.txt
rename to packagelists/notunnel.txt
diff --git a/imagetypes/notunnel_4MB.sh b/packagelists/notunnel_4MB.sh
similarity index 100%
rename from imagetypes/notunnel_4MB.sh
rename to packagelists/notunnel_4MB.sh
diff --git a/imagetypes/notunnel_4MB.txt b/packagelists/notunnel_4MB.txt
similarity index 100%
rename from imagetypes/notunnel_4MB.txt
rename to packagelists/notunnel_4MB.txt
diff --git a/imagetypes/tunnel-berlin-openvpn.txt b/packagelists/tunnel-berlin-openvpn.txt
similarity index 100%
rename from imagetypes/tunnel-berlin-openvpn.txt
rename to packagelists/tunnel-berlin-openvpn.txt
diff --git a/imagetypes/tunnel-berlin-openvpn_4MB.sh b/packagelists/tunnel-berlin-openvpn_4MB.sh
similarity index 100%
rename from imagetypes/tunnel-berlin-openvpn_4MB.sh
rename to packagelists/tunnel-berlin-openvpn_4MB.sh
diff --git a/imagetypes/tunnel-berlin-openvpn_4MB.txt b/packagelists/tunnel-berlin-openvpn_4MB.txt
similarity index 100%
rename from imagetypes/tunnel-berlin-openvpn_4MB.txt
rename to packagelists/tunnel-berlin-openvpn_4MB.txt
diff --git a/imagetypes/tunnel-berlin-tunneldigger.txt b/packagelists/tunnel-berlin-tunneldigger.txt
similarity index 100%
rename from imagetypes/tunnel-berlin-tunneldigger.txt
rename to packagelists/tunnel-berlin-tunneldigger.txt
diff --git a/imagetypes/tunnel-berlin-tunneldigger_4MB.sh b/packagelists/tunnel-berlin-tunneldigger_4MB.sh
similarity index 100%
rename from imagetypes/tunnel-berlin-tunneldigger_4MB.sh
rename to packagelists/tunnel-berlin-tunneldigger_4MB.sh
diff --git a/imagetypes/tunnel-berlin-tunneldigger_4MB.txt b/packagelists/tunnel-berlin-tunneldigger_4MB.txt
similarity index 100%
rename from imagetypes/tunnel-berlin-tunneldigger_4MB.txt
rename to packagelists/tunnel-berlin-tunneldigger_4MB.txt