diff --git a/assets/resources/infrared/assets/Cable Boxes/Amino_amigo.ir b/assets/resources/infrared/assets/Amino_amigo.ir
similarity index 100%
rename from assets/resources/infrared/assets/Cable Boxes/Amino_amigo.ir
rename to assets/resources/infrared/assets/Amino_amigo.ir
diff --git a/assets/resources/infrared/assets/SoundBars/Amz_snd_bar.ir b/assets/resources/infrared/assets/Amz_snd_bar.ir
similarity index 100%
rename from assets/resources/infrared/assets/SoundBars/Amz_snd_bar.ir
rename to assets/resources/infrared/assets/Amz_snd_bar.ir
diff --git a/assets/resources/infrared/assets/ETC/Apple_tv.ir b/assets/resources/infrared/assets/Apple_tv.ir
similarity index 100%
rename from assets/resources/infrared/assets/ETC/Apple_tv.ir
rename to assets/resources/infrared/assets/Apple_tv.ir
diff --git a/assets/resources/infrared/assets/Projectors/BenQ.ir b/assets/resources/infrared/assets/BenQ.ir
similarity index 100%
rename from assets/resources/infrared/assets/Projectors/BenQ.ir
rename to assets/resources/infrared/assets/BenQ.ir
diff --git a/assets/resources/infrared/assets/Projectors/Casio-Projector_yt130.ir b/assets/resources/infrared/assets/Casio-Projector_yt130.ir
similarity index 100%
rename from assets/resources/infrared/assets/Projectors/Casio-Projector_yt130.ir
rename to assets/resources/infrared/assets/Casio-Projector_yt130.ir
diff --git a/assets/resources/infrared/assets/CCTV/Cv610_remote.ir b/assets/resources/infrared/assets/Cv610_remote.ir
similarity index 100%
rename from assets/resources/infrared/assets/CCTV/Cv610_remote.ir
rename to assets/resources/infrared/assets/Cv610_remote.ir
diff --git a/assets/resources/infrared/assets/Projectors/Da_lite_proj_scrn.ir b/assets/resources/infrared/assets/Da_lite_proj_scrn.ir
similarity index 100%
rename from assets/resources/infrared/assets/Projectors/Da_lite_proj_scrn.ir
rename to assets/resources/infrared/assets/Da_lite_proj_scrn.ir
diff --git a/assets/resources/infrared/assets/Cable Boxes/Direct_tv.ir b/assets/resources/infrared/assets/Direct_tv.ir
similarity index 100%
rename from assets/resources/infrared/assets/Cable Boxes/Direct_tv.ir
rename to assets/resources/infrared/assets/Direct_tv.ir
diff --git a/assets/resources/infrared/assets/Projectors/Dragonfly_scrn.ir b/assets/resources/infrared/assets/Dragonfly_scrn.ir
similarity index 100%
rename from assets/resources/infrared/assets/Projectors/Dragonfly_scrn.ir
rename to assets/resources/infrared/assets/Dragonfly_scrn.ir
diff --git a/assets/resources/infrared/assets/ACs/Dreo_heater.ir b/assets/resources/infrared/assets/Dreo_heater.ir
similarity index 100%
rename from assets/resources/infrared/assets/ACs/Dreo_heater.ir
rename to assets/resources/infrared/assets/Dreo_heater.ir
diff --git a/assets/resources/infrared/assets/ACs/Dyson_air_multiplier.ir b/assets/resources/infrared/assets/Dyson_air_multiplier.ir
similarity index 100%
rename from assets/resources/infrared/assets/ACs/Dyson_air_multiplier.ir
rename to assets/resources/infrared/assets/Dyson_air_multiplier.ir
diff --git a/assets/resources/infrared/assets/ACs/Dyson_hp09.ir b/assets/resources/infrared/assets/Dyson_hp09.ir
similarity index 100%
rename from assets/resources/infrared/assets/ACs/Dyson_hp09.ir
rename to assets/resources/infrared/assets/Dyson_hp09.ir
diff --git a/assets/resources/infrared/assets/Projectors/Epson.ir b/assets/resources/infrared/assets/Epson.ir
similarity index 100%
rename from assets/resources/infrared/assets/Projectors/Epson.ir
rename to assets/resources/infrared/assets/Epson.ir
diff --git a/assets/resources/infrared/assets/ETC/Hdmi_switch.ir b/assets/resources/infrared/assets/Hdmi_switch.ir
similarity index 100%
rename from assets/resources/infrared/assets/ETC/Hdmi_switch.ir
rename to assets/resources/infrared/assets/Hdmi_switch.ir
diff --git a/assets/resources/infrared/assets/ACs/LG_AC.ir b/assets/resources/infrared/assets/LG_AC.ir
similarity index 100%
rename from assets/resources/infrared/assets/ACs/LG_AC.ir
rename to assets/resources/infrared/assets/LG_AC.ir
diff --git a/assets/resources/infrared/assets/BluRay/LG_BlueRay.ir b/assets/resources/infrared/assets/LG_BlueRay.ir
similarity index 100%
rename from assets/resources/infrared/assets/BluRay/LG_BlueRay.ir
rename to assets/resources/infrared/assets/LG_BlueRay.ir
diff --git a/assets/resources/infrared/assets/TVs/LG_C1.ir b/assets/resources/infrared/assets/LG_C1.ir
similarity index 100%
rename from assets/resources/infrared/assets/TVs/LG_C1.ir
rename to assets/resources/infrared/assets/LG_C1.ir
diff --git a/assets/resources/infrared/assets/ACs/Lasko_fan.ir b/assets/resources/infrared/assets/Lasko_fan.ir
similarity index 100%
rename from assets/resources/infrared/assets/ACs/Lasko_fan.ir
rename to assets/resources/infrared/assets/Lasko_fan.ir
diff --git a/assets/resources/infrared/assets/ACs/Lasko_heater.ir b/assets/resources/infrared/assets/Lasko_heater.ir
similarity index 100%
rename from assets/resources/infrared/assets/ACs/Lasko_heater.ir
rename to assets/resources/infrared/assets/Lasko_heater.ir
diff --git a/assets/resources/infrared/assets/TVs/NEC.ir b/assets/resources/infrared/assets/NEC.ir
similarity index 100%
rename from assets/resources/infrared/assets/TVs/NEC.ir
rename to assets/resources/infrared/assets/NEC.ir
diff --git a/assets/resources/infrared/assets/Cameras/Nikon.ir b/assets/resources/infrared/assets/Nikon.ir
similarity index 100%
rename from assets/resources/infrared/assets/Cameras/Nikon.ir
rename to assets/resources/infrared/assets/Nikon.ir
diff --git a/assets/resources/infrared/assets/SoundBars/Old_sonyxbr.ir b/assets/resources/infrared/assets/Old_sonyxbr.ir
similarity index 100%
rename from assets/resources/infrared/assets/SoundBars/Old_sonyxbr.ir
rename to assets/resources/infrared/assets/Old_sonyxbr.ir
diff --git a/assets/resources/infrared/assets/TVs/Panasonic_TC-P50S2.ir b/assets/resources/infrared/assets/Panasonic_TC-P50S2.ir
similarity index 100%
rename from assets/resources/infrared/assets/TVs/Panasonic_TC-P50S2.ir
rename to assets/resources/infrared/assets/Panasonic_TC-P50S2.ir
diff --git a/assets/resources/infrared/assets/Head Units/Pioneer_1770nex.ir b/assets/resources/infrared/assets/Pioneer_1770nex.ir
similarity index 100%
rename from assets/resources/infrared/assets/Head Units/Pioneer_1770nex.ir
rename to assets/resources/infrared/assets/Pioneer_1770nex.ir
diff --git a/assets/resources/infrared/assets/ETC/Roku.ir b/assets/resources/infrared/assets/Roku.ir
similarity index 100%
rename from assets/resources/infrared/assets/ETC/Roku.ir
rename to assets/resources/infrared/assets/Roku.ir
diff --git a/assets/resources/infrared/assets/ETC/Roku2.ir b/assets/resources/infrared/assets/Roku2.ir
similarity index 100%
rename from assets/resources/infrared/assets/ETC/Roku2.ir
rename to assets/resources/infrared/assets/Roku2.ir
diff --git a/assets/resources/infrared/assets/TVs/Samsung.ir b/assets/resources/infrared/assets/Samsung.ir
similarity index 100%
rename from assets/resources/infrared/assets/TVs/Samsung.ir
rename to assets/resources/infrared/assets/Samsung.ir
diff --git a/assets/resources/infrared/assets/TVs/Samsung_TV.ir b/assets/resources/infrared/assets/Samsung_TV.ir
similarity index 100%
rename from assets/resources/infrared/assets/TVs/Samsung_TV.ir
rename to assets/resources/infrared/assets/Samsung_TV.ir
diff --git a/assets/resources/infrared/assets/TVs/Samsung_e6.ir b/assets/resources/infrared/assets/Samsung_e6.ir
similarity index 100%
rename from assets/resources/infrared/assets/TVs/Samsung_e6.ir
rename to assets/resources/infrared/assets/Samsung_e6.ir
diff --git a/assets/resources/infrared/assets/Projectors/Scrn_innov.ir b/assets/resources/infrared/assets/Scrn_innov.ir
similarity index 100%
rename from assets/resources/infrared/assets/Projectors/Scrn_innov.ir
rename to assets/resources/infrared/assets/Scrn_innov.ir
diff --git a/assets/resources/infrared/assets/TVs/Sharp_Roku_TV.ir b/assets/resources/infrared/assets/Sharp_Roku_TV.ir
similarity index 100%
rename from assets/resources/infrared/assets/TVs/Sharp_Roku_TV.ir
rename to assets/resources/infrared/assets/Sharp_Roku_TV.ir
diff --git a/assets/resources/infrared/assets/TVs/Sonyxbr.ir b/assets/resources/infrared/assets/Sonyxbr.ir
similarity index 100%
rename from assets/resources/infrared/assets/TVs/Sonyxbr.ir
rename to assets/resources/infrared/assets/Sonyxbr.ir
diff --git a/assets/resources/infrared/assets/Projectors/Stlth_acou.ir b/assets/resources/infrared/assets/Stlth_acou.ir
similarity index 100%
rename from assets/resources/infrared/assets/Projectors/Stlth_acou.ir
rename to assets/resources/infrared/assets/Stlth_acou.ir
diff --git a/assets/resources/infrared/assets/TVs/Sunbrite.ir b/assets/resources/infrared/assets/Sunbrite.ir
similarity index 100%
rename from assets/resources/infrared/assets/TVs/Sunbrite.ir
rename to assets/resources/infrared/assets/Sunbrite.ir
diff --git a/assets/resources/infrared/assets/CCTV/Szxlcom_cams.ir b/assets/resources/infrared/assets/Szxlcom_cams.ir
similarity index 100%
rename from assets/resources/infrared/assets/CCTV/Szxlcom_cams.ir
rename to assets/resources/infrared/assets/Szxlcom_cams.ir
diff --git a/assets/resources/infrared/assets/TVs/Tcl.ir b/assets/resources/infrared/assets/Tcl.ir
similarity index 100%
rename from assets/resources/infrared/assets/TVs/Tcl.ir
rename to assets/resources/infrared/assets/Tcl.ir
diff --git a/assets/resources/infrared/assets/TVs/Tcl_32s327.ir b/assets/resources/infrared/assets/Tcl_32s327.ir
similarity index 100%
rename from assets/resources/infrared/assets/TVs/Tcl_32s327.ir
rename to assets/resources/infrared/assets/Tcl_32s327.ir
diff --git a/assets/resources/infrared/assets/TVs/Tcl_tv.ir b/assets/resources/infrared/assets/Tcl_tv.ir
similarity index 100%
rename from assets/resources/infrared/assets/TVs/Tcl_tv.ir
rename to assets/resources/infrared/assets/Tcl_tv.ir
diff --git a/assets/resources/infrared/assets/TVs/Vizio.ir b/assets/resources/infrared/assets/Vizio.ir
similarity index 100%
rename from assets/resources/infrared/assets/TVs/Vizio.ir
rename to assets/resources/infrared/assets/Vizio.ir
diff --git a/assets/resources/infrared/assets/SoundBars/Vizio_Soundbar.ir b/assets/resources/infrared/assets/Vizio_Soundbar.ir
similarity index 100%
rename from assets/resources/infrared/assets/SoundBars/Vizio_Soundbar.ir
rename to assets/resources/infrared/assets/Vizio_Soundbar.ir
diff --git a/assets/resources/infrared/assets/ACs/Vornado.ir b/assets/resources/infrared/assets/Vornado.ir
similarity index 100%
rename from assets/resources/infrared/assets/ACs/Vornado.ir
rename to assets/resources/infrared/assets/Vornado.ir
diff --git a/assets/resources/infrared/assets/TVs/Westinghouse.ir b/assets/resources/infrared/assets/Westinghouse.ir
similarity index 100%
rename from assets/resources/infrared/assets/TVs/Westinghouse.ir
rename to assets/resources/infrared/assets/Westinghouse.ir
diff --git a/assets/resources/infrared/assets/ACs/Whynter_AC.ir b/assets/resources/infrared/assets/Whynter_AC.ir
similarity index 100%
rename from assets/resources/infrared/assets/ACs/Whynter_AC.ir
rename to assets/resources/infrared/assets/Whynter_AC.ir
diff --git a/assets/resources/infrared/assets/Consoles/Xbox.ir b/assets/resources/infrared/assets/Xbox.ir
similarity index 100%
rename from assets/resources/infrared/assets/Consoles/Xbox.ir
rename to assets/resources/infrared/assets/Xbox.ir
diff --git a/assets/resources/infrared/assets/SoundBars/Yamaha_rx.ir b/assets/resources/infrared/assets/Yamaha_rx.ir
similarity index 100%
rename from assets/resources/infrared/assets/SoundBars/Yamaha_rx.ir
rename to assets/resources/infrared/assets/Yamaha_rx.ir
diff --git a/assets/resources/infrared/assets/ACs/Zenith_AC.ir b/assets/resources/infrared/assets/Zenith_AC.ir
similarity index 100%
rename from assets/resources/infrared/assets/ACs/Zenith_AC.ir
rename to assets/resources/infrared/assets/Zenith_AC.ir