diff --git a/ACs/Dreo_heater.ir b/ACs/Dreo/Dreo_Heater.ir
similarity index 100%
rename from ACs/Dreo_heater.ir
rename to ACs/Dreo/Dreo_Heater.ir
diff --git a/ACs/Dyson_air_multiplier.ir b/ACs/Dyson/Dyson_Air_Multiplier.ir
old mode 100755
new mode 100644
similarity index 100%
rename from ACs/Dyson_air_multiplier.ir
rename to ACs/Dyson/Dyson_Air_Multiplier.ir
diff --git a/ACs/Dyson_hp09.ir b/ACs/Dyson/Dyson_HP09.ir
similarity index 100%
rename from ACs/Dyson_hp09.ir
rename to ACs/Dyson/Dyson_HP09.ir
diff --git a/ACs/GoldenVantage_AF510_fireplace.ir b/ACs/GoldenVantage/GoldenVantage_AF510_Fireplace.ir
similarity index 100%
rename from ACs/GoldenVantage_AF510_fireplace.ir
rename to ACs/GoldenVantage/GoldenVantage_AF510_Fireplace.ir
diff --git a/ACs/Homedics_humidifier.ir b/ACs/Homedics/Homedics_Humidifier.ir
similarity index 100%
rename from ACs/Homedics_humidifier.ir
rename to ACs/Homedics/Homedics_Humidifier.ir
diff --git a/ETC/Jet_AFS-1000b.ir b/ACs/JETTools/JETTools_AFS-1000B.ir
similarity index 100%
rename from ETC/Jet_AFS-1000b.ir
rename to ACs/JETTools/JETTools_AFS-1000B.ir
diff --git a/ACs/Koldfront_wac12001.ir b/ACs/Koldfront/Koldfront_WAC12001.ir
similarity index 100%
rename from ACs/Koldfront_wac12001.ir
rename to ACs/Koldfront/Koldfront_WAC12001.ir
diff --git a/ACs/LG_AC.ir b/ACs/LG/LG_AC.ir
similarity index 100%
rename from ACs/LG_AC.ir
rename to ACs/LG/LG_AC.ir
diff --git a/ACs/Lasko_fan.ir b/ACs/Lasko/Lasko_Fan.ir
similarity index 100%
rename from ACs/Lasko_fan.ir
rename to ACs/Lasko/Lasko_Fan.ir
diff --git a/ACs/Lasko_fan_simple.ir b/ACs/Lasko/Lasko_Fan_Simple.ir
similarity index 100%
rename from ACs/Lasko_fan_simple.ir
rename to ACs/Lasko/Lasko_Fan_Simple.ir
diff --git a/ACs/Lasko_heater.ir b/ACs/Lasko/Lasko_Heater.ir
similarity index 100%
rename from ACs/Lasko_heater.ir
rename to ACs/Lasko/Lasko_Heater.ir
diff --git a/ACs/Vornado.ir b/ACs/Vornado/Vornado.ir
old mode 100755
new mode 100644
similarity index 100%
rename from ACs/Vornado.ir
rename to ACs/Vornado/Vornado.ir
diff --git a/ACs/Whynter_AC.ir b/ACs/Whynter/Whynter_AC.ir
old mode 100755
new mode 100644
similarity index 100%
rename from ACs/Whynter_AC.ir
rename to ACs/Whynter/Whynter_AC.ir
diff --git a/ACs/Zenith_AC.ir b/ACs/Zenith/Zenith_AC.ir
similarity index 100%
rename from ACs/Zenith_AC.ir
rename to ACs/Zenith/Zenith_AC.ir
diff --git a/Audio Receivers/Onkyo.ir b/Audio Receivers/Onkyo/Onkyo.ir
similarity index 100%
rename from Audio Receivers/Onkyo.ir
rename to Audio Receivers/Onkyo/Onkyo.ir
diff --git a/Audio Receivers/OnkyoRC627S.ir b/Audio Receivers/Onkyo/Onkyo_RC627S.ir
similarity index 100%
rename from Audio Receivers/OnkyoRC627S.ir
rename to Audio Receivers/Onkyo/Onkyo_RC627S.ir
diff --git a/Audio Receivers/Sony_MHC-GS300AV.ir b/Audio Receivers/Sony/Sony_MHC-GS300AV.ir
similarity index 100%
rename from Audio Receivers/Sony_MHC-GS300AV.ir
rename to Audio Receivers/Sony/Sony_MHC-GS300AV.ir
diff --git a/BluRay/LG_BlueRay.ir b/Blu-Ray/LG/LG_BlueRay.ir
similarity index 100%
rename from BluRay/LG_BlueRay.ir
rename to Blu-Ray/LG/LG_BlueRay.ir
diff --git a/BluRay/ToshibaSER0398.ir b/Blu-Ray/Toshiba/Toshiba_SE-R0398.ir
similarity index 100%
rename from BluRay/ToshibaSER0398.ir
rename to Blu-Ray/Toshiba/Toshiba_SE-R0398.ir
diff --git a/Cable Boxes/Amino_amigo.ir b/Cable Boxes/Amino/Amino_Amigo.ir
similarity index 100%
rename from Cable Boxes/Amino_amigo.ir
rename to Cable Boxes/Amino/Amino_Amigo.ir
diff --git a/Cable Boxes/Direct_tv.ir b/Cable Boxes/DIRECTV/DIRECTV.ir
old mode 100755
new mode 100644
similarity index 100%
rename from Cable Boxes/Direct_tv.ir
rename to Cable Boxes/DIRECTV/DIRECTV.ir
diff --git a/Cable Boxes/Telus Optik TV.ir b/Cable Boxes/Telus/Telus_OptikTV.ir
similarity index 100%
rename from Cable Boxes/Telus Optik TV.ir
rename to Cable Boxes/Telus/Telus_OptikTV.ir
diff --git a/Cameras/Nikon.ir b/Cameras/Sony/Nikon.ir
similarity index 100%
rename from Cameras/Nikon.ir
rename to Cameras/Sony/Nikon.ir
diff --git a/Cameras/Sony_cam.ir b/Cameras/Sony/Sony.ir
similarity index 100%
rename from Cameras/Sony_cam.ir
rename to Cameras/Sony/Sony.ir
diff --git a/Consoles/Xbox.ir b/Consoles/Microsoft/Xbox.ir
similarity index 100%
rename from Consoles/Xbox.ir
rename to Consoles/Microsoft/Xbox.ir
diff --git a/Converters/RME_ADI_2_DAC_FS.ir b/Converters/RME/RME_ADI-2_DAC_FS.ir
similarity index 100%
rename from Converters/RME_ADI_2_DAC_FS.ir
rename to Converters/RME/RME_ADI-2_DAC_FS.ir
diff --git a/Misc/AMI_Jukebox.ir b/Miscellaneous/AMI/AMI_Jukebox.ir
similarity index 100%
rename from Misc/AMI_Jukebox.ir
rename to Miscellaneous/AMI/AMI_Jukebox.ir
diff --git a/ETC/Hdmi_switch.ir b/Miscellaneous/HDMI_Switch.ir
similarity index 100%
rename from ETC/Hdmi_switch.ir
rename to Miscellaneous/HDMI_Switch.ir
diff --git a/Misc/Furby.ir b/Miscellaneous/Hasbro/Furby/Furby.ir
similarity index 100%
rename from Misc/Furby.ir
rename to Miscellaneous/Hasbro/Furby/Furby.ir
diff --git a/Roku and LG Remotes/Lg.ir b/Miscellaneous/LG/LG.ir
similarity index 100%
rename from Roku and LG Remotes/Lg.ir
rename to Miscellaneous/LG/LG.ir
diff --git a/Misc/LaserX_Tag.ir b/Miscellaneous/LaserX/LaserX_Tag.ir
similarity index 100%
rename from Misc/LaserX_Tag.ir
rename to Miscellaneous/LaserX/LaserX_Tag.ir
diff --git a/Misc/ReadMe.md b/Miscellaneous/ReadMe.md
similarity index 100%
rename from Misc/ReadMe.md
rename to Miscellaneous/ReadMe.md
diff --git a/Projectors/BenQ.ir b/Projectors/BenQ/BenQ.ir
similarity index 100%
rename from Projectors/BenQ.ir
rename to Projectors/BenQ/BenQ.ir
diff --git a/Projectors/LED Smart Home Theater Projector.ir b/Projectors/BrandUnknown/LED Smart Home Theater Projector.ir
similarity index 100%
rename from Projectors/LED Smart Home Theater Projector.ir
rename to Projectors/BrandUnknown/LED Smart Home Theater Projector.ir
diff --git a/Projectors/BrandUnknown/README.md b/Projectors/BrandUnknown/README.md
new file mode 100644
index 00000000..b6927805
--- /dev/null
+++ b/Projectors/BrandUnknown/README.md
@@ -0,0 +1 @@
+These devices are of unknown brand and model. If you find what one of these is, please classify accordingly! Thank you!
\ No newline at end of file
diff --git a/Projectors/Scrn_innov.ir b/Projectors/BrandUnknown/Scrn_innov.ir
similarity index 100%
rename from Projectors/Scrn_innov.ir
rename to Projectors/BrandUnknown/Scrn_innov.ir
diff --git a/Projectors/Stlth_acou.ir b/Projectors/BrandUnknown/Stlth_acou.ir
similarity index 100%
rename from Projectors/Stlth_acou.ir
rename to Projectors/BrandUnknown/Stlth_acou.ir
diff --git a/Projectors/Casio-Projector_yt130.ir b/Projectors/Casio/Casio_YT-130.ir
similarity index 100%
rename from Projectors/Casio-Projector_yt130.ir
rename to Projectors/Casio/Casio_YT-130.ir
diff --git a/Projectors/Da_lite_proj_scrn.ir b/Projectors/Da-Lite/Da-Lite_ProjectorScreen.ir
similarity index 100%
rename from Projectors/Da_lite_proj_scrn.ir
rename to Projectors/Da-Lite/Da-Lite_ProjectorScreen.ir
diff --git a/Projectors/Dragonfly_scrn.ir b/Projectors/Dragonfly/Dragonfly_Screen.ir
similarity index 100%
rename from Projectors/Dragonfly_scrn.ir
rename to Projectors/Dragonfly/Dragonfly_Screen.ir
diff --git a/Projectors/Epson.ir b/Projectors/Epson/Epson.ir
similarity index 100%
rename from Projectors/Epson.ir
rename to Projectors/Epson/Epson.ir
diff --git a/SoundBars/Bose_Solo_Soundbar_II.ir b/SoundBars/Bose/Bose_Solo_2.ir
similarity index 100%
rename from SoundBars/Bose_Solo_Soundbar_II.ir
rename to SoundBars/Bose/Bose_Solo_2.ir
diff --git a/SoundBars/Bose_Solo_5.ir b/SoundBars/Bose/Bose_Solo_5.ir
similarity index 100%
rename from SoundBars/Bose_Solo_5.ir
rename to SoundBars/Bose/Bose_Solo_5.ir
diff --git a/SoundBars/Bose_soundbar.ir b/SoundBars/Bose/Bose_Soundbar.ir
similarity index 100%
rename from SoundBars/Bose_soundbar.ir
rename to SoundBars/Bose/Bose_Soundbar.ir
diff --git a/SoundBars/Amz_snd_bar.ir b/SoundBars/BrandUnknown/Amz_snd_bar.ir
similarity index 100%
rename from SoundBars/Amz_snd_bar.ir
rename to SoundBars/BrandUnknown/Amz_snd_bar.ir
diff --git a/SoundBars/Soundblasterx.ir b/SoundBars/BrandUnknown/Soundblasterx.ir
similarity index 100%
rename from SoundBars/Soundblasterx.ir
rename to SoundBars/BrandUnknown/Soundblasterx.ir
diff --git a/SoundBars/Klipsch_soundbar.ir b/SoundBars/Klipsch/Klipsch_Soundbar.ir
similarity index 100%
rename from SoundBars/Klipsch_soundbar.ir
rename to SoundBars/Klipsch/Klipsch_Soundbar.ir
diff --git a/SoundBars/Sony_MHC-GS300AV.ir b/SoundBars/Sony/Sony_MHC-GS300AV.ir
similarity index 100%
rename from SoundBars/Sony_MHC-GS300AV.ir
rename to SoundBars/Sony/Sony_MHC-GS300AV.ir
diff --git a/SoundBars/Old_sonyxbr.ir b/SoundBars/Sony/Sony_Old_XBR.ir
similarity index 100%
rename from SoundBars/Old_sonyxbr.ir
rename to SoundBars/Sony/Sony_Old_XBR.ir
diff --git a/SoundBars/Sony RDH-GTK33iP Speaker.ir b/SoundBars/Sony/Sony_RDH-GTK33IP.ir
similarity index 100%
rename from SoundBars/Sony RDH-GTK33iP Speaker.ir
rename to SoundBars/Sony/Sony_RDH-GTK33IP.ir
diff --git a/SoundBars/Vizio_Soundbar.ir b/SoundBars/Vizio/Vizio_Soundbar.ir
similarity index 100%
rename from SoundBars/Vizio_Soundbar.ir
rename to SoundBars/Vizio/Vizio_Soundbar.ir
diff --git a/SoundBars/Yamaha_rx.ir b/SoundBars/Yamaha/Yamaha_RX.ir
similarity index 100%
rename from SoundBars/Yamaha_rx.ir
rename to SoundBars/Yamaha/Yamaha_RX.ir
diff --git a/ETC/Apple_tv.ir b/Streaming Devices/Apple/Apple_TV.ir
similarity index 100%
rename from ETC/Apple_tv.ir
rename to Streaming Devices/Apple/Apple_TV.ir
diff --git a/ETC/Roku.ir b/Streaming Devices/Roku/Roku.ir
similarity index 100%
rename from ETC/Roku.ir
rename to Streaming Devices/Roku/Roku.ir
diff --git a/ETC/Roku2.ir b/Streaming Devices/Roku/Roku2.ir
similarity index 100%
rename from ETC/Roku2.ir
rename to Streaming Devices/Roku/Roku2.ir
diff --git a/Roku and LG Remotes/Roku.ir b/Streaming Devices/Roku/Roku_Alternate.ir
similarity index 100%
rename from Roku and LG Remotes/Roku.ir
rename to Streaming Devices/Roku/Roku_Alternate.ir
diff --git a/TVs/HisenseRokuTV.ir b/TVs/Hisense/Hisense_RokuTV.ir
similarity index 100%
rename from TVs/HisenseRokuTV.ir
rename to TVs/Hisense/Hisense_RokuTV.ir
diff --git a/TVs/LG_C1.ir b/TVs/LG/LG_C1.ir
similarity index 100%
rename from TVs/LG_C1.ir
rename to TVs/LG/LG_C1.ir
diff --git a/TVs/NEC.ir b/TVs/NEC/NEC.ir
similarity index 100%
rename from TVs/NEC.ir
rename to TVs/NEC/NEC.ir
diff --git a/TVs/Panasonic_TC-P50S2.ir b/TVs/Panasonic/Panasonic_TC-P50S2.ir
old mode 100755
new mode 100644
similarity index 100%
rename from TVs/Panasonic_TC-P50S2.ir
rename to TVs/Panasonic/Panasonic_TC-P50S2.ir
diff --git a/TVs/Philips_32PFL4208T.ir b/TVs/Philips/Philips_32PFL4208T.ir
similarity index 100%
rename from TVs/Philips_32PFL4208T.ir
rename to TVs/Philips/Philips_32PFL4208T.ir
diff --git a/TVs/Samsung.ir b/TVs/Samsung/Samsung.ir
similarity index 100%
rename from TVs/Samsung.ir
rename to TVs/Samsung/Samsung.ir
diff --git a/TVs/SamsungBN59.ir b/TVs/Samsung/Samsung_BN59.ir
similarity index 100%
rename from TVs/SamsungBN59.ir
rename to TVs/Samsung/Samsung_BN59.ir
diff --git a/TVs/Samsung_BN5901301A.ir b/TVs/Samsung/Samsung_BN5901301A.ir
similarity index 100%
rename from TVs/Samsung_BN5901301A.ir
rename to TVs/Samsung/Samsung_BN5901301A.ir
diff --git a/TVs/Samsung_e6.ir b/TVs/Samsung/Samsung_E6.ir
old mode 100755
new mode 100644
similarity index 100%
rename from TVs/Samsung_e6.ir
rename to TVs/Samsung/Samsung_E6.ir
diff --git a/TVs/Samsung_TV.ir b/TVs/Samsung/Samsung_TV.ir
similarity index 100%
rename from TVs/Samsung_TV.ir
rename to TVs/Samsung/Samsung_TV.ir
diff --git a/TVs/Sharp_Roku_TV.ir b/TVs/Sharp/Sharp_Roku_TV.ir
similarity index 100%
rename from TVs/Sharp_Roku_TV.ir
rename to TVs/Sharp/Sharp_Roku_TV.ir
diff --git a/TVs/Sony_Bravia_tv.ir b/TVs/Sony/Sony_Bravia.ir
similarity index 100%
rename from TVs/Sony_Bravia_tv.ir
rename to TVs/Sony/Sony_Bravia.ir
diff --git a/TVs/Sonyxbr.ir b/TVs/Sony/Sony_XBR.ir
similarity index 100%
rename from TVs/Sonyxbr.ir
rename to TVs/Sony/Sony_XBR.ir
diff --git a/TVs/Sonyxbr_RMT_TX200U.ir b/TVs/Sony/Sony_XBR_RMT-TX200U.ir
similarity index 100%
rename from TVs/Sonyxbr_RMT_TX200U.ir
rename to TVs/Sony/Sony_XBR_RMT-TX200U.ir
diff --git a/TVs/Sunbrite.ir b/TVs/Sunbrite/Sunbrite.ir
similarity index 100%
rename from TVs/Sunbrite.ir
rename to TVs/Sunbrite/Sunbrite.ir
diff --git a/TVs/Tcl_32s327.ir b/TVs/TCL/TCL_32S327.ir
similarity index 100%
rename from TVs/Tcl_32s327.ir
rename to TVs/TCL/TCL_32S327.ir
diff --git a/TVs/Tcl.ir b/TVs/TCL/TCL_UnknownModel1.ir
similarity index 100%
rename from TVs/Tcl.ir
rename to TVs/TCL/TCL_UnknownModel1.ir
diff --git a/TVs/Tcl_tv.ir b/TVs/TCL/TCL_UnknownModel2.ir
similarity index 100%
rename from TVs/Tcl_tv.ir
rename to TVs/TCL/TCL_UnknownModel2.ir
diff --git a/TVs/Toshiba 32AV502U.ir b/TVs/Toshiba/Toshiba_32AV502U.ir
similarity index 100%
rename from TVs/Toshiba 32AV502U.ir
rename to TVs/Toshiba/Toshiba_32AV502U.ir
diff --git a/TVs/Vizio.ir b/TVs/Vizio/Vizio.ir
similarity index 100%
rename from TVs/Vizio.ir
rename to TVs/Vizio/Vizio.ir
diff --git a/TVs/Westinghouse.ir b/TVs/Westinghouse/Westinghouse.ir
similarity index 100%
rename from TVs/Westinghouse.ir
rename to TVs/Westinghouse/Westinghouse.ir