diff --git a/SOURCE/Agent,Kiosk/NILM_Firmware_arduino/MEGA2560_MQTT_NILM/MEGA2560_MQTT_NILM.ino b/SOURCE/NILM_Firmware/MEGA2560_MQTT_NILM/MEGA2560_MQTT_NILM.ino
similarity index 100%
rename from SOURCE/Agent,Kiosk/NILM_Firmware_arduino/MEGA2560_MQTT_NILM/MEGA2560_MQTT_NILM.ino
rename to SOURCE/NILM_Firmware/MEGA2560_MQTT_NILM/MEGA2560_MQTT_NILM.ino
diff --git a/SOURCE/Agent,Kiosk/NILM_Firmware_arduino/MEGA2560_MQTT_NILM/build/arduino.avr.mega/MEGA2560_MQTT_NILM.ino.eep b/SOURCE/NILM_Firmware/MEGA2560_MQTT_NILM/build/arduino.avr.mega/MEGA2560_MQTT_NILM.ino.eep
similarity index 100%
rename from SOURCE/Agent,Kiosk/NILM_Firmware_arduino/MEGA2560_MQTT_NILM/build/arduino.avr.mega/MEGA2560_MQTT_NILM.ino.eep
rename to SOURCE/NILM_Firmware/MEGA2560_MQTT_NILM/build/arduino.avr.mega/MEGA2560_MQTT_NILM.ino.eep
diff --git a/SOURCE/Agent,Kiosk/NILM_Firmware_arduino/MEGA2560_MQTT_NILM/build/arduino.avr.mega/MEGA2560_MQTT_NILM.ino.elf b/SOURCE/NILM_Firmware/MEGA2560_MQTT_NILM/build/arduino.avr.mega/MEGA2560_MQTT_NILM.ino.elf
similarity index 100%
rename from SOURCE/Agent,Kiosk/NILM_Firmware_arduino/MEGA2560_MQTT_NILM/build/arduino.avr.mega/MEGA2560_MQTT_NILM.ino.elf
rename to SOURCE/NILM_Firmware/MEGA2560_MQTT_NILM/build/arduino.avr.mega/MEGA2560_MQTT_NILM.ino.elf
diff --git a/SOURCE/Agent,Kiosk/NILM_Firmware_arduino/MEGA2560_MQTT_NILM/build/arduino.avr.mega/MEGA2560_MQTT_NILM.ino.hex b/SOURCE/NILM_Firmware/MEGA2560_MQTT_NILM/build/arduino.avr.mega/MEGA2560_MQTT_NILM.ino.hex
similarity index 100%
rename from SOURCE/Agent,Kiosk/NILM_Firmware_arduino/MEGA2560_MQTT_NILM/build/arduino.avr.mega/MEGA2560_MQTT_NILM.ino.hex
rename to SOURCE/NILM_Firmware/MEGA2560_MQTT_NILM/build/arduino.avr.mega/MEGA2560_MQTT_NILM.ino.hex
diff --git a/SOURCE/Agent,Kiosk/NILM_Firmware_arduino/MEGA2560_MQTT_NILM/build/arduino.avr.mega/MEGA2560_MQTT_NILM.ino.with_bootloader.bin b/SOURCE/NILM_Firmware/MEGA2560_MQTT_NILM/build/arduino.avr.mega/MEGA2560_MQTT_NILM.ino.with_bootloader.bin
similarity index 100%
rename from SOURCE/Agent,Kiosk/NILM_Firmware_arduino/MEGA2560_MQTT_NILM/build/arduino.avr.mega/MEGA2560_MQTT_NILM.ino.with_bootloader.bin
rename to SOURCE/NILM_Firmware/MEGA2560_MQTT_NILM/build/arduino.avr.mega/MEGA2560_MQTT_NILM.ino.with_bootloader.bin
diff --git a/SOURCE/Agent,Kiosk/NILM_Firmware_arduino/MEGA2560_MQTT_NILM/build/arduino.avr.mega/MEGA2560_MQTT_NILM.ino.with_bootloader.hex b/SOURCE/NILM_Firmware/MEGA2560_MQTT_NILM/build/arduino.avr.mega/MEGA2560_MQTT_NILM.ino.with_bootloader.hex
similarity index 100%
rename from SOURCE/Agent,Kiosk/NILM_Firmware_arduino/MEGA2560_MQTT_NILM/build/arduino.avr.mega/MEGA2560_MQTT_NILM.ino.with_bootloader.hex
rename to SOURCE/NILM_Firmware/MEGA2560_MQTT_NILM/build/arduino.avr.mega/MEGA2560_MQTT_NILM.ino.with_bootloader.hex
diff --git a/SOURCE/Agent,Kiosk/NILM_Firmware_arduino/MEGA2560_MQTT_NILM_1099/MEGA2560_MQTT_NILM_1099.ino b/SOURCE/NILM_Firmware/MEGA2560_MQTT_NILM_1099/MEGA2560_MQTT_NILM_1099.ino
similarity index 100%
rename from SOURCE/Agent,Kiosk/NILM_Firmware_arduino/MEGA2560_MQTT_NILM_1099/MEGA2560_MQTT_NILM_1099.ino
rename to SOURCE/NILM_Firmware/MEGA2560_MQTT_NILM_1099/MEGA2560_MQTT_NILM_1099.ino