diff --git a/firmwares/NINA/1.0.0/NINA_W102.bin b/firmwares/NINA/1.0.0/NINA.bin
similarity index 100%
rename from firmwares/NINA/1.0.0/NINA_W102.bin
rename to firmwares/NINA/1.0.0/NINA.bin
diff --git a/firmwares/NINA/1.1.0/NINA_W102.bin b/firmwares/NINA/1.1.0/NINA.bin
similarity index 100%
rename from firmwares/NINA/1.1.0/NINA_W102.bin
rename to firmwares/NINA/1.1.0/NINA.bin
diff --git a/firmwares/NINA/1.2.1/NINA_W102-Uno_WiFi_Rev2.bin b/firmwares/NINA/1.2.1/NINA-arduino.megaavr.uno2018.bin
similarity index 100%
rename from firmwares/NINA/1.2.1/NINA_W102-Uno_WiFi_Rev2.bin
rename to firmwares/NINA/1.2.1/NINA-arduino.megaavr.uno2018.bin
diff --git a/firmwares/NINA/1.2.1/NINA_W102.bin b/firmwares/NINA/1.2.1/NINA.bin
similarity index 100%
rename from firmwares/NINA/1.2.1/NINA_W102.bin
rename to firmwares/NINA/1.2.1/NINA.bin
diff --git a/firmwares/NINA/1.2.2/NINA_W102-Uno_WiFi_Rev2.bin b/firmwares/NINA/1.2.2/NINA-arduino.megaavr.uno2018.bin
similarity index 100%
rename from firmwares/NINA/1.2.2/NINA_W102-Uno_WiFi_Rev2.bin
rename to firmwares/NINA/1.2.2/NINA-arduino.megaavr.uno2018.bin
diff --git a/firmwares/NINA/1.2.2/NINA_W102.bin b/firmwares/NINA/1.2.2/NINA.bin
similarity index 100%
rename from firmwares/NINA/1.2.2/NINA_W102.bin
rename to firmwares/NINA/1.2.2/NINA.bin
diff --git a/firmwares/NINA/1.2.3/NINA_W102-Uno_WiFi_Rev2.bin b/firmwares/NINA/1.2.3/NINA-arduino.megaavr.uno2018.bin
similarity index 100%
rename from firmwares/NINA/1.2.3/NINA_W102-Uno_WiFi_Rev2.bin
rename to firmwares/NINA/1.2.3/NINA-arduino.megaavr.uno2018.bin
diff --git a/firmwares/NINA/1.2.3/NINA_W102.bin b/firmwares/NINA/1.2.3/NINA.bin
similarity index 100%
rename from firmwares/NINA/1.2.3/NINA_W102.bin
rename to firmwares/NINA/1.2.3/NINA.bin
diff --git a/firmwares/NINA/1.2.4/NINA_W102-Uno_WiFi_Rev2.bin b/firmwares/NINA/1.2.4/NINA-arduino.megaavr.uno2018.bin
similarity index 100%
rename from firmwares/NINA/1.2.4/NINA_W102-Uno_WiFi_Rev2.bin
rename to firmwares/NINA/1.2.4/NINA-arduino.megaavr.uno2018.bin
diff --git a/firmwares/NINA/1.2.4/NINA_W102.bin b/firmwares/NINA/1.2.4/NINA.bin
similarity index 100%
rename from firmwares/NINA/1.2.4/NINA_W102.bin
rename to firmwares/NINA/1.2.4/NINA.bin
diff --git a/firmwares/NINA/1.3.0/NINA_W102-Uno_WiFi_Rev2.bin b/firmwares/NINA/1.3.0/NINA-arduino.megaavr.uno2018.bin
similarity index 100%
rename from firmwares/NINA/1.3.0/NINA_W102-Uno_WiFi_Rev2.bin
rename to firmwares/NINA/1.3.0/NINA-arduino.megaavr.uno2018.bin
diff --git a/firmwares/NINA/1.3.0/NINA_W102.bin b/firmwares/NINA/1.3.0/NINA.bin
similarity index 100%
rename from firmwares/NINA/1.3.0/NINA_W102.bin
rename to firmwares/NINA/1.3.0/NINA.bin
diff --git a/firmwares/NINA/1.4.0/NINA_W102-Uno_WiFi_Rev2.bin b/firmwares/NINA/1.4.0/NINA-arduino.megaavr.uno2018.bin
similarity index 100%
rename from firmwares/NINA/1.4.0/NINA_W102-Uno_WiFi_Rev2.bin
rename to firmwares/NINA/1.4.0/NINA-arduino.megaavr.uno2018.bin
diff --git a/firmwares/NINA/1.4.0/NINA_W102.bin b/firmwares/NINA/1.4.0/NINA.bin
similarity index 100%
rename from firmwares/NINA/1.4.0/NINA_W102.bin
rename to firmwares/NINA/1.4.0/NINA.bin
diff --git a/firmwares/NINA/1.4.1/NINA_W102-Uno_WiFi_Rev2.bin b/firmwares/NINA/1.4.1/NINA-arduino.megaavr.uno2018.bin
similarity index 100%
rename from firmwares/NINA/1.4.1/NINA_W102-Uno_WiFi_Rev2.bin
rename to firmwares/NINA/1.4.1/NINA-arduino.megaavr.uno2018.bin
diff --git a/firmwares/NINA/1.4.1/NINA_W102.bin b/firmwares/NINA/1.4.1/NINA.bin
similarity index 100%
rename from firmwares/NINA/1.4.1/NINA_W102.bin
rename to firmwares/NINA/1.4.1/NINA.bin
diff --git a/firmwares/NINA/1.4.2/NINA_W102-Uno_WiFi_Rev2.bin b/firmwares/NINA/1.4.2/NINA-arduino.megaavr.uno2018.bin
similarity index 100%
rename from firmwares/NINA/1.4.2/NINA_W102-Uno_WiFi_Rev2.bin
rename to firmwares/NINA/1.4.2/NINA-arduino.megaavr.uno2018.bin
diff --git a/firmwares/NINA/1.4.2/NINA_W102.bin b/firmwares/NINA/1.4.2/NINA.bin
similarity index 100%
rename from firmwares/NINA/1.4.2/NINA_W102.bin
rename to firmwares/NINA/1.4.2/NINA.bin
diff --git a/firmwares/NINA/1.4.3/NINA_W102-Uno_WiFi_Rev2.bin b/firmwares/NINA/1.4.3/NINA-arduino.megaavr.uno2018.bin
similarity index 100%
rename from firmwares/NINA/1.4.3/NINA_W102-Uno_WiFi_Rev2.bin
rename to firmwares/NINA/1.4.3/NINA-arduino.megaavr.uno2018.bin
diff --git a/firmwares/NINA/1.4.3/NINA_W102.bin b/firmwares/NINA/1.4.3/NINA.bin
similarity index 100%
rename from firmwares/NINA/1.4.3/NINA_W102.bin
rename to firmwares/NINA/1.4.3/NINA.bin
diff --git a/firmwares/NINA/1.4.4/NINA_W102-Uno_WiFi_Rev2.bin b/firmwares/NINA/1.4.4/NINA-arduino.megaavr.uno2018.bin
similarity index 100%
rename from firmwares/NINA/1.4.4/NINA_W102-Uno_WiFi_Rev2.bin
rename to firmwares/NINA/1.4.4/NINA-arduino.megaavr.uno2018.bin
diff --git a/firmwares/NINA/1.4.4/NINA_W102.bin b/firmwares/NINA/1.4.4/NINA.bin
similarity index 100%
rename from firmwares/NINA/1.4.4/NINA_W102.bin
rename to firmwares/NINA/1.4.4/NINA.bin
diff --git a/firmwares/NINA/1.4.5/NINA_W102-Nano_RP2040_Connect.bin b/firmwares/NINA/1.4.5/NINA-arduino.mbed_nano.nanorp2040connect.bin
similarity index 100%
rename from firmwares/NINA/1.4.5/NINA_W102-Nano_RP2040_Connect.bin
rename to firmwares/NINA/1.4.5/NINA-arduino.mbed_nano.nanorp2040connect.bin
diff --git a/firmwares/NINA/1.4.5/NINA_W102-Uno_WiFi_Rev2.bin b/firmwares/NINA/1.4.5/NINA-arduino.megaavr.uno2018.bin
similarity index 100%
rename from firmwares/NINA/1.4.5/NINA_W102-Uno_WiFi_Rev2.bin
rename to firmwares/NINA/1.4.5/NINA-arduino.megaavr.uno2018.bin
diff --git a/firmwares/NINA/1.4.5/NINA_W102.bin b/firmwares/NINA/1.4.5/NINA.bin
similarity index 100%
rename from firmwares/NINA/1.4.5/NINA_W102.bin
rename to firmwares/NINA/1.4.5/NINA.bin
diff --git a/firmwares/NINA/1.4.6/NINA_W102-Nano_RP2040_Connect.bin b/firmwares/NINA/1.4.6/NINA-arduino.mbed_nano.nanorp2040connect.bin
similarity index 100%
rename from firmwares/NINA/1.4.6/NINA_W102-Nano_RP2040_Connect.bin
rename to firmwares/NINA/1.4.6/NINA-arduino.mbed_nano.nanorp2040connect.bin
diff --git a/firmwares/NINA/1.4.6/NINA_W102-Uno_WiFi_Rev2.bin b/firmwares/NINA/1.4.6/NINA-arduino.megaavr.uno2018.bin
similarity index 100%
rename from firmwares/NINA/1.4.6/NINA_W102-Uno_WiFi_Rev2.bin
rename to firmwares/NINA/1.4.6/NINA-arduino.megaavr.uno2018.bin
diff --git a/firmwares/NINA/1.4.6/NINA_W102.bin b/firmwares/NINA/1.4.6/NINA.bin
similarity index 100%
rename from firmwares/NINA/1.4.6/NINA_W102.bin
rename to firmwares/NINA/1.4.6/NINA.bin
diff --git a/firmwares/NINA/1.4.7/NINA_W102-Nano_RP2040_Connect.bin b/firmwares/NINA/1.4.7/NINA-arduino.mbed_nano.nanorp2040connect.bin
similarity index 100%
rename from firmwares/NINA/1.4.7/NINA_W102-Nano_RP2040_Connect.bin
rename to firmwares/NINA/1.4.7/NINA-arduino.mbed_nano.nanorp2040connect.bin
diff --git a/firmwares/NINA/1.4.7/NINA_W102-Uno_WiFi_Rev2.bin b/firmwares/NINA/1.4.7/NINA-arduino.megaavr.uno2018.bin
similarity index 100%
rename from firmwares/NINA/1.4.7/NINA_W102-Uno_WiFi_Rev2.bin
rename to firmwares/NINA/1.4.7/NINA-arduino.megaavr.uno2018.bin
diff --git a/firmwares/NINA/1.4.7/NINA_W102.bin b/firmwares/NINA/1.4.7/NINA.bin
similarity index 100%
rename from firmwares/NINA/1.4.7/NINA_W102.bin
rename to firmwares/NINA/1.4.7/NINA.bin
diff --git a/firmwares/NINA/FirmwareUpdater.unowifirev2.without_bl.ino.hex b/firmwares/NINA/FirmwareUpdater.unowifirev2.without_bl.ino.hex
deleted file mode 100644
index 686c31fb..00000000
--- a/firmwares/NINA/FirmwareUpdater.unowifirev2.without_bl.ino.hex
+++ /dev/null
@@ -1,439 +0,0 @@
-:100000000C94A3000C94CB000C94CB000C94CB006C
-:100010000C94CB000C94CB000C94CB000C94CB0034
-:100020000C94CB000C94CB000C94CB000C94CB0024
-:100030000C94CB000C94CB000C94CB000C94CB0014
-:100040000C94CB000C9402070C94DC060C94CB00AF
-:100050000C94CB000C94CB000C94CB000C94CB00F4
-:100060000C94CB000C94CB000C94CB000C94CB00E4
-:100070000C94CB000C94CB000C94CB000C94CB00D4
-:100080000C94CB000C94CB000C94CB000C94CB00C4
-:100090000C9478060C944E070C9428070C94CB0013
-:1000A0000000000300010200000101000000000048
-:1000B0000000000000000000000000000000000040
-:1000C0000000000000000000000504000506020416
-:1000D0000103000100010200010203040502030301
-:1000E00005040605040607030700010202030001D8
-:1000F00007060202000502010500040101040404D0
-:1001000003030303030300000200000301010000D6
-:100110000102020202050505050305201001204029
-:100120000410020801020102040102040810200464
-:1001300008082010402010408008800102040408B4
-:1001400001028040740711241FBECFEFCDBFDFE353
-:10015000DEBF2DE2A4E0B8E201C01D92A537B207D0
-:10016000E1F718E2A0E0B8E2E7E4FBE102C00590A5
-:100170000D92A430B107D9F710E0C3EAD0E004C073
-:100180002197FE010E944A0DC23AD107C9F70E9489
-:10019000DE070C94650D0C9400000F931F93CF9312
-:1001A000DF93EC018C01060F171FC017D10759F11F
-:1001B00069918091652D9091662DDC01ED91FC9106
-:1001C0000190F081E02D6B3D69F409958091652DDA
-:1001D0009091662DDC01ED91FC910190F081E02D74
-:1001E0006DED0FC0603C69F46BED09958091652D54
-:1001F0009091662DDC01ED91FC910190F081E02D54
-:100200006CED0995D2CFDF91CF911F910F91089599
-:10021000EF92FF920F931F93CF93DF93CDB7DEB78B
-:100220002697CDBFDEBF7C018B014D835E8383E0CB
-:10023000E816F104A1F4FB0170968FEE90E0A0E0C7
-:10024000B0E09F01201B310B2417350728F089836C
-:100250009A83AB83BC8307C021918227F2CF198296
-:100260001A821B821C828091652D9091662DDC0183
-:10027000ED91FC910190F081E02D60EC0995809169
-:10028000652D9091662DDC01ED91FC910190F0813E
-:10029000E02D60E009958091652D9091662DDC013F
-:1002A000ED91FC910190F081E02D6E2D09958091EA
-:1002B000652D9091662DDC01ED91FC910280F3811A
-:1002C000E02D42E050E0BE016B5F7F4F099564E096
-:1002D00070E0CE0101960E94CD006D817E81C80143
-:1002E0000E94CD008091652D9091662DDC01ED91ED
-:1002F000FC910190F081E02D60EC09958091652DD5
-:100300009091662DDC01ED91FC910284F385E02D46
-:1003100009952696CDBFDEBFDF91CF911F910F913A
-:10032000FF90EF900895FC01A485B58511968C91FE
-:10033000119781FD0FC09C9182898F5F8F732389F4
-:10034000821749F02289DF01A20FB11D59969C93B3
-:10035000828B08958C910895893208F064C090E0F2
-:10036000FC01E55EFE4F24912F3F09F45CC0FC01C7
-:10037000E056FF4FA491AA2319F1A13081F000F1BA
-:10038000A630F0F430E1A39FD0011124A05AB54F5C
-:1003900011963C9111973F7E11963C9311C0FC0140
-:1003A000E753FF4FE4913091010AEC5F41E050E0E8
-:1003B00001C0440FEA95EAF7409543234093010AB0
-:1003C000FC01EE50FF4FA49130E2A39FD001112415
-:1003D000BC5F3C91322379F06115710519F41696D2
-:1003E0002C9308956230710519F417962C93089593
-:1003F00015962C930895FC01E753FF4F84911097B5
-:1004000031F08F3F21F05096A80FB11D02C0A0E03F
-:10041000B0E09FB7F8948C91672B11F4877F01C0EF
-:1004200088608C939FBF0895CF93DF93893298F5AE
-:1004300090E0FC01E55EFE4F24912F3F61F16330B7
-:10044000710548F5FC01EE50FF4FA49130E2A39FE7
-:10045000D0011124BC5F6130710519F411962C9301
-:100460001AC0FC01E753FF4F84918F3F29F0ED0143
-:100470006096C80FD11D02C0C0E0D0E09FB7F894CD
-:1004800012962C9388816230710511F4886001C046
-:10049000877F88839FBFDF91CF910895CF93DF93AC
-:1004A0008FB7F89420912B2C30912C2C40912D2C2F
-:1004B00050912E2CE091BA0A9091B60A90FF06C096
-:1004C0002F5F3F4F4F4F5F4FE091BA0A8FBFA09110
-:1004D000292CB0912A2CC091272CD091282C0E9435
-:1004E000C40CEC9F9001ED9F300D1124620F731F1F
-:1004F000811D911DDF91CF9108958F929F92AF92B0
-:10050000BF92CF92DF92EF92FF924B015C010E946B
-:100510004E026B017C01A8EEB3E0A50194010E949C
-:10052000C40CC60ED71EE81EF91EC616D706E8066E
-:10053000F90638F40E944E02C616D706E806F906F8
-:10054000C8F30E944E026C157D058E059F05C8F309
-:10055000FF90EF90DF90CF90BF90AF909F908F90E3
-:100560000895CF92DF92EF92FF920F931F93CF9354
-:10057000DF936C017A018B01C0E0D0E0CE15DF057E
-:1005800081F0D8016D918D01D601ED91FC91019022
-:10059000F081E02DC6010995892B11F02196EECF4F
-:1005A0007E01C701DF91CF911F910F91FF90EF90D6
-:1005B000DF90CF900895FC0154894589252F30E0C4
-:1005C000842F90E0821B930B541710F0CF96089560
-:1005D00001970895FC0192898389981761F08389B6
-:1005E000DF01A80FB11D59968C9193899F5F9F736E
-:1005F000938B90E008958FEF9FEF0895FC0192890F
-:100600008389981731F08389E80FF11D818D90E07F
-:1006100008958FEF9FEF0895FC0192892389892F18
-:1006200090E0805C9F4F821B91098F7399270895FA
-:100630008CEC9CE20E940C0321E0892B09F420E061
-:10064000822F089583E39CE20E940C0321E0892B12
-:1006500009F420E0822F0895CF93DF93EC01E88125
-:10066000F9810284F385E02D0995EC85FD8586816D
-:100670008F738683EC85FD8585818F7585838B8956
-:100680008A8B198ADF91CF9108958F929F92AF92B2
-:10069000BF92EF92FF920F931F93CF93DF93EC01E2
-:1006A0004A015B01E22E8989882339F0E881F981CA
-:1006B0000088F189E02DCE01099598898091E205A5
-:1006C000892B8093E205FFB6F894809100289091E1
-:1006D0000128A0910228B0910328BC01CD0123E09C
-:1006E000660F771F881F991F2A95D1F7A5019401DE
-:1006F0000E94A20C49015A018FEF881A980AA80A91
-:10070000B80AB694A79497948794EC85FD85868162
-:100710008D7F8683EC85FD8586818683198A8E850B
-:1007200062E070E00E9414028F8561E070E00E9438
-:10073000AC018F8561E070E00E941402809123116A
-:10074000E82F880FFF0BDF01BC5FA50194010E9419
-:10075000420D0C851D85AF01F7FF03C051954195F2
-:10076000510920E034E0241B350B032E000C440B10
-:10077000550B0E94230DF80120873187EC85FD85FC
-:10078000E782EC85FD858681806C8683EC85FD851E
-:10079000858180688583FFBEDF91CF911F910F9186
-:1007A000FF90EF90BF90AF909F908F900895CF9360
-:1007B000DF93FC0194898589A485B585981307C0CA
-:1007C00015968C9115978F7D15968C932CC08589E5
-:1007D000EF01C80FD11DC75ADF4F2881858990E0EE
-:1007E00001968F739927858B80E414968C93A4854A
-:1007F000B58512962C93A485B58514968C91149783
-:1008000085FFFBCF9489858998130DC015968C912F
-:1008100015978F7D15968C938789882321F0808D7D
-:1008200080931301178ADF91CF910895EF92FF9281
-:100830000F931F93CF93DF93FC0181E0818B948909
-:100840008589981307C0A485B58514968C91149753
-:1008500085FD2EC08091110180FF08C08091130199
-:10086000808F86898093130181E0878BF62EEF01BC
-:10087000048910E00F5F1F4F0F731127E02E8D8941
-:10088000E81209C00FB607FE29C0EC85FD858581F9
-:1008900085FDF5CF23C08C89FE01E80FF11DE75AD5
-:1008A000FF4FF0820C8BEC85FD85858180620CC04A
-:1008B00012966C93A485B58580E414968C93048479
-:1008C000F585E02D85818F7D858381E090E0DF9146
-:1008D000CF911F910F91FF90EF900895CE010E944C
-:1008E000D703CDCFCF93DF93FC0121892223F9F0E9
-:1008F000EC018091110180FF08C080911301808F6D
-:1009000086898093130181E0878BEC85FD85858145
-:1009100085FD03C0848186FD0AC00FB607FE03C0B3
-:10092000858185FDF4CFCE010E94D703EECFDF9104
-:10093000CF91089580E090E0892B21F00E9422035E
-:10094000811115C080E090E0892B41F080E090E0BB
-:10095000892B21F00E94000081110CC080E090E002
-:10096000892B69F00E941803811107C008950E9425
-:100970000000E8CF0E940000F1CF0C940000089521
-:1009800081E00895DC01ED91FC910684F785E02D6E
-:1009900023E030E009942F923F924F925F926F9242
-:1009A0007F928F929F92AF92BF92CF92DF92EF92FF
-:1009B000FF920F931F93CF93DF93CDB7DEB7CF5046
-:1009C000D140CDBFDEBFC25FDE4F88839983CE505A
-:1009D000D1402A013B0169018FB7F89480902F2CF8
-:1009E0009090302CA090312CB090322C8FBF9E0173
-:1009F0002F5F3F4FC45FDE4F28833983CC50D140F7
-:100A000034E0C55FDE4F3883CB50D140E12CF12C70
-:100A1000C55FDE4F8881CB50D140082F10E0180110
-:100A20009AE0290E311CE214F304A8F42FB7F894CD
-:100A300080912F2C9091302CA091312CB091322CA0
-:100A40002FBF88199909AA09BB0984159505A60520
-:100A5000B70550F006C02E143F0419F48981803C7C
-:100A6000A9F18FEF9FEF65C08091652D9091662D64
-:100A7000DC01ED91FC910480F581E02D0995892B35
-:100A800091F28091652D9091662DDC01ED91FC91A4
-:100A90000680F781E02D0995C45FDE4FE881F9817A
-:100AA000CC50D1408193C45FDE4FE883F983CC50B2
-:100AB000D140F3E0EF16F10429F4C55FDE4F8883DF
-:100AC000CB50D1402FEFE21AF20AA2CF8A818130B7
-:100AD00041F68B8190E0C25FDE4FA881B981CE5094
-:100AE000D1408A179B0709F0BCCFFE01E00FF11F30
-:100AF00086818111B6CFFE01E00FF11F8781811140
-:100B0000B0CFEAE0F0E0EC0FFD1FE00FF11F8081B5
-:100B1000803C09F0A6CFC114D10449F0A80144508B
-:100B20005109BE01665F7F4FC6010E94550D80E0EE
-:100B300090E0C15FDE4FCDBFDEBFDF91CF911F914F
-:100B40000F91FF90EF90DF90CF90BF90AF909F906C
-:100B50008F907F906F905F904F903F902F9008956F
-:100B6000AF92BF92CF92DF92EF92FF920F931F93BB
-:100B7000CF93DF93CDB7DEB7E497CDBFDEBF8091D3
-:100B8000652D9091662DDC01ED91FC910484F58535
-:100B9000E02D48E652ED61E070E0099561E070E01B
-:100BA0008091672D0E94140261E070E08091692DB0
-:100BB0000E94140260E070E08091672D0E94AC01F9
-:100BC00060E070E08091692D0E94AC0164E670E005
-:100BD00080E090E00E947D0261E070E08091692DEC
-:100BE0000E94AC0164E670E080E090E00E947D022B
-:100BF00060E070E08091692D0E94AC0185E0E82EF4
-:100C0000F12C8E010F5F1F4F5E01B5E3AB0EB11CDF
-:100C100084E2EEECFAE5D80101900D928A95E1F7B5
-:100C200044E250E0B80188E090E00E9408016E01C3
-:100C3000F5E2CF0ED11C20E030E044E650E060E069
-:100C400070E088E090E00E94CB04D6018D939D93E4
-:100C50006D01AA15BB0579F78DA19EA1892B39F0ED
-:100C6000E1E0EE1AF108A1F680E090E01DC088E016
-:100C7000F80111928A95E9F748E050E0B8018DE05B
-:100C800090E00E94080120E030E048EB5BE060E08B
-:100C900070E08DE090E00E94CB0431E020E0892BF1
-:100CA00009F030E0832F922FE496CDBFDEBFDF91B5
-:100CB000CF911F910F91FF90EF90DF90CF90BF9059
-:100CC000AF900895009769F0FC0101900020E9F7CA
-:100CD0003197AF01481B590BBC0183E39CE20C9494
-:100CE000B10280E090E008950C9462060E94500DDD
-:100CF0001F920F920FB60F9211242F933F934F9391
-:100D00005F936F937F938F939F93AF93BF93409124
-:100D10002F2C5091302C6091312C7091322C2091DD
-:100D2000252C3091262C8091232C9091242C480F37
-:100D3000591F611D711D8091212C9091222C820FD1
-:100D4000931F883E23E0920730F0885E93404F5F08
-:100D50005F4F6F4F7F4F8093252C9093262C4093AD
-:100D60002F2C5093302C6093312C7093322C809127
-:100D70002B2C90912C2CA0912D2CB0912E2C0196E7
-:100D8000A11DB11D80932B2C90932C2CA0932D2C66
-:100D9000B0932E2C81E08093B60ABF91AF919F91C2
-:100DA0008F917F916F915F914F913F912F910F9014
-:100DB0000FBE0F901F9018951F920F920FB60F92B3
-:100DC00011242F933F934F935F936F937F938F9350
-:100DD0009F93AF93BF93EF93FF938CEC9CE20E94A1
-:100DE000D703FF91EF91BF91AF919F918F917F9129
-:100DF0006F915F914F913F912F910F900FBE0F9088
-:100E00001F9018951F920F920FB60F9211242F93D7
-:100E10003F934F935F936F937F938F939F93AF9382
-:100E2000BF93EF93FF938CEC9CE20E949301FF91A0
-:100E3000EF91BF91AF919F918F917F916F915F9152
-:100E40004F913F912F910F900FBE0F901F901895CB
-:100E50001F920F920FB60F9211242F933F934F932F
-:100E60005F936F937F938F939F93AF93BF93EF9312
-:100E7000FF9383E39CE20E94D703FF91EF91BF9120
-:100E8000AF919F918F917F916F915F914F913F9122
-:100E90002F910F900FBE0F901F9018951F920F92D9
-:100EA0000FB60F9211242F933F934F935F936F933D
-:100EB0007F938F939F93AF93BF93EF93FF9383E3BE
-:100EC0009CE20E949301FF91EF91BF91AF919F919E
-:100ED0008F917F916F915F914F913F912F910F90E3
-:100EE0000FBE0F901F901895ECECFCE2128213825B
-:100EF00048EE53E060E070E0448355836683778377
-:100F000086EF9AE58083918320E038E02487358757
-:100F100027E1268728E1278721E0208B128A138A80
-:100F2000148A158A22E1268B178A108EA3E3BCE26D
-:100F300012961D921C92139714964D935D936D9388
-:100F40007C9317978D939C93119780E698E01C965D
-:100F50008D939C931D978AE11E968C931E978BE12F
-:100F60001F968C931F9780E450968C9350975296BF
-:100F70001C92529753961C92539754961C925497D6
-:100F800055961C92559786E256968C93569757968F
-:100F90001C92579758961C92A5E6BDE2ED93FC93E0
-:100FA00011978CE190E012968D939C9313978DE1AD
-:100FB00090E014968D939C9315970895CF93DF93AB
-:100FC000CDB7DEB7C355D109CDBFDEBF90E088ED08
-:100FD00084BF9093610080E094E2A4EFB0E080933E
-:100FE000002890930128A0930228B09303288091B1
-:100FF00002068660809302068091000681608093DD
-:101000000006809102068F7C809302068091A000EA
-:101010008F788093A0008091020680618093020601
-:101020001092E20581E08093E40583E08093010A59
-:101030008FEF90E08093260A9093270A80E890E053
-:101040008093380A9093390A80933A0A90933B0A26
-:1010500080933C0A90933D0A8BE08093000A809134
-:10106000E50581608093E5058091E50582608093C8
-:10107000E505E0E8FAE037E02FEF90E885E031831E
-:101080002487958780837096E03C4AE0F407B9F79F
-:1010900080E094E08093292C90932A2C8091292C35
-:1010A00090912A2C2FEF30E0B9010E940F0D609330
-:1010B000272C7093282C8091292C90912A2CE8EED3
-:1010C000F3E0BF010E940F0D6093232C7093242C3A
-:1010D0008091292C90912A2CBF010E940F0D8093A2
-:1010E000212C9093222C2093BC0A3093BD0A80912E
-:1010F000B50A81608093B50A84E08093B00A80913C
-:10110000B00A81608093B00A789461E070E08CE16D
-:101110000E94140261E070E08CE10E94AC0161E089
-:1011200070E08DE10E94140261E070E08DE10E94A8
-:10113000AC0161E070E083E20E94140261E070E0C3
-:1011400083E20E94AC0161E070E08EE10E94140233
-:1011500061E070E08EE10E94AC016AE070E080E046
-:1011600090E00E947D0240E052EC61E070E083E399
-:101170009CE20E94C2046AE070E080E090E00E947D
-:101180007D020E94B005892B49F48CE09BE50E940A
-:10119000620687E39BE50E946206FFCF412C84E054
-:1011A000582E612C712CCE01819660968EAF9FAF28
-:1011B000609706E11CE29CE20132190761F083E3CB
-:1011C0009CE20E94EA028F3FAFEF9A07A1F3F80179
-:1011D00081938F01F0CF8091172C9091182CA091C2
-:1011E000192CB0911A2C25968CAF9DAFAEAFBFAF26
-:1011F000259720910528211105C01092042821E08F
-:101200002093052820910428211119C023968EAD22
-:101210009FAD2397982789279827A0E0B0E0BA2FA1
-:10122000A92F982F882724962FAD2497822BBA2F89
-:10123000A92F982F882725962FAD2597822B80934D
-:10124000172C9093182CA093192CB0931A2C8091E2
-:101250001B2C90911C2CA0911D2CB0911E2C29961A
-:101260008CAF9DAFAEAFBFAF29972091052821115C
-:1012700005C01092042821E020930528209104281D
-:10128000211119C027968EAD9FAD279798278927E2
-:101290009827A0E0B0E0BA2FA92F982F882728968A
-:1012A0002FAD2897822BBA2FA92F982F8827299600
-:1012B0002FAD2997822B80931B2C90931C2CA093ED
-:1012C0001D2CB0931E2C00911F2C1091202C2E96BB
-:1012D0000EAF1FAF2E9780910E28811105C010927E
-:1012E0000D2881E080930E2880910D28811103C084
-:1012F00010270127102700931F2C1093202C76E134
-:10130000E72E78E2F72E0A5E174DE016F10661F03F
-:1013100083E39CE20E94EA028F3FFFEF9F07A9F35D
-:10132000D7018D937D01F1CF8091162C8939F1F48D
-:101330008091172C9091182CA091192CB0911A2CF7
-:1013400084349343A242B14189F480911B2C909143
-:101350001C2CA0911D2CB0911E2C88389747A646B6
-:10136000B54521F48AE39BE50E9474068091162C12
-:101370008035E9F480910E28811105C010920D2866
-:1013800081E080930E2880910D28882319F080E059
-:1013900094E002C084E090E089839A8342E050E0C8
-:1013A000BE016F5F7F4F83E39CE20E94B102809198
-:1013B000162C813041F481E49BE50E94620687E3AC
-:1013C0009BE50E9462068091162C823009F0A6C02F
-:1013D00020901F2C3090202C6101E12CF12C2DB796
-:1013E0003EB764962EAF3FAF649780906F2D90907C
-:1013F000702DA090712DB090722DD501C40152E0D6
-:10140000B695A795979587955A95D1F70496DC01DF
-:10141000AA0FBB1FAA0FBB1F6296AEAFBFAF6297EA
-:10142000EDB7FEB7EA1BFB0BEDBFFEBF0DB71EB756
-:101430000F5F1F4FADB7BEB71196CD92DD92ED9203
-:10144000FC92149780916B2D90916C2DA0916D2D35
-:10145000B0916E2DAC01BD014F5F5F4F6F4F7F4F5D
-:1014600040936B2D50936C2D60936D2D70936E2D6A
-:10147000F80184839583A683B7831086118612862C
-:10148000138614861586168617868DB79EB74196E5
-:10149000A10166E178E20E94550DC814D904EA045E
-:1014A000FB04D0F432E0F694E794D794C7943A95CD
-:1014B000D1F7F4E0CF0ED11CE11CF11CC601880F5E
-:1014C000991F880F991FA401421953096FEF70E00B
-:1014D000800F911F0E945E0D62964EAD5FAD6297C8
-:1014E000B80183E090E00E94080120E030E048EB82
-:1014F0005BE060E070E083E090E00E94CB046496E3
-:101500002EAD3FAD64972DBF3EBF892B19F081E40E
-:101510009BE502C084E49BE50E9474068091162C32
-:10152000833009F053C04091172C5091182C6091D2
-:10153000192C70911A2C80911B2C90911C2CA0912D
-:101540001D2CB0911E2C89839A83AB83BC832AE027
-:10155000B695A795979587952A95D1F78D839E8304
-:10156000AF83B88749865A866B867C864D875E87AF
-:101570006F87788B40E150E0BE016F5F7F4F82E064
-:1015800090E00E94080110926B2D10926C2D109229
-:101590006D2D10926E2D40926F2D5092702D609295
-:1015A000712D7092722D20E030E040EC54ED61E03E
-:1015B00070E082E090E00E94CB04892B19F081E476
-:1015C0009BE502C084E49BE50E9474068091162C82
-:1015D000843009F0A3C08090172C9090182CA09014
-:1015E000192CB0901A2CC0901B2CD0901C2CE09081
-:1015F0001D2CF0901E2C81E090E0A0E0B0E08983EB
-:101600009A83AB83BC8344E050E0BE016F5F7F4FA1
-:1016100084E090E00E94080120E030E048EB5BE0CD
-:1016200060E070E084E090E00E94CB048C01892BA4
-:1016300079F48091652D9091662DDC01ED91FC91FE
-:101640000088F189E02D09950E94B005892B29F4C5
-:1016500081E49BE50E94740661C080E16096EEAD76
-:10166000FFAD609711928A95E9F789A29AA2ABA281
-:10167000BCA2CDA2DEA2EFA2F8A640E150E0BE01DE
-:101680006F5D7F4F83E190E00E9408019E012F5F14
-:101690003F4F48EB5BE060E070E083E190E00E9448
-:1016A000CB04892B59F52C961FAE2C978E010F5F1A
-:1016B0001F4F7E01F1E3EF0EF11CD8018C912A96A9
-:1016C0008FAF2A9711968C912B968FAF2B9740E175
-:1016D00050E060E070E0CE01875B9F4F0E94910B6D
-:1016E000F70161937F010E5F1F4F60962EAD3FADF6
-:1016F00060972017310709F701E010E0012B09F48A
-:10170000A7CF84E49BE50E94740640E150E0BE014F
-:101710006F5C7F4F83E39CE20E94B1020E949A04B7
-:1017200048CDA0E0B0E0E7E9FBE00C94D00C5C0110
-:101730006B017A016115710519F0FB0180839183BA
-:10174000E114F10429F0C7010297839708F0C9C09A
-:10175000E5012196F5011081812F90E00E94860C11
-:10176000892B11F05E01F4CF1D3229F42196F50189
-:10177000118101E007C01B3221F4E5012296F50139
-:10178000118100E0E114F104B1F0F0E1EF16F10491
-:1017900029F4B0C010E3E114F10401F12AE0E216EB
-:1017A000F104B1F180E1E816F10471F0E8E0EE1621
-:1017B000F104F1F413C0103341F588818F7D883531
-:1017C00049F7198122960260F0E1EF2EF12C88246E
-:1017D0008A94982CA82CAFE0BA2E20C078E0E72E8F
-:1017E000F12C88248A94982CA82CEFE1BE2E16C0E8
-:1017F0006FEF7FEFCB0197010F2C000C440B550BC3
-:101800000E94A20C49015A0109C08AE0E82EF12C7D
-:1018100069E9862E982CA82C69E1B62E40E060E09C
-:1018200070E0CB0127010F2C000C66087708FE0141
-:1018300050ED352E310E29E0231570F42FEB210FDA
-:101840002A3118F439EC332E06C02FE9210F2A3142
-:1018500030F529EA322E310E232D30E02E153F05CA
-:10186000F4F44F3FC9F086169706A806B90688F02B
-:10187000A30192010E94920C232D30E040E050E041
-:10188000620F731F841F951F6217730784079507E4
-:1018900010F44FEF01C041E021961081C8CFC11470
-:1018A000D10451F0442311F0219703C001FF04C07B
-:1018B0002297F601C083D18300FF07C090958095E1
-:1018C000709561957F4F8F4F9F4F4F3F79F482E224
-:1018D00090E08093732D9093742D3FEF2FEF9FEF47
-:1018E0000DC040E030E020E090E008C0462F372FE8
-:1018F000282F04C0103309F067CF5FCF642F732FF8
-:10190000822FCDB7DEB7E1E10C94E90C91110C9474
-:101910008F0C803219F089508550C8F708959927A7
-:1019200088270895DB018F939F930E94C40CBF9179
-:10193000AF91A29F800D911DA39F900DB29F900D1E
-:1019400011240895A1E21A2EAA1BBB1BFD010DC094
-:10195000AA1FBB1FEE1FFF1FA217B307E407F5075F
-:1019600020F0A21BB30BE40BF50B661F771F881F3B
-:10197000991F1A9469F760957095809590959B01D1
-:10198000AC01BD01CF0108950E94000DA59F900DEF
-:10199000B49F900DA49F800D911D112408952F9246
-:1019A0003F924F925F926F927F928F929F92AF92EF
-:1019B000BF92CF92DF92EF92FF920F931F93CF933C
-:1019C000DF93CDB7DEB7CA1BDB0BCDBFDEBF0994FB
-:1019D0002A88398848885F846E847D848C849B84BF
-:1019E000AA84B984C884DF80EE80FD800C811B81CD
-:1019F000AA81B981CE0FD11DCDBFDEBFED01089503
-:101A0000A29FB001B39FC001A39F700D811D11243F
-:101A1000911DB29F700D811D1124911D0895AA1B67
-:101A2000BB1B51E107C0AA1FBB1FA617B70710F0C9
-:101A3000A61BB70B881F991F5A95A9F780959095FB
-:101A4000BC01CD010895052E97FB1EF400940E9461
-:101A50003A0D57FD07D00E94A20C07FC03D04EF4AC
-:101A60000C943A0D50954095309521953F4F4F4F2E
-:101A70005F4F089590958095709561957F4F8F4F3A
-:101A80009F4F0895B7FF0C94C40C0E94C40C821B96
-:101A9000930B0895EE0FFF1F0590F491E02D09942C
-:101AA00081E090E0F8940C94650DFB01DC0102C02C
-:101AB00001900D9241505040D8F70895DC0101C0CB
-:0E1AC0006D9341505040E0F70895F894FFCF29
-:101ACE0007071220555555555555555555555555CC
-:101ADE0055555555555555555555555555555555A8
-:101AEE0055555555000000001604B1020C03EA02CC
-:101AFE00FE027204C20445032C03C004DB02556EC1
-:101B0E0061626C6520746F20636F6D6D756E6963B5
-:101B1E0061746520776974682045535033322062B2
-:101B2E006F6F7420524F4D21000D0A007631303008
-:091B3E003030004552004F4B000D
-:041B47000024F40082
-:00000001FF
diff --git a/firmwares/WINC1500/19.4.4/m2m_aio_3a0.bin b/firmwares/WINC1500/19.4.4/WINC1500-arduino.samd.mkr1000.bin
similarity index 100%
rename from firmwares/WINC1500/19.4.4/m2m_aio_3a0.bin
rename to firmwares/WINC1500/19.4.4/WINC1500-arduino.samd.mkr1000.bin
diff --git a/firmwares/WINC1500/19.5.2/m2m_aio_3a0.bin b/firmwares/WINC1500/19.5.2/WINC1500-arduino.samd.mkr1000.bin
similarity index 100%
rename from firmwares/WINC1500/19.5.2/m2m_aio_3a0.bin
rename to firmwares/WINC1500/19.5.2/WINC1500-arduino.samd.mkr1000.bin
diff --git a/firmwares/WINC1500/19.5.4/m2m_aio_3a0.bin b/firmwares/WINC1500/19.5.4/WINC1500-arduino.samd.mkr1000.bin
similarity index 100%
rename from firmwares/WINC1500/19.5.4/m2m_aio_3a0.bin
rename to firmwares/WINC1500/19.5.4/WINC1500-arduino.samd.mkr1000.bin
diff --git a/firmwares/WINC1500/19.6.1/m2m_aio_3a0.bin b/firmwares/WINC1500/19.6.1/WINC1500-arduino.samd.mkr1000.bin
similarity index 100%
rename from firmwares/WINC1500/19.6.1/m2m_aio_3a0.bin
rename to firmwares/WINC1500/19.6.1/WINC1500-arduino.samd.mkr1000.bin
diff --git a/firmwares/NINA/FirmwareUpdater.nanorp2040connect.ino.elf b/firmwares/loader/arduino.mbed_nano.nanorp2040connect/loader.elf
similarity index 100%
rename from firmwares/NINA/FirmwareUpdater.nanorp2040connect.ino.elf
rename to firmwares/loader/arduino.mbed_nano.nanorp2040connect/loader.elf
diff --git a/firmwares/NINA/FirmwareUpdater.unowifirev2.with_bootloader.ino.hex b/firmwares/loader/arduino.megaavr.uno2018/loader.hex
similarity index 100%
rename from firmwares/NINA/FirmwareUpdater.unowifirev2.with_bootloader.ino.hex
rename to firmwares/loader/arduino.megaavr.uno2018/loader.hex
diff --git a/firmwares/WINC1500/FirmwareUpdater.mkr1000.ino.bin b/firmwares/loader/arduino.samd.mkr1000/loader.bin
old mode 100755
new mode 100644
similarity index 100%
rename from firmwares/WINC1500/FirmwareUpdater.mkr1000.ino.bin
rename to firmwares/loader/arduino.samd.mkr1000/loader.bin
diff --git a/firmwares/loader/arduino.samd.mkrvidor4000/loader.bin b/firmwares/loader/arduino.samd.mkrvidor4000/loader.bin
new file mode 100755
index 00000000..1d7e75e5
Binary files /dev/null and b/firmwares/loader/arduino.samd.mkrvidor4000/loader.bin differ
diff --git a/firmwares/NINA/FirmwareUpdater.mkrwifi1010.ino.bin b/firmwares/loader/arduino.samd.mkrwifi1010/loader.bin
similarity index 100%
rename from firmwares/NINA/FirmwareUpdater.mkrwifi1010.ino.bin
rename to firmwares/loader/arduino.samd.mkrwifi1010/loader.bin
diff --git a/firmwares/NINA/FirmwareUpdater.nano_33_iot.ino.bin b/firmwares/loader/arduino.samd.nano_33_iot/loader.bin
similarity index 100%
rename from firmwares/NINA/FirmwareUpdater.nano_33_iot.ino.bin
rename to firmwares/loader/arduino.samd.nano_33_iot/loader.bin
diff --git a/generator/boards.json b/generator/boards.json
new file mode 100644
index 00000000..a756eb2e
--- /dev/null
+++ b/generator/boards.json
@@ -0,0 +1,97 @@
+{
+  "arduino:samd:mkr1000":{
+     "moduleName":"WINC1500",
+     "versions":[
+        "19.4.4",
+        "19.5.2",
+        "19.5.4",
+        "19.6.1"
+     ]
+  },
+  "arduino:samd:mkrwifi1010":{
+     "moduleName":"NINA",
+     "versions":[
+        "1.0.0",
+        "1.1.0",
+        "1.2.1",
+        "1.2.2",
+        "1.2.3",
+        "1.2.4",
+        "1.3.0",
+        "1.4.0",
+        "1.4.1",
+        "1.4.2",
+        "1.4.3",
+        "1.4.4",
+        "1.4.5",
+        "1.4.6",
+        "1.4.7"
+     ]
+  },
+  "arduino:samd:nano_33_iot":{
+     "moduleName":"NINA",
+     "versions":[
+        "1.0.0",
+        "1.1.0",
+        "1.2.1",
+        "1.2.2",
+        "1.2.3",
+        "1.2.4",
+        "1.3.0",
+        "1.4.0",
+        "1.4.1",
+        "1.4.2",
+        "1.4.3",
+        "1.4.4",
+        "1.4.5",
+        "1.4.6",
+        "1.4.7"
+     ]
+  },
+  "arduino:samd:mkrvidor4000":{
+     "moduleName":"NINA",
+     "versions":[
+        "1.0.0",
+        "1.1.0",
+        "1.2.1",
+        "1.2.2",
+        "1.2.3",
+        "1.2.4",
+        "1.3.0",
+        "1.4.0",
+        "1.4.1",
+        "1.4.2",
+        "1.4.3",
+        "1.4.4",
+        "1.4.5",
+        "1.4.6",
+        "1.4.7"
+     ]
+  },
+  "arduino:megaavr:uno2018":{
+     "moduleName":"NINA",
+     "versions":[
+        "1.2.1",
+        "1.2.2",
+        "1.2.3",
+        "1.2.4",
+        "1.3.0",
+        "1.4.0",
+        "1.4.1",
+        "1.4.2",
+        "1.4.3",
+        "1.4.4",
+        "1.4.5",
+        "1.4.6",
+        "1.4.7"
+     ]
+  },
+  "arduino:mbed_nano:nanorp2040connect":{
+     "moduleName":"NINA",
+     "versions":[
+        "1.4.5",
+        "1.4.6",
+        "1.4.7"
+     ]
+  }
+}
\ No newline at end of file
diff --git a/generator/generator.py b/generator/generator.py
index 6d54e6ab..2799edc2 100755
--- a/generator/generator.py
+++ b/generator/generator.py
@@ -9,14 +9,15 @@
 from pathlib import Path
 
 DOWNLOAD_URL = "https://downloads.arduino.cc/arduino-fwuploader"
-FQBNS = {
-    "mkr1000": "arduino:samd:mkr1000",
-    "mkrwifi1010": "arduino:samd:mkrwifi1010",
-    "nano_33_iot": "arduino:samd:nano_33_iot",
-    "mkrvidor4000": "arduino:samd:mkrvidor4000",
-    "uno2018": "arduino:megaavr:uno2018",
-    "nanorp2040connect": "arduino:mbed_nano:nanorp2040connect",
-}
+
+
+# handle firmware name
+def get_firmware_file(module, simple_fqbn, version):
+    firmware_full_path = Path(__file__).parent.parent / "firmwares" / module / version
+    fqbn_specific_file_name = f"{module}-{simple_fqbn}.bin"
+    if (firmware_file := firmware_full_path / fqbn_specific_file_name).exists():
+        return firmware_file
+    return firmware_full_path / f"{module}.bin"
 
 
 # Runs arduino-cli, doesn't handle errors at all because am lazy
@@ -231,20 +232,28 @@ def generate_boards_json(input_data, arduino_cli_path):
             print(f"Board {fqbn} is not installed, install its core {core_id}")
             sys.exit(1)
 
-    for pseudo_fqbn, data in input_data.items():
-        fqbn = FQBNS[pseudo_fqbn]
+    for fqbn, data in input_data.items():
         simple_fqbn = fqbn.replace(":", ".")
 
-        for _, v in data.items():
-            item = v[0]
-            binary = Path(__file__).parent / ".." / item["Path"]
+        loader_dir = Path(
+            "..",
+            "firmwares",
+            "loader",
+            simple_fqbn,
+        )
+        loader_path = Path(__file__).parent / loader_dir
+        loader_files = list(x for x in loader_path.iterdir() if x.is_file())
+        if len(loader_files) != 1:
+            print(f"Invalid loader files found in {loader_path}")
+            sys.exit(1)
+
+        boards[fqbn]["loader_sketch"] = create_loader_data(simple_fqbn, loader_files[0])
 
-            if item["IsLoader"]:
-                boards[fqbn]["loader_sketch"] = create_loader_data(simple_fqbn, binary)
-            else:
-                module, version = item["version"].split("/")
-                boards[fqbn]["firmware"].append(create_firmware_data(binary, module, version))
-                boards[fqbn]["module"] = module
+        for firmware_version in data["versions"]:
+            module = data["moduleName"]
+            firmware_file = get_firmware_file(module, simple_fqbn, firmware_version)
+            boards[fqbn]["firmware"].append(create_firmware_data(firmware_file, module, firmware_version))
+            boards[fqbn]["module"] = module
 
         res = arduino_cli(
             cli_path=arduino_cli_path,
@@ -278,10 +287,10 @@ def generate_boards_json(input_data, arduino_cli_path):
 
     # raw_boards.json has been generated using --get_available_for FirmwareUploader (version 0.1.8) flag.
     # It has been edited a bit to better handle parsing.
-    with open("raw_boards.json", "r") as f:
-        raw_boards = json.load(f)
+    with open("boards.json", "r") as f:
+        boards = json.load(f)
 
-    boards_json = generate_boards_json(raw_boards, args.arduino_cli)
+    boards_json = generate_boards_json(boards, args.arduino_cli)
 
     Path("boards").mkdir()
 
diff --git a/generator/raw_boards.json b/generator/raw_boards.json
deleted file mode 100644
index f125c73d..00000000
--- a/generator/raw_boards.json
+++ /dev/null
@@ -1,574 +0,0 @@
-{
-  "mkr1000": {
-    "firmwares/WINC1500": [
-      {
-        "version": "WINC1500",
-        "Path": "firmwares/WINC1500/FirmwareUpdater.mkr1000.ino.bin",
-        "Name": "firmwares WINC1500",
-        "IsLoader": true
-      }
-    ],
-    "firmwares/WINC1500/19.4.4": [
-      {
-        "version": "WINC1500/19.4.4",
-        "Path": "firmwares/WINC1500/19.4.4/m2m_aio_3a0.bin",
-        "Name": "WINC1500 19.4.4",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/WINC1500/19.5.2": [
-      {
-        "version": "WINC1500/19.5.2",
-        "Path": "firmwares/WINC1500/19.5.2/m2m_aio_3a0.bin",
-        "Name": "WINC1500 19.5.2",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/WINC1500/19.5.4": [
-      {
-        "version": "WINC1500/19.5.4",
-        "Path": "firmwares/WINC1500/19.5.4/m2m_aio_3a0.bin",
-        "Name": "WINC1500 19.5.4",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/WINC1500/19.6.1": [
-      {
-        "version": "WINC1500/19.6.1",
-        "Path": "firmwares/WINC1500/19.6.1/m2m_aio_3a0.bin",
-        "Name": "WINC1500 19.6.1",
-        "IsLoader": false
-      }
-    ]
-  },
-  "mkrwifi1010": {
-    "firmwares/NINA": [
-      {
-        "version": "NINA",
-        "Path": "firmwares/NINA/FirmwareUpdater.mkrwifi1010.ino.bin",
-        "Name": "firmwares NINA",
-        "IsLoader": true
-      }
-    ],
-    "firmwares/NINA/1.0.0": [
-      {
-        "version": "NINA/1.0.0",
-        "Path": "firmwares/NINA/1.0.0/NINA_W102.bin",
-        "Name": "NINA 1.0.0",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.1.0": [
-      {
-        "version": "NINA/1.1.0",
-        "Path": "firmwares/NINA/1.1.0/NINA_W102.bin",
-        "Name": "NINA 1.1.0",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.2.1": [
-      {
-        "version": "NINA/1.2.1",
-        "Path": "firmwares/NINA/1.2.1/NINA_W102.bin",
-        "Name": "NINA 1.2.1",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.2.2": [
-      {
-        "version": "NINA/1.2.2",
-        "Path": "firmwares/NINA/1.2.2/NINA_W102.bin",
-        "Name": "NINA 1.2.2",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.2.3": [
-      {
-        "version": "NINA/1.2.3",
-        "Path": "firmwares/NINA/1.2.3/NINA_W102.bin",
-        "Name": "NINA 1.2.3",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.2.4": [
-      {
-        "version": "NINA/1.2.4",
-        "Path": "firmwares/NINA/1.2.4/NINA_W102.bin",
-        "Name": "NINA 1.2.4",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.3.0": [
-      {
-        "version": "NINA/1.3.0",
-        "Path": "firmwares/NINA/1.3.0/NINA_W102.bin",
-        "Name": "NINA 1.3.0",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.0": [
-      {
-        "version": "NINA/1.4.0",
-        "Path": "firmwares/NINA/1.4.0/NINA_W102.bin",
-        "Name": "NINA 1.4.0",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.1": [
-      {
-        "version": "NINA/1.4.1",
-        "Path": "firmwares/NINA/1.4.1/NINA_W102.bin",
-        "Name": "NINA 1.4.1",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.2": [
-      {
-        "version": "NINA/1.4.2",
-        "Path": "firmwares/NINA/1.4.2/NINA_W102.bin",
-        "Name": "NINA 1.4.2",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.3": [
-      {
-        "version": "NINA/1.4.3",
-        "Path": "firmwares/NINA/1.4.3/NINA_W102.bin",
-        "Name": "NINA 1.4.3",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.4": [
-      {
-        "version": "NINA/1.4.4",
-        "Path": "firmwares/NINA/1.4.4/NINA_W102.bin",
-        "Name": "NINA 1.4.4",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.5": [
-      {
-        "version": "NINA/1.4.5",
-        "Path": "firmwares/NINA/1.4.5/NINA_W102.bin",
-        "Name": "NINA 1.4.5",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.6": [
-      {
-        "version": "NINA/1.4.6",
-        "Path": "firmwares/NINA/1.4.6/NINA_W102.bin",
-        "Name": "NINA 1.4.6",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.7": [
-      {
-        "version": "NINA/1.4.7",
-        "Path": "firmwares/NINA/1.4.7/NINA_W102.bin",
-        "Name": "NINA 1.4.7",
-        "IsLoader": false
-      }
-    ]
-  },
-  "nano_33_iot": {
-    "firmwares/NINA": [
-      {
-        "version": "NINA",
-        "Path": "firmwares/NINA/FirmwareUpdater.nano_33_iot.ino.bin",
-        "Name": "firmwares NINA",
-        "IsLoader": true
-      }
-    ],
-    "firmwares/NINA/1.0.0": [
-      {
-        "version": "NINA/1.0.0",
-        "Path": "firmwares/NINA/1.0.0/NINA_W102.bin",
-        "Name": "NINA 1.0.0",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.1.0": [
-      {
-        "version": "NINA/1.1.0",
-        "Path": "firmwares/NINA/1.1.0/NINA_W102.bin",
-        "Name": "NINA 1.1.0",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.2.1": [
-      {
-        "version": "NINA/1.2.1",
-        "Path": "firmwares/NINA/1.2.1/NINA_W102.bin",
-        "Name": "NINA 1.2.1",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.2.2": [
-      {
-        "version": "NINA/1.2.2",
-        "Path": "firmwares/NINA/1.2.2/NINA_W102.bin",
-        "Name": "NINA 1.2.2",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.2.3": [
-      {
-        "version": "NINA/1.2.3",
-        "Path": "firmwares/NINA/1.2.3/NINA_W102.bin",
-        "Name": "NINA 1.2.3",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.2.4": [
-      {
-        "version": "NINA/1.2.4",
-        "Path": "firmwares/NINA/1.2.4/NINA_W102.bin",
-        "Name": "NINA 1.2.4",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.3.0": [
-      {
-        "version": "NINA/1.3.0",
-        "Path": "firmwares/NINA/1.3.0/NINA_W102.bin",
-        "Name": "NINA 1.3.0",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.0": [
-      {
-        "version": "NINA/1.4.0",
-        "Path": "firmwares/NINA/1.4.0/NINA_W102.bin",
-        "Name": "NINA 1.4.0",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.1": [
-      {
-        "version": "NINA/1.4.1",
-        "Path": "firmwares/NINA/1.4.1/NINA_W102.bin",
-        "Name": "NINA 1.4.1",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.2": [
-      {
-        "version": "NINA/1.4.2",
-        "Path": "firmwares/NINA/1.4.2/NINA_W102.bin",
-        "Name": "NINA 1.4.2",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.3": [
-      {
-        "version": "NINA/1.4.3",
-        "Path": "firmwares/NINA/1.4.3/NINA_W102.bin",
-        "Name": "NINA 1.4.3",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.4": [
-      {
-        "version": "NINA/1.4.4",
-        "Path": "firmwares/NINA/1.4.4/NINA_W102.bin",
-        "Name": "NINA 1.4.4",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.5": [
-      {
-        "version": "NINA/1.4.5",
-        "Path": "firmwares/NINA/1.4.5/NINA_W102.bin",
-        "Name": "NINA 1.4.5",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.6": [
-      {
-        "version": "NINA/1.4.6",
-        "Path": "firmwares/NINA/1.4.6/NINA_W102.bin",
-        "Name": "NINA 1.4.6",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.7": [
-      {
-        "version": "NINA/1.4.7",
-        "Path": "firmwares/NINA/1.4.7/NINA_W102.bin",
-        "Name": "NINA 1.4.7",
-        "IsLoader": false
-      }
-    ]
-  },
-  "mkrvidor4000": {
-    "firmwares/NINA/1.0.0": [
-      {
-        "version": "NINA/1.0.0",
-        "Path": "firmwares/NINA/1.0.0/NINA_W102.bin",
-        "Name": "NINA 1.0.0",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.1.0": [
-      {
-        "version": "NINA/1.1.0",
-        "Path": "firmwares/NINA/1.1.0/NINA_W102.bin",
-        "Name": "NINA 1.1.0",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.2.1": [
-      {
-        "version": "NINA/1.2.1",
-        "Path": "firmwares/NINA/1.2.1/NINA_W102.bin",
-        "Name": "NINA 1.2.1",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.2.2": [
-      {
-        "version": "NINA/1.2.2",
-        "Path": "firmwares/NINA/1.2.2/NINA_W102.bin",
-        "Name": "NINA 1.2.2",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.2.3": [
-      {
-        "version": "NINA/1.2.3",
-        "Path": "firmwares/NINA/1.2.3/NINA_W102.bin",
-        "Name": "NINA 1.2.3",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.2.4": [
-      {
-        "version": "NINA/1.2.4",
-        "Path": "firmwares/NINA/1.2.4/NINA_W102.bin",
-        "Name": "NINA 1.2.4",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.3.0": [
-      {
-        "version": "NINA/1.3.0",
-        "Path": "firmwares/NINA/1.3.0/NINA_W102.bin",
-        "Name": "NINA 1.3.0",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.0": [
-      {
-        "version": "NINA/1.4.0",
-        "Path": "firmwares/NINA/1.4.0/NINA_W102.bin",
-        "Name": "NINA 1.4.0",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.1": [
-      {
-        "version": "NINA/1.4.1",
-        "Path": "firmwares/NINA/1.4.1/NINA_W102.bin",
-        "Name": "NINA 1.4.1",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.2": [
-      {
-        "version": "NINA/1.4.2",
-        "Path": "firmwares/NINA/1.4.2/NINA_W102.bin",
-        "Name": "NINA 1.4.2",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.3": [
-      {
-        "version": "NINA/1.4.3",
-        "Path": "firmwares/NINA/1.4.3/NINA_W102.bin",
-        "Name": "NINA 1.4.3",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.4": [
-      {
-        "version": "NINA/1.4.4",
-        "Path": "firmwares/NINA/1.4.4/NINA_W102.bin",
-        "Name": "NINA 1.4.4",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.5": [
-      {
-        "version": "NINA/1.4.5",
-        "Path": "firmwares/NINA/1.4.5/NINA_W102.bin",
-        "Name": "NINA 1.4.5",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.6": [
-      {
-        "version": "NINA/1.4.6",
-        "Path": "firmwares/NINA/1.4.6/NINA_W102.bin",
-        "Name": "NINA 1.4.6",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.7": [
-      {
-        "version": "NINA/1.4.7",
-        "Path": "firmwares/NINA/1.4.7/NINA_W102.bin",
-        "Name": "NINA 1.4.7",
-        "IsLoader": false
-      }
-    ]
-  },
-  "uno2018": {
-    "firmwares/NINA": [
-      {
-        "version": "NINA",
-        "Path": "firmwares/NINA/FirmwareUpdater.unowifirev2.with_bootloader.ino.hex",
-        "Name": "firmwares NINA",
-        "IsLoader": true
-      }
-    ],
-    "firmwares/NINA/1.2.1": [
-      {
-        "version": "NINA/1.2.1",
-        "Path": "firmwares/NINA/1.2.1/NINA_W102-Uno_WiFi_Rev2.bin",
-        "Name": "NINA 1.2.1",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.2.2": [
-      {
-        "version": "NINA/1.2.2",
-        "Path": "firmwares/NINA/1.2.2/NINA_W102-Uno_WiFi_Rev2.bin",
-        "Name": "NINA 1.2.2",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.2.3": [
-      {
-        "version": "NINA/1.2.3",
-        "Path": "firmwares/NINA/1.2.3/NINA_W102-Uno_WiFi_Rev2.bin",
-        "Name": "NINA 1.2.3",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.2.4": [
-      {
-        "version": "NINA/1.2.4",
-        "Path": "firmwares/NINA/1.2.4/NINA_W102-Uno_WiFi_Rev2.bin",
-        "Name": "NINA 1.2.4",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.3.0": [
-      {
-        "version": "NINA/1.3.0",
-        "Path": "firmwares/NINA/1.3.0/NINA_W102-Uno_WiFi_Rev2.bin",
-        "Name": "NINA 1.3.0",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.0": [
-      {
-        "version": "NINA/1.4.0",
-        "Path": "firmwares/NINA/1.4.0/NINA_W102-Uno_WiFi_Rev2.bin",
-        "Name": "NINA 1.4.0",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.1": [
-      {
-        "version": "NINA/1.4.1",
-        "Path": "firmwares/NINA/1.4.1/NINA_W102-Uno_WiFi_Rev2.bin",
-        "Name": "NINA 1.4.1",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.2": [
-      {
-        "version": "NINA/1.4.2",
-        "Path": "firmwares/NINA/1.4.2/NINA_W102-Uno_WiFi_Rev2.bin",
-        "Name": "NINA 1.4.2",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.3": [
-      {
-        "version": "NINA/1.4.3",
-        "Path": "firmwares/NINA/1.4.3/NINA_W102-Uno_WiFi_Rev2.bin",
-        "Name": "NINA 1.4.3",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.4": [
-      {
-        "version": "NINA/1.4.4",
-        "Path": "firmwares/NINA/1.4.4/NINA_W102-Uno_WiFi_Rev2.bin",
-        "Name": "NINA 1.4.4",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.5": [
-      {
-        "version": "NINA/1.4.5",
-        "Path": "firmwares/NINA/1.4.5/NINA_W102-Uno_WiFi_Rev2.bin",
-        "Name": "NINA 1.4.5",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.6": [
-      {
-        "version": "NINA/1.4.6",
-        "Path": "firmwares/NINA/1.4.6/NINA_W102-Uno_WiFi_Rev2.bin",
-        "Name": "NINA 1.4.6",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.7": [
-      {
-        "version": "NINA/1.4.7",
-        "Path": "firmwares/NINA/1.4.7/NINA_W102-Uno_WiFi_Rev2.bin",
-        "Name": "NINA 1.4.7",
-        "IsLoader": false
-      }
-    ]
-  },
-  "nanorp2040connect": {
-    "firmwares/NINA": [
-      {
-        "version": "NINA",
-        "Path": "firmwares/NINA/FirmwareUpdater.nanorp2040connect.ino.elf",
-        "Name": "firmwares NINA",
-        "IsLoader": true
-      }
-    ],
-    "firmwares/NINA/1.4.5": [
-      {
-        "version": "NINA/1.4.5",
-        "Path": "firmwares/NINA/1.4.5/NINA_W102-Nano_RP2040_Connect.bin",
-        "Name": "NINA 1.4.5",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.6": [
-      {
-        "version": "NINA/1.4.6",
-        "Path": "firmwares/NINA/1.4.6/NINA_W102-Nano_RP2040_Connect.bin",
-        "Name": "NINA 1.4.6",
-        "IsLoader": false
-      }
-    ],
-    "firmwares/NINA/1.4.7": [
-      {
-        "version": "NINA/1.4.7",
-        "Path": "firmwares/NINA/1.4.7/NINA_W102-Nano_RP2040_Connect.bin",
-        "Name": "NINA 1.4.7",
-        "IsLoader": false
-      }
-    ]
-  }
-}