diff --git a/tools/CCLoader/fw_HM10_cc2541/CC2541hm10v709.zip b/tools/CCLoader/fw_HM10_cc2541/CC2541hm10v709.zip
deleted file mode 100644
index 53372084a..000000000
Binary files a/tools/CCLoader/fw_HM10_cc2541/CC2541hm10v709.zip and /dev/null differ
diff --git a/tools/CCLoader/fw_Zigbee_cc2530/CC2530_CC2591_DEFAULT_20190608.zip b/tools/CCLoader/fw_Zigbee_cc2530/CC2530_CC2591_DEFAULT_20190608.zip
deleted file mode 100644
index 68ebc7434..000000000
Binary files a/tools/CCLoader/fw_Zigbee_cc2530/CC2530_CC2591_DEFAULT_20190608.zip and /dev/null differ
diff --git a/tools/CCLoader/fw_Zigbee_cc2530/CC2530_CC2592_DEFAULT_20190608.zip b/tools/CCLoader/fw_Zigbee_cc2530/CC2530_CC2592_DEFAULT_20190608.zip
deleted file mode 100644
index 5c1b0ad32..000000000
Binary files a/tools/CCLoader/fw_Zigbee_cc2530/CC2530_CC2592_DEFAULT_20190608.zip and /dev/null differ
diff --git a/tools/CCLoader/fw_Zigbee_cc2530/CC2530_DEFAULT_20190608.zip b/tools/CCLoader/fw_Zigbee_cc2530/CC2530_DEFAULT_20190608.zip
deleted file mode 100644
index 25942e7c2..000000000
Binary files a/tools/CCLoader/fw_Zigbee_cc2530/CC2530_DEFAULT_20190608.zip and /dev/null differ
diff --git a/tools/fw_HM10_cc2541/CC2541hm10v709.bin b/tools/fw_HM10_cc2541/CC2541hm10v709.bin
new file mode 100644
index 000000000..e7573b5df
Binary files /dev/null and b/tools/fw_HM10_cc2541/CC2541hm10v709.bin differ
diff --git a/tools/fw_Theov2_attiny85/TheoV2Sensor1/TheoV2Sensor1.ino b/tools/fw_RfSensor_attiny85/TheoV2Sensor1/TheoV2Sensor1.ino
similarity index 100%
rename from tools/fw_Theov2_attiny85/TheoV2Sensor1/TheoV2Sensor1.ino
rename to tools/fw_RfSensor_attiny85/TheoV2Sensor1/TheoV2Sensor1.ino
diff --git a/tools/fw_Theov2_attiny85/TheoV2Sensor2/TheoV2Sensor2.ino b/tools/fw_RfSensor_attiny85/TheoV2Sensor2/TheoV2Sensor2.ino
similarity index 100%
rename from tools/fw_Theov2_attiny85/TheoV2Sensor2/TheoV2Sensor2.ino
rename to tools/fw_RfSensor_attiny85/TheoV2Sensor2/TheoV2Sensor2.ino
diff --git a/tools/fw_Theov2_attiny85/info.txt b/tools/fw_RfSensor_attiny85/info.txt
similarity index 100%
rename from tools/fw_Theov2_attiny85/info.txt
rename to tools/fw_RfSensor_attiny85/info.txt
diff --git a/tools/fw_Zigbee_cc2530/CC2530_CC2591_ZNP-Prod_20190608.bin b/tools/fw_Zigbee_cc2530/CC2530_CC2591_ZNP-Prod_20190608.bin
new file mode 100644
index 000000000..331990212
Binary files /dev/null and b/tools/fw_Zigbee_cc2530/CC2530_CC2591_ZNP-Prod_20190608.bin differ
diff --git a/tools/fw_Zigbee_cc2530/CC2530_CC2592_ZNP-Prod_20190608.bin b/tools/fw_Zigbee_cc2530/CC2530_CC2592_ZNP-Prod_20190608.bin
new file mode 100644
index 000000000..b9fc60976
Binary files /dev/null and b/tools/fw_Zigbee_cc2530/CC2530_CC2592_ZNP-Prod_20190608.bin differ
diff --git a/tools/fw_Zigbee_cc2530/CC2530_ZNP-Prod_20190608.bin b/tools/fw_Zigbee_cc2530/CC2530_ZNP-Prod_20190608.bin
new file mode 100644
index 000000000..a969dc628
Binary files /dev/null and b/tools/fw_Zigbee_cc2530/CC2530_ZNP-Prod_20190608.bin differ
diff --git a/tools/fw_server/fw-server.py b/tools/ota_server/fw-server.py
similarity index 100%
rename from tools/fw_server/fw-server.py
rename to tools/ota_server/fw-server.py
diff --git a/tools/fw_server/fw/README b/tools/ota_server/fw/README
similarity index 100%
rename from tools/fw_server/fw/README
rename to tools/ota_server/fw/README