diff --git a/etc/nginx/sites-available/tftpboot b/etc/nginx/sites-available/tftpboot
index 26182ec..0bb70a2 100644
--- a/etc/nginx/sites-available/tftpboot
+++ b/etc/nginx/sites-available/tftpboot
@@ -78,14 +78,14 @@ server {
 		rewrite ^/firmware/(CP7905080003SCCP070409A.zup)$ /firmware/7905/$1 last;
 
 		# 7906_7911 firmware (java-based)
-		rewrite ^/firmware/(apps11.+\.sbn)$ /firmware/7906_7911/$1 last;
-		rewrite ^/firmware/(cnu11.+\.sbn)$ /firmware/7906_7911/$1 last;
-		rewrite ^/firmware/(cvm11sccp.+\.sbn)$ /firmware/7906_7911/$1 last;
-		rewrite ^/firmware/(dsp11.+\.sbn)$ /firmware/7906_7911/$1 last;
-		rewrite ^/firmware/(jar11sccp.+\.sbn)$ /firmware/7906_7911/$1 last;
-		rewrite ^/firmware/(SCCP11.+\.loads)$ /firmware/7906_7911/$1 last;
-		rewrite ^/firmware/(term06.+\.loads)$ /firmware/7906_7911/$1 last;
-		rewrite ^/firmware/(term11.+\.loads)$ /firmware/7906_7911/$1 last;
+		rewrite ^/firmware/(apps11.+\.sbn)$ /firmware/7906/$1 last;
+		rewrite ^/firmware/(cnu11.+\.sbn)$ /firmware/7906/$1 last;
+		rewrite ^/firmware/(cvm11sccp.+\.sbn)$ /firmware/7906/$1 last;
+		rewrite ^/firmware/(dsp11.+\.sbn)$ /firmware/7906/$1 last;
+		rewrite ^/firmware/(jar11sccp.+\.sbn)$ /firmware/7906/$1 last;
+		rewrite ^/firmware/(SCCP11.+\.loads)$ /firmware/7906/$1 last;
+		rewrite ^/firmware/(term06.+\.loads)$ /firmware/7906/$1 last;
+		rewrite ^/firmware/(term11.+\.loads)$ /firmware/7906/$1 last;
 
 		# 7910 firmware (ancient)
 		rewrite ^/firmware/(P00405000700.bin)$ /firmware/7910/$1 last;
@@ -104,13 +104,13 @@ server {
 		rewrite ^/firmware/(cmterm_7920.4.0-03-02.bin)$ /firmware/7920/$1 last;
 
 		# 7921_7925 firmware (ancient)
-		rewrite ^/firmware/(APPS-1.4.3.4.SBN)$ /firmware/7921_7925/$1 last;
-		rewrite ^/firmware/(CP7921G-1.4.3.4.LOADS)$ /firmware/7921_7925/$1 last;
-		rewrite ^/firmware/(GUI-1.4.3.4.SBN)$ /firmware/7921_7925/$1 last;
-		rewrite ^/firmware/(SYS-1.4.3.4.SBN)$ /firmware/7921_7925/$1 last;
-		rewrite ^/firmware/(TNUX-1.4.3.4.SBN)$ /firmware/7921_7925/$1 last;
-		rewrite ^/firmware/(TNUXR-1.4.3.4.SBN)$ /firmware/7921_7925/$1 last;
-		rewrite ^/firmware/(WLAN-1.4.3.4.SBN)$ /firmware/7921_7925/$1 last;
+		rewrite ^/firmware/(APPS-1.4.3.4.SBN)$ /firmware/7921/$1 last;
+		rewrite ^/firmware/(CP7921G-1.4.3.4.LOADS)$ /firmware/7921/$1 last;
+		rewrite ^/firmware/(GUI-1.4.3.4.SBN)$ /firmware/7921/$1 last;
+		rewrite ^/firmware/(SYS-1.4.3.4.SBN)$ /firmware/7921/$1 last;
+		rewrite ^/firmware/(TNUX-1.4.3.4.SBN)$ /firmware/7921/$1 last;
+		rewrite ^/firmware/(TNUXR-1.4.3.4.SBN)$ /firmware/7921/$1 last;
+		rewrite ^/firmware/(WLAN-1.4.3.4.SBN)$ /firmware/7921/$1 last;
 
 		# 7926 firmware (ancient)
 		rewrite ^/firmware/(APPSS-1.4.1SR1.SBN)$ /firmware/7926/$1 last;
@@ -143,50 +143,50 @@ server {
 		rewrite ^/firmware/(apps37sccp.1-4-5-7.bin)$ /firmware/7937/$1 last;
 
 		# 7940_7960 firmware (ancient)
-		rewrite ^/firmware/(P0030801SR01.bin)$ /firmware/7940_7960/$1 last;
-		rewrite ^/firmware/(P0030801SR01.loads)$ /firmware/7940_7960/$1 last;
-		rewrite ^/firmware/(P0030801SR01.sb2)$ /firmware/7940_7960/$1 last;
-		rewrite ^/firmware/(P0030801SR01.sbn)$ /firmware/7940_7960/$1 last;
+		rewrite ^/firmware/(P0030801SR01.bin)$ /firmware/7940/$1 last;
+		rewrite ^/firmware/(P0030801SR01.loads)$ /firmware/7940/$1 last;
+		rewrite ^/firmware/(P0030801SR01.sb2)$ /firmware/7940/$1 last;
+		rewrite ^/firmware/(P0030801SR01.sbn)$ /firmware/7940/$1 last;
 
 		# 7941_7961 firmware (java-based)
-		rewrite ^/firmware/(apps41.+\.sbn)$ /firmware/7941_7961/$1 last;
-		rewrite ^/firmware/(cnu41.+\.sbn)$ /firmware/7941_7961/$1 last;
-		rewrite ^/firmware/(cvm41sccp.+\.sbn)$ /firmware/7941_7961/$1 last;
-		rewrite ^/firmware/(dsp41.+\.sbn)$ /firmware/7941_7961/$1 last;
-		rewrite ^/firmware/(jar41sccp.+\.sbn)$ /firmware/7941_7961/$1 last;
-		rewrite ^/firmware/(SCCP41.+\.loads)$ /firmware/7941_7961/$1 last;
-		rewrite ^/firmware/(term41.+\.loads)$ /firmware/7941_7961/$1 last;
-		rewrite ^/firmware/(term61.+\.loads)$ /firmware/7941_7961/$1 last;
+		rewrite ^/firmware/(apps41.+\.sbn)$ /firmware/7941/$1 last;
+		rewrite ^/firmware/(cnu41.+\.sbn)$ /firmware/7941/$1 last;
+		rewrite ^/firmware/(cvm41sccp.+\.sbn)$ /firmware/7941/$1 last;
+		rewrite ^/firmware/(dsp41.+\.sbn)$ /firmware/7941/$1 last;
+		rewrite ^/firmware/(jar41sccp.+\.sbn)$ /firmware/7941/$1 last;
+		rewrite ^/firmware/(SCCP41.+\.loads)$ /firmware/7941/$1 last;
+		rewrite ^/firmware/(term41.+\.loads)$ /firmware/7941/$1 last;
+		rewrite ^/firmware/(term61.+\.loads)$ /firmware/7941/$1 last;
 
 		# 7942_7962 firmware (java-based)
-		rewrite ^/firmware/(apps42.+\.sbn)$ /firmware/7942_7962/$1 last;
-		rewrite ^/firmware/(cnu42.+\.sbn)$ /firmware/7942_7962/$1 last;
-		rewrite ^/firmware/(cvm42sccp.+\.sbn)$ /firmware/7942_7962/$1 last;
-		rewrite ^/firmware/(dsp42.+\.sbn)$ /firmware/7942_7962/$1 last;
-		rewrite ^/firmware/(jar42sccp.+\.sbn)$ /firmware/7942_7962/$1 last;
-		rewrite ^/firmware/(SCCP42.+\.loads)$ /firmware/7942_7962/$1 last;
-		rewrite ^/firmware/(term42.+\.loads)$ /firmware/7942_7962/$1 last;
-		rewrite ^/firmware/(term62.+\.loads)$ /firmware/7942_7962/$1 last;
+		rewrite ^/firmware/(apps42.+\.sbn)$ /firmware/7942/$1 last;
+		rewrite ^/firmware/(cnu42.+\.sbn)$ /firmware/7942/$1 last;
+		rewrite ^/firmware/(cvm42sccp.+\.sbn)$ /firmware/7942/$1 last;
+		rewrite ^/firmware/(dsp42.+\.sbn)$ /firmware/7942/$1 last;
+		rewrite ^/firmware/(jar42sccp.+\.sbn)$ /firmware/7942/$1 last;
+		rewrite ^/firmware/(SCCP42.+\.loads)$ /firmware/7942/$1 last;
+		rewrite ^/firmware/(term42.+\.loads)$ /firmware/7942/$1 last;
+		rewrite ^/firmware/(term62.+\.loads)$ /firmware/7942/$1 last;
 
 		# 7945_7965 firmware (java-based)
-		rewrite ^/firmware/(apps45.+\.sbn)$ /firmware/7945_7965/$1 last;
-		rewrite ^/firmware/(cnu45.+\.sbn)$ /firmware/7945_7965/$1 last;
-		rewrite ^/firmware/(cvm45sccp.+\.sbn)$ /firmware/7945_7965/$1 last;
-		rewrite ^/firmware/(dsp45.+\.sbn)$ /firmware/7945_7965/$1 last;
-		rewrite ^/firmware/(jar45sccp.+\.sbn)$ /firmware/7945_7965/$1 last;
-		rewrite ^/firmware/(SCCP45.+\.loads)$ /firmware/7945_7965/$1 last;
-		rewrite ^/firmware/(term45.+\.loads)$ /firmware/7945_7965/$1 last;
-		rewrite ^/firmware/(term65.+\.loads)$ /firmware/7945_7965/$1 last;
+		rewrite ^/firmware/(apps45.+\.sbn)$ /firmware/7945/$1 last;
+		rewrite ^/firmware/(cnu45.+\.sbn)$ /firmware/7945/$1 last;
+		rewrite ^/firmware/(cvm45sccp.+\.sbn)$ /firmware/7945/$1 last;
+		rewrite ^/firmware/(dsp45.+\.sbn)$ /firmware/7945/$1 last;
+		rewrite ^/firmware/(jar45sccp.+\.sbn)$ /firmware/7945/$1 last;
+		rewrite ^/firmware/(SCCP45.+\.loads)$ /firmware/7945/$1 last;
+		rewrite ^/firmware/(term45.+\.loads)$ /firmware/7945/$1 last;
+		rewrite ^/firmware/(term65.+\.loads)$ /firmware/7945/$1 last;
 
 		# 7970_7971 firmware (java-based)
-		rewrite ^/firmware/(apps70.+\.sbn)$ /firmware/7970_7971/$1 last;
-		rewrite ^/firmware/(cnu70.+\.sbn)$ /firmware/7970_7971/$1 last;
-		rewrite ^/firmware/(cvm70sccp.+\.sbn)$ /firmware/7970_7971/$1 last;
-		rewrite ^/firmware/(dsp70.+\.sbn)$ /firmware/7970_7971/$1 last;
-		rewrite ^/firmware/(jar70sccp.+\.sbn)$ /firmware/7970_7971/$1 last;
-		rewrite ^/firmware/(SCCP70.+\.loads)$ /firmware/7970_7971/$1 last;
-		rewrite ^/firmware/(term70.+\.loads)$ /firmware/7970_7971/$1 last;
-		rewrite ^/firmware/(term71.+\.loads)$ /firmware/7970_7971/$1 last;
+		rewrite ^/firmware/(apps70.+\.sbn)$ /firmware/7970/$1 last;
+		rewrite ^/firmware/(cnu70.+\.sbn)$ /firmware/7970/$1 last;
+		rewrite ^/firmware/(cvm70sccp.+\.sbn)$ /firmware/7970/$1 last;
+		rewrite ^/firmware/(dsp70.+\.sbn)$ /firmware/7970/$1 last;
+		rewrite ^/firmware/(jar70sccp.+\.sbn)$ /firmware/7970/$1 last;
+		rewrite ^/firmware/(SCCP70.+\.loads)$ /firmware/7970/$1 last;
+		rewrite ^/firmware/(term70.+\.loads)$ /firmware/7970/$1 last;
+		rewrite ^/firmware/(term71.+\.loads)$ /firmware/7970/$1 last;
 
 		# 7975 firmware (java-based)
 		rewrite ^/firmware/(apps75.+\.sbn)$ /firmware/7975/$1 last;
diff --git a/etc/tftpd-hpa/rewrite.rules b/etc/tftpd-hpa/rewrite.rules
index 884cf33..d0e3507 100644
--- a/etc/tftpd-hpa/rewrite.rules
+++ b/etc/tftpd-hpa/rewrite.rules
@@ -33,14 +33,14 @@ ri ^(CP7905080003SCCP070409A.sbin)$ firmware/7905/\1
 ri ^(CP7905080003SCCP070409A.zup)$ firmware/7905/\1
 
 # 7906_7911 firmware (java-based)
-ri ^(apps11)(.+\.sbn)$ firmware/7906_7911/\1\2
-ri ^(cnu11)(.+\.sbn)$ firmware/7906_7911/\1\2
-ri ^(cvm11sccp)(.+\.sbn)$ firmware/7906_7911/\1\2
-ri ^(dsp11)(.+\.sbn)$ firmware/7906_7911/\1\2
-ri ^(jar11sccp)(.+\.sbn)$ firmware/7906_7911/\1\2
-ri ^(SCCP11)(.+\.loads)$ firmware/7906_7911/\1\2
-ri ^(term06)(.+\.loads)$ firmware/7906_7911/\1\2
-ri ^(term11)(.+\.loads)$ firmware/7906_7911/\1\2
+ri ^(apps11)(.+\.sbn)$ firmware/7906/\1\2
+ri ^(cnu11)(.+\.sbn)$ firmware/7906/\1\2
+ri ^(cvm11sccp)(.+\.sbn)$ firmware/7906/\1\2
+ri ^(dsp11)(.+\.sbn)$ firmware/7906/\1\2
+ri ^(jar11sccp)(.+\.sbn)$ firmware/7906/\1\2
+ri ^(SCCP11)(.+\.loads)$ firmware/7906/\1\2
+ri ^(term06)(.+\.loads)$ firmware/7906/\1\2
+ri ^(term11)(.+\.loads)$ firmware/7906/\1\2
 
 # 7910 firmware (ancient)
 ri ^(P00405000700.bin)$ firmware/7910/\1
@@ -59,13 +59,13 @@ ri ^(B016-1-0-4.SBN)$ firmware/7916/\1
 ri ^(cmterm_7920.4.0-03-02.bin)$ firmware/7920/\1
 
 # 7921_7925 firmware (ancient)
-ri ^(APPS-1.4.3.4.SBN)$ firmware/7921_7925/\1
-ri ^(CP7921G-1.4.3.4.LOADS)$ firmware/7921_7925/\1
-ri ^(GUI-1.4.3.4.SBN)$ firmware/7921_7925/\1
-ri ^(SYS-1.4.3.4.SBN)$ firmware/7921_7925/\1
-ri ^(TNUX-1.4.3.4.SBN)$ firmware/7921_7925/\1
-ri ^(TNUXR-1.4.3.4.SBN)$ firmware/7921_7925/\1
-ri ^(WLAN-1.4.3.4.SBN)$ firmware/7921_7925/\1
+ri ^(APPS-1.4.3.4.SBN)$ firmware/7921/\1
+ri ^(CP7921G-1.4.3.4.LOADS)$ firmware/7921/\1
+ri ^(GUI-1.4.3.4.SBN)$ firmware/7921/\1
+ri ^(SYS-1.4.3.4.SBN)$ firmware/7921/\1
+ri ^(TNUX-1.4.3.4.SBN)$ firmware/7921/\1
+ri ^(TNUXR-1.4.3.4.SBN)$ firmware/7921/\1
+ri ^(WLAN-1.4.3.4.SBN)$ firmware/7921/\1
 
 # 7926 firmware (ancient)
 ri ^(APPSS-1.4.1SR1.SBN)$ firmware/7926/\1
@@ -98,50 +98,50 @@ ri ^(cmterm_7936.3-3-21-0.bin)$ firmware/7936/\1
 ri ^(apps37sccp.1-4-5-7.bin)$ firmware/7937/\1
 
 # 7940_7960 firmware (ancient)
-ri ^(P0030801SR01.bin)$ firmware/7940_7960/\1
-ri ^(P0030801SR01.loads)$ firmware/7940_7960/\1
-ri ^(P0030801SR01.sb2)$ firmware/7940_7960/\1
-ri ^(P0030801SR01.sbn)$ firmware/7940_7960/\1
+ri ^(P0030801SR01.bin)$ firmware/7940/\1
+ri ^(P0030801SR01.loads)$ firmware/7940/\1
+ri ^(P0030801SR01.sb2)$ firmware/7940/\1
+ri ^(P0030801SR01.sbn)$ firmware/7940/\1
 
 # 7941_7961 firmware (java-based)
-ri ^(apps41)(.+\.sbn)$ firmware/7941_7961/\1\2
-ri ^(cnu41)(.+\.sbn)$ firmware/7941_7961/\1\2
-ri ^(cvm41sccp)(.+\.sbn)$ firmware/7941_7961/\1\2
-ri ^(dsp41)(.+\.sbn)$ firmware/7941_7961/\1\2
-ri ^(jar41sccp)(.+\.sbn)$ firmware/7941_7961/\1\2
-ri ^(SCCP41)(.+\.loads)$ firmware/7941_7961/\1\2
-ri ^(term41)(.+\.loads)$ firmware/7941_7961/\1\2
-ri ^(term61)(.+\.loads)$ firmware/7941_7961/\1\2
+ri ^(apps41)(.+\.sbn)$ firmware/7941/\1\2
+ri ^(cnu41)(.+\.sbn)$ firmware/7941/\1\2
+ri ^(cvm41sccp)(.+\.sbn)$ firmware/7941/\1\2
+ri ^(dsp41)(.+\.sbn)$ firmware/7941/\1\2
+ri ^(jar41sccp)(.+\.sbn)$ firmware/7941/\1\2
+ri ^(SCCP41)(.+\.loads)$ firmware/7941/\1\2
+ri ^(term41)(.+\.loads)$ firmware/7941/\1\2
+ri ^(term61)(.+\.loads)$ firmware/7941/\1\2
 
 # 7942_7962 firmware (java-based)
-ri ^(apps42)(.+\.sbn)$ firmware/7942_7962/\1\2
-ri ^(cnu42)(.+\.sbn)$ firmware/7942_7962/\1\2
-ri ^(cvm42sccp)(.+\.sbn)$ firmware/7942_7962/\1\2
-ri ^(dsp42)(.+\.sbn)$ firmware/7942_7962/\1\2
-ri ^(jar42sccp)(.+\.sbn)$ firmware/7942_7962/\1\2
-ri ^(SCCP42)(.+\.loads)$ firmware/7942_7962/\1\2
-ri ^(term42)(.+\.loads)$ firmware/7942_7962/\1\2
-ri ^(term62)(.+\.loads)$ firmware/7942_7962/\1\2
+ri ^(apps42)(.+\.sbn)$ firmware/7942/\1\2
+ri ^(cnu42)(.+\.sbn)$ firmware/7942/\1\2
+ri ^(cvm42sccp)(.+\.sbn)$ firmware/7942/\1\2
+ri ^(dsp42)(.+\.sbn)$ firmware/7942/\1\2
+ri ^(jar42sccp)(.+\.sbn)$ firmware/7942/\1\2
+ri ^(SCCP42)(.+\.loads)$ firmware/7942/\1\2
+ri ^(term42)(.+\.loads)$ firmware/7942/\1\2
+ri ^(term62)(.+\.loads)$ firmware/7942/\1\2
 
 # 7945_7965 firmware (java-based)
-ri ^(apps45)(.+\.sbn)$ firmware/7945_7965/\1\2
-ri ^(cnu45)(.+\.sbn)$ firmware/7945_7965/\1\2
-ri ^(cvm45sccp)(.+\.sbn)$ firmware/7945_7965/\1\2
-ri ^(dsp45)(.+\.sbn)$ firmware/7945_7965/\1\2
-ri ^(jar45sccp)(.+\.sbn)$ firmware/7945_7965/\1\2
-ri ^(SCCP45)(.+\.loads)$ firmware/7945_7965/\1\2
-ri ^(term45)(.+\.loads)$ firmware/7945_7965/\1\2
-ri ^(term65)(.+\.loads)$ firmware/7945_7965/\1\2
+ri ^(apps45)(.+\.sbn)$ firmware/7945/\1\2
+ri ^(cnu45)(.+\.sbn)$ firmware/7945/\1\2
+ri ^(cvm45sccp)(.+\.sbn)$ firmware/7945/\1\2
+ri ^(dsp45)(.+\.sbn)$ firmware/7945/\1\2
+ri ^(jar45sccp)(.+\.sbn)$ firmware/7945/\1\2
+ri ^(SCCP45)(.+\.loads)$ firmware/7945/\1\2
+ri ^(term45)(.+\.loads)$ firmware/7945/\1\2
+ri ^(term65)(.+\.loads)$ firmware/7945/\1\2
 
 # 7970_7971 firmware (java-based)
-ri ^(apps70)(.+\.sbn)$ firmware/7970_7971/\1\2
-ri ^(cnu70)(.+\.sbn)$ firmware/7970_7971/\1\2
-ri ^(cvm70sccp)(.+\.sbn)$ firmware/7970_7971/\1\2
-ri ^(dsp70)(.+\.sbn)$ firmware/7970_7971/\1\2
-ri ^(jar70sccp)(.+\.sbn)$ firmware/7970_7971/\1\2
-ri ^(SCCP70)(.+\.loads)$ firmware/7970_7971/\1\2
-ri ^(term70)(.+\.loads)$ firmware/7970_7971/\1\2
-ri ^(term71)(.+\.loads)$ firmware/7970_7971/\1\2
+ri ^(apps70)(.+\.sbn)$ firmware/7970/\1\2
+ri ^(cnu70)(.+\.sbn)$ firmware/7970/\1\2
+ri ^(cvm70sccp)(.+\.sbn)$ firmware/7970/\1\2
+ri ^(dsp70)(.+\.sbn)$ firmware/7970/\1\2
+ri ^(jar70sccp)(.+\.sbn)$ firmware/7970/\1\2
+ri ^(SCCP70)(.+\.loads)$ firmware/7970/\1\2
+ri ^(term70)(.+\.loads)$ firmware/7970/\1\2
+ri ^(term71)(.+\.loads)$ firmware/7970/\1\2
 
 # 7975 firmware (java-based)
 ri ^(apps75)(.+\.sbn)$ firmware/7975/\1\2
diff --git a/tftpboot/firmware/7906_7911/SCCP11.9-4-2SR3-1S.loads b/tftpboot/firmware/7906/SCCP11.9-4-2SR3-1S.loads
similarity index 100%
rename from tftpboot/firmware/7906_7911/SCCP11.9-4-2SR3-1S.loads
rename to tftpboot/firmware/7906/SCCP11.9-4-2SR3-1S.loads
diff --git a/tftpboot/firmware/7906_7911/apps11.9-4-2ES26.sbn b/tftpboot/firmware/7906/apps11.9-4-2ES26.sbn
similarity index 100%
rename from tftpboot/firmware/7906_7911/apps11.9-4-2ES26.sbn
rename to tftpboot/firmware/7906/apps11.9-4-2ES26.sbn
diff --git a/tftpboot/firmware/7906_7911/cnu11.9-4-2ES26.sbn b/tftpboot/firmware/7906/cnu11.9-4-2ES26.sbn
similarity index 100%
rename from tftpboot/firmware/7906_7911/cnu11.9-4-2ES26.sbn
rename to tftpboot/firmware/7906/cnu11.9-4-2ES26.sbn
diff --git a/tftpboot/firmware/7906_7911/cvm11sccp.9-4-2ES26.sbn b/tftpboot/firmware/7906/cvm11sccp.9-4-2ES26.sbn
similarity index 100%
rename from tftpboot/firmware/7906_7911/cvm11sccp.9-4-2ES26.sbn
rename to tftpboot/firmware/7906/cvm11sccp.9-4-2ES26.sbn
diff --git a/tftpboot/firmware/7906_7911/dsp11.9-4-2ES26.sbn b/tftpboot/firmware/7906/dsp11.9-4-2ES26.sbn
similarity index 100%
rename from tftpboot/firmware/7906_7911/dsp11.9-4-2ES26.sbn
rename to tftpboot/firmware/7906/dsp11.9-4-2ES26.sbn
diff --git a/tftpboot/firmware/7906_7911/jar11sccp.9-4-2ES26.sbn b/tftpboot/firmware/7906/jar11sccp.9-4-2ES26.sbn
similarity index 100%
rename from tftpboot/firmware/7906_7911/jar11sccp.9-4-2ES26.sbn
rename to tftpboot/firmware/7906/jar11sccp.9-4-2ES26.sbn
diff --git a/tftpboot/firmware/7911 b/tftpboot/firmware/7911
new file mode 120000
index 0000000..89f03f9
--- /dev/null
+++ b/tftpboot/firmware/7911
@@ -0,0 +1 @@
+7906
\ No newline at end of file
diff --git a/tftpboot/firmware/7921_7925/APPS-1.4.6.3.SBN b/tftpboot/firmware/7921/APPS-1.4.6.3.SBN
similarity index 100%
rename from tftpboot/firmware/7921_7925/APPS-1.4.6.3.SBN
rename to tftpboot/firmware/7921/APPS-1.4.6.3.SBN
diff --git a/tftpboot/firmware/7921_7925/CP7921G-1.4.6.3.LOADS b/tftpboot/firmware/7921/CP7921G-1.4.6.3.LOADS
similarity index 100%
rename from tftpboot/firmware/7921_7925/CP7921G-1.4.6.3.LOADS
rename to tftpboot/firmware/7921/CP7921G-1.4.6.3.LOADS
diff --git a/tftpboot/firmware/7921_7925/GUI-1.4.6.3.SBN b/tftpboot/firmware/7921/GUI-1.4.6.3.SBN
similarity index 100%
rename from tftpboot/firmware/7921_7925/GUI-1.4.6.3.SBN
rename to tftpboot/firmware/7921/GUI-1.4.6.3.SBN
diff --git a/tftpboot/firmware/7921_7925/SYS-1.4.6.3.SBN b/tftpboot/firmware/7921/SYS-1.4.6.3.SBN
similarity index 100%
rename from tftpboot/firmware/7921_7925/SYS-1.4.6.3.SBN
rename to tftpboot/firmware/7921/SYS-1.4.6.3.SBN
diff --git a/tftpboot/firmware/7921_7925/TNUX-1.4.6.3.SBN b/tftpboot/firmware/7921/TNUX-1.4.6.3.SBN
similarity index 100%
rename from tftpboot/firmware/7921_7925/TNUX-1.4.6.3.SBN
rename to tftpboot/firmware/7921/TNUX-1.4.6.3.SBN
diff --git a/tftpboot/firmware/7921_7925/TNUXR-1.4.6.3.SBN b/tftpboot/firmware/7921/TNUXR-1.4.6.3.SBN
similarity index 100%
rename from tftpboot/firmware/7921_7925/TNUXR-1.4.6.3.SBN
rename to tftpboot/firmware/7921/TNUXR-1.4.6.3.SBN
diff --git a/tftpboot/firmware/7921_7925/WLAN-1.4.6.3.SBN b/tftpboot/firmware/7921/WLAN-1.4.6.3.SBN
similarity index 100%
rename from tftpboot/firmware/7921_7925/WLAN-1.4.6.3.SBN
rename to tftpboot/firmware/7921/WLAN-1.4.6.3.SBN
diff --git a/tftpboot/firmware/7940_7960/P0030801SR02.bin b/tftpboot/firmware/7940/P0030801SR02.bin
similarity index 100%
rename from tftpboot/firmware/7940_7960/P0030801SR02.bin
rename to tftpboot/firmware/7940/P0030801SR02.bin
diff --git a/tftpboot/firmware/7940_7960/P0030801SR02.loads b/tftpboot/firmware/7940/P0030801SR02.loads
similarity index 100%
rename from tftpboot/firmware/7940_7960/P0030801SR02.loads
rename to tftpboot/firmware/7940/P0030801SR02.loads
diff --git a/tftpboot/firmware/7940_7960/P0030801SR02.sb2 b/tftpboot/firmware/7940/P0030801SR02.sb2
similarity index 100%
rename from tftpboot/firmware/7940_7960/P0030801SR02.sb2
rename to tftpboot/firmware/7940/P0030801SR02.sb2
diff --git a/tftpboot/firmware/7940_7960/P0030801SR02.sbn b/tftpboot/firmware/7940/P0030801SR02.sbn
similarity index 100%
rename from tftpboot/firmware/7940_7960/P0030801SR02.sbn
rename to tftpboot/firmware/7940/P0030801SR02.sbn
diff --git a/tftpboot/firmware/7940_7960/P0030801SR02.txt b/tftpboot/firmware/7940/P0030801SR02.txt
similarity index 100%
rename from tftpboot/firmware/7940_7960/P0030801SR02.txt
rename to tftpboot/firmware/7940/P0030801SR02.txt
diff --git a/tftpboot/firmware/7941_7961/SCCP41.9-4-2SR3-1S.loads b/tftpboot/firmware/7941/SCCP41.9-4-2SR3-1S.loads
similarity index 100%
rename from tftpboot/firmware/7941_7961/SCCP41.9-4-2SR3-1S.loads
rename to tftpboot/firmware/7941/SCCP41.9-4-2SR3-1S.loads
diff --git a/tftpboot/firmware/7941_7961/apps41.9-4-2ES26.sbn b/tftpboot/firmware/7941/apps41.9-4-2ES26.sbn
similarity index 100%
rename from tftpboot/firmware/7941_7961/apps41.9-4-2ES26.sbn
rename to tftpboot/firmware/7941/apps41.9-4-2ES26.sbn
diff --git a/tftpboot/firmware/7941_7961/cnu41.9-4-2ES26.sbn b/tftpboot/firmware/7941/cnu41.9-4-2ES26.sbn
similarity index 100%
rename from tftpboot/firmware/7941_7961/cnu41.9-4-2ES26.sbn
rename to tftpboot/firmware/7941/cnu41.9-4-2ES26.sbn
diff --git a/tftpboot/firmware/7941_7961/cvm41sccp.9-4-2ES26.sbn b/tftpboot/firmware/7941/cvm41sccp.9-4-2ES26.sbn
similarity index 100%
rename from tftpboot/firmware/7941_7961/cvm41sccp.9-4-2ES26.sbn
rename to tftpboot/firmware/7941/cvm41sccp.9-4-2ES26.sbn
diff --git a/tftpboot/firmware/7941_7961/dsp41.9-4-2ES26.sbn b/tftpboot/firmware/7941/dsp41.9-4-2ES26.sbn
similarity index 100%
rename from tftpboot/firmware/7941_7961/dsp41.9-4-2ES26.sbn
rename to tftpboot/firmware/7941/dsp41.9-4-2ES26.sbn
diff --git a/tftpboot/firmware/7941_7961/jar41sccp.9-4-2ES26.sbn b/tftpboot/firmware/7941/jar41sccp.9-4-2ES26.sbn
similarity index 100%
rename from tftpboot/firmware/7941_7961/jar41sccp.9-4-2ES26.sbn
rename to tftpboot/firmware/7941/jar41sccp.9-4-2ES26.sbn
diff --git a/tftpboot/firmware/7941_7961/term41.default.loads b/tftpboot/firmware/7941/term41.default.loads
similarity index 100%
rename from tftpboot/firmware/7941_7961/term41.default.loads
rename to tftpboot/firmware/7941/term41.default.loads
diff --git a/tftpboot/firmware/7941_7961/term61.default.loads b/tftpboot/firmware/7941/term61.default.loads
similarity index 100%
rename from tftpboot/firmware/7941_7961/term61.default.loads
rename to tftpboot/firmware/7941/term61.default.loads
diff --git a/tftpboot/firmware/7942_7962/SCCP42.9-4-2SR3-1S.loads b/tftpboot/firmware/7942/SCCP42.9-4-2SR3-1S.loads
similarity index 100%
rename from tftpboot/firmware/7942_7962/SCCP42.9-4-2SR3-1S.loads
rename to tftpboot/firmware/7942/SCCP42.9-4-2SR3-1S.loads
diff --git a/tftpboot/firmware/7942_7962/apps42.9-4-2ES26.sbn b/tftpboot/firmware/7942/apps42.9-4-2ES26.sbn
similarity index 100%
rename from tftpboot/firmware/7942_7962/apps42.9-4-2ES26.sbn
rename to tftpboot/firmware/7942/apps42.9-4-2ES26.sbn
diff --git a/tftpboot/firmware/7942_7962/cnu42.9-4-2ES26.sbn b/tftpboot/firmware/7942/cnu42.9-4-2ES26.sbn
similarity index 100%
rename from tftpboot/firmware/7942_7962/cnu42.9-4-2ES26.sbn
rename to tftpboot/firmware/7942/cnu42.9-4-2ES26.sbn
diff --git a/tftpboot/firmware/7942_7962/cvm42sccp.9-4-2ES26.sbn b/tftpboot/firmware/7942/cvm42sccp.9-4-2ES26.sbn
similarity index 100%
rename from tftpboot/firmware/7942_7962/cvm42sccp.9-4-2ES26.sbn
rename to tftpboot/firmware/7942/cvm42sccp.9-4-2ES26.sbn
diff --git a/tftpboot/firmware/7942_7962/dsp42.9-4-2ES26.sbn b/tftpboot/firmware/7942/dsp42.9-4-2ES26.sbn
similarity index 100%
rename from tftpboot/firmware/7942_7962/dsp42.9-4-2ES26.sbn
rename to tftpboot/firmware/7942/dsp42.9-4-2ES26.sbn
diff --git a/tftpboot/firmware/7942_7962/jar42sccp.9-4-2ES26.sbn b/tftpboot/firmware/7942/jar42sccp.9-4-2ES26.sbn
similarity index 100%
rename from tftpboot/firmware/7942_7962/jar42sccp.9-4-2ES26.sbn
rename to tftpboot/firmware/7942/jar42sccp.9-4-2ES26.sbn
diff --git a/tftpboot/firmware/7942_7962/term42.default.loads b/tftpboot/firmware/7942/term42.default.loads
similarity index 100%
rename from tftpboot/firmware/7942_7962/term42.default.loads
rename to tftpboot/firmware/7942/term42.default.loads
diff --git a/tftpboot/firmware/7942_7962/term62.default.loads b/tftpboot/firmware/7942/term62.default.loads
similarity index 100%
rename from tftpboot/firmware/7942_7962/term62.default.loads
rename to tftpboot/firmware/7942/term62.default.loads
diff --git a/tftpboot/firmware/7945_7965/SCCP45.9-3-1SR1-1S.loads b/tftpboot/firmware/7945/SCCP45.9-3-1SR1-1S.loads
similarity index 100%
rename from tftpboot/firmware/7945_7965/SCCP45.9-3-1SR1-1S.loads
rename to tftpboot/firmware/7945/SCCP45.9-3-1SR1-1S.loads
diff --git a/tftpboot/firmware/7945_7965/apps45.9-3-1ES8.sbn b/tftpboot/firmware/7945/apps45.9-3-1ES8.sbn
similarity index 100%
rename from tftpboot/firmware/7945_7965/apps45.9-3-1ES8.sbn
rename to tftpboot/firmware/7945/apps45.9-3-1ES8.sbn
diff --git a/tftpboot/firmware/7945_7965/cnu45.9-3-1ES8.sbn b/tftpboot/firmware/7945/cnu45.9-3-1ES8.sbn
similarity index 100%
rename from tftpboot/firmware/7945_7965/cnu45.9-3-1ES8.sbn
rename to tftpboot/firmware/7945/cnu45.9-3-1ES8.sbn
diff --git a/tftpboot/firmware/7945_7965/cvm45sccp.9-3-1ES8.sbn b/tftpboot/firmware/7945/cvm45sccp.9-3-1ES8.sbn
similarity index 100%
rename from tftpboot/firmware/7945_7965/cvm45sccp.9-3-1ES8.sbn
rename to tftpboot/firmware/7945/cvm45sccp.9-3-1ES8.sbn
diff --git a/tftpboot/firmware/7945_7965/dsp45.9-3-1ES8.sbn b/tftpboot/firmware/7945/dsp45.9-3-1ES8.sbn
similarity index 100%
rename from tftpboot/firmware/7945_7965/dsp45.9-3-1ES8.sbn
rename to tftpboot/firmware/7945/dsp45.9-3-1ES8.sbn
diff --git a/tftpboot/firmware/7945_7965/jar45sccp.9-3-1ES8.sbn b/tftpboot/firmware/7945/jar45sccp.9-3-1ES8.sbn
similarity index 100%
rename from tftpboot/firmware/7945_7965/jar45sccp.9-3-1ES8.sbn
rename to tftpboot/firmware/7945/jar45sccp.9-3-1ES8.sbn
diff --git a/tftpboot/firmware/7945_7965/term45.default.loads b/tftpboot/firmware/7945/term45.default.loads
similarity index 100%
rename from tftpboot/firmware/7945_7965/term45.default.loads
rename to tftpboot/firmware/7945/term45.default.loads
diff --git a/tftpboot/firmware/7945_7965/term65.default.loads b/tftpboot/firmware/7945/term65.default.loads
similarity index 100%
rename from tftpboot/firmware/7945_7965/term65.default.loads
rename to tftpboot/firmware/7945/term65.default.loads
diff --git a/tftpboot/firmware/7960 b/tftpboot/firmware/7960
new file mode 120000
index 0000000..1a4e607
--- /dev/null
+++ b/tftpboot/firmware/7960
@@ -0,0 +1 @@
+7940
\ No newline at end of file
diff --git a/tftpboot/firmware/7961 b/tftpboot/firmware/7961
new file mode 120000
index 0000000..80b6d1c
--- /dev/null
+++ b/tftpboot/firmware/7961
@@ -0,0 +1 @@
+7941
\ No newline at end of file
diff --git a/tftpboot/firmware/7962 b/tftpboot/firmware/7962
new file mode 120000
index 0000000..64e874f
--- /dev/null
+++ b/tftpboot/firmware/7962
@@ -0,0 +1 @@
+7942
\ No newline at end of file
diff --git a/tftpboot/firmware/7965 b/tftpboot/firmware/7965
new file mode 120000
index 0000000..af5cb32
--- /dev/null
+++ b/tftpboot/firmware/7965
@@ -0,0 +1 @@
+7945
\ No newline at end of file
diff --git a/tftpboot/firmware/7970_7971/SCCP70.9-4-2SR3-1S.loads b/tftpboot/firmware/7970/SCCP70.9-4-2SR3-1S.loads
similarity index 100%
rename from tftpboot/firmware/7970_7971/SCCP70.9-4-2SR3-1S.loads
rename to tftpboot/firmware/7970/SCCP70.9-4-2SR3-1S.loads
diff --git a/tftpboot/firmware/7970_7971/apps70.9-4-2ES26.sbn b/tftpboot/firmware/7970/apps70.9-4-2ES26.sbn
similarity index 100%
rename from tftpboot/firmware/7970_7971/apps70.9-4-2ES26.sbn
rename to tftpboot/firmware/7970/apps70.9-4-2ES26.sbn
diff --git a/tftpboot/firmware/7970_7971/cnu70.9-4-2ES26.sbn b/tftpboot/firmware/7970/cnu70.9-4-2ES26.sbn
similarity index 100%
rename from tftpboot/firmware/7970_7971/cnu70.9-4-2ES26.sbn
rename to tftpboot/firmware/7970/cnu70.9-4-2ES26.sbn
diff --git a/tftpboot/firmware/7970_7971/cvm70sccp.9-4-2ES26.sbn b/tftpboot/firmware/7970/cvm70sccp.9-4-2ES26.sbn
similarity index 100%
rename from tftpboot/firmware/7970_7971/cvm70sccp.9-4-2ES26.sbn
rename to tftpboot/firmware/7970/cvm70sccp.9-4-2ES26.sbn
diff --git a/tftpboot/firmware/7970_7971/dsp70.9-4-2ES26.sbn b/tftpboot/firmware/7970/dsp70.9-4-2ES26.sbn
similarity index 100%
rename from tftpboot/firmware/7970_7971/dsp70.9-4-2ES26.sbn
rename to tftpboot/firmware/7970/dsp70.9-4-2ES26.sbn
diff --git a/tftpboot/firmware/7970_7971/jar70sccp.9-4-2ES26.sbn b/tftpboot/firmware/7970/jar70sccp.9-4-2ES26.sbn
similarity index 100%
rename from tftpboot/firmware/7970_7971/jar70sccp.9-4-2ES26.sbn
rename to tftpboot/firmware/7970/jar70sccp.9-4-2ES26.sbn
diff --git a/tftpboot/firmware/7970_7971/term70.default.loads b/tftpboot/firmware/7970/term70.default.loads
similarity index 100%
rename from tftpboot/firmware/7970_7971/term70.default.loads
rename to tftpboot/firmware/7970/term70.default.loads
diff --git a/tftpboot/firmware/7970_7971/term71.default.loads b/tftpboot/firmware/7970/term71.default.loads
similarity index 100%
rename from tftpboot/firmware/7970_7971/term71.default.loads
rename to tftpboot/firmware/7970/term71.default.loads
diff --git a/tftpboot/firmware/7971 b/tftpboot/firmware/7971
new file mode 120000
index 0000000..3f70dca
--- /dev/null
+++ b/tftpboot/firmware/7971
@@ -0,0 +1 @@
+7970
\ No newline at end of file
diff --git a/tftpboot/firmware/ata186_188/ATA030204SCCP090202A.zup b/tftpboot/firmware/ata186/ATA030204SCCP090202A.zup
similarity index 100%
rename from tftpboot/firmware/ata186_188/ATA030204SCCP090202A.zup
rename to tftpboot/firmware/ata186/ATA030204SCCP090202A.zup
diff --git a/tftpboot/firmware/ata188 b/tftpboot/firmware/ata188
new file mode 120000
index 0000000..e47ced4
--- /dev/null
+++ b/tftpboot/firmware/ata188
@@ -0,0 +1 @@
+ata186
\ No newline at end of file