diff --git a/HomeAssistant.xcodeproj/project.pbxproj b/HomeAssistant.xcodeproj/project.pbxproj index dc0e5c3d5..2b51ca34e 100644 --- a/HomeAssistant.xcodeproj/project.pbxproj +++ b/HomeAssistant.xcodeproj/project.pbxproj @@ -444,7 +444,7 @@ B6E47E8D1CBA3EDB0027F6CA /* ZoneComponent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZoneComponent.swift; sourceTree = ""; }; B6E47E981CBB47CC0027F6CA /* DeviceUID.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DeviceUID.h; sourceTree = ""; }; B6E47E991CBB47EC0027F6CA /* DeviceUID.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DeviceUID.m; sourceTree = ""; }; - B6E8579B1CB0F37200F96925 /* HomeAssistant-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "HomeAssistant-Bridging-Header.h"; sourceTree = SOURCE_ROOT; }; + B6E8579B1CB0F37200F96925 /* HomeAssistant-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "HomeAssistant-Bridging-Header.h"; sourceTree = ""; }; B6E857A11CB1CCCC00F96925 /* Utils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = ""; }; B6F02BE81CB46AF40029ABE7 /* Entity.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Entity.swift; sourceTree = ""; }; B6F02BEA1CB46D090029ABE7 /* GroupComponent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GroupComponent.swift; sourceTree = ""; }; @@ -555,11 +555,11 @@ B60614B31D1F116D00249C11 /* Sounds */ = { isa = PBXGroup; children = ( - B60614B41D1F117700249C11 /* MorganFreeman */, B60615531D1F117700249C11 /* Alexa */, B606159A1D1F117700249C11 /* Generic */, + B60614B41D1F117700249C11 /* MorganFreeman */, ); - name = Sounds; + path = Sounds; sourceTree = ""; }; B60614B41D1F117700249C11 /* MorganFreeman */ = { @@ -716,11 +716,11 @@ B627CB0C1D83C87B0057173E /* NotificationContentExtension */ = { isa = PBXGroup; children = ( - B689EBCD1D8B91CE0000AECE /* NotificationContentExtension.entitlements */, - B627CB0D1D83C87B0057173E /* NotificationViewController.swift */, - B627CB0F1D83C87B0057173E /* MainInterface.storyboard */, B627CB121D83C87B0057173E /* Info.plist */, + B627CB0F1D83C87B0057173E /* MainInterface.storyboard */, B689EBCA1D8B7C800000AECE /* MjpegStreamingController.swift */, + B689EBCD1D8B91CE0000AECE /* NotificationContentExtension.entitlements */, + B627CB0D1D83C87B0057173E /* NotificationViewController.swift */, ); path = NotificationContentExtension; sourceTree = ""; @@ -728,25 +728,25 @@ B64D047B1CB8915500B945C8 /* SSE */ = { isa = PBXGroup; children = ( - B64D04791CB8908B00B945C8 /* StateChanged.swift */, - B64D047C1CB8916300B945C8 /* Event.swift */, B6E47E871CBA01310027F6CA /* CallService.swift */, + B64D047C1CB8916300B945C8 /* Event.swift */, B6E47E891CBA01DC0027F6CA /* ServiceExecuted.swift */, + B64D04791CB8908B00B945C8 /* StateChanged.swift */, ); - name = SSE; + path = SSE; sourceTree = ""; }; B657A8DD1CA646EB00121384 = { isa = PBXGroup; children = ( + B6AAD7A21D827DD40090B220 /* APNSAttachmentService */, + 29278BB24639BA945D3D86B4 /* Frameworks */, B657A8E81CA646EB00121384 /* HomeAssistant */, B657A8FF1CA646EB00121384 /* HomeAssistantTests */, B657A90A1CA646EB00121384 /* HomeAssistantUITests */, - B6AAD7A21D827DD40090B220 /* APNSAttachmentService */, B627CB0C1D83C87B0057173E /* NotificationContentExtension */, - B657A8E71CA646EB00121384 /* Products */, - 29278BB24639BA945D3D86B4 /* Frameworks */, AAB60FA4DE371AD957F6907B /* Pods */, + B657A8E71CA646EB00121384 /* Products */, ); sourceTree = ""; }; @@ -765,27 +765,27 @@ B657A8E81CA646EB00121384 /* HomeAssistant */ = { isa = PBXGroup; children = ( - B6AAD79C1D825C8D0090B220 /* HomeAssistant.entitlements */, - B60614B31D1F116D00249C11 /* Sounds */, B6F02BE71CB4698A0029ABE7 /* Classes */, + B60614B31D1F116D00249C11 /* Sounds */, B657A8E91CA646EB00121384 /* AppDelegate.swift */, - B6F700491CB34FA600753BAB /* GroupViewController.swift */, - B657A8ED1CA646EB00121384 /* SettingsViewController.swift */, - B626AAF01D8F972800A0D225 /* SettingsDetailViewController.swift */, - B6393F8B1CB260E800503916 /* EntityAttributesViewController.swift */, - B657A8EF1CA646EB00121384 /* Main.storyboard */, B657A8F21CA646EB00121384 /* Assets.xcassets */, - B657A8F41CA646EB00121384 /* LaunchScreen.storyboard */, - B657A8F71CA646EB00121384 /* Info.plist */, - B657A9191CA647C500121384 /* HAAPI.swift */, - B6E8579B1CB0F37200F96925 /* HomeAssistant-Bridging-Header.h */, - B6E857A11CB1CCCC00F96925 /* Utils.swift */, - B6393F851CB255F200503916 /* EurekaLocationRow.swift */, - B6F700511CB374F700753BAB /* RootTabBarViewController.swift */, - B624DE171CB8369200F413CE /* DevicesMapViewController.swift */, B6E47E981CBB47CC0027F6CA /* DeviceUID.h */, B6E47E991CBB47EC0027F6CA /* DeviceUID.m */, + B624DE171CB8369200F413CE /* DevicesMapViewController.swift */, + B6393F8B1CB260E800503916 /* EntityAttributesViewController.swift */, + B6393F851CB255F200503916 /* EurekaLocationRow.swift */, + B6F700491CB34FA600753BAB /* GroupViewController.swift */, + B657A9191CA647C500121384 /* HAAPI.swift */, + B6E8579B1CB0F37200F96925 /* HomeAssistant-Bridging-Header.h */, + B6AAD79C1D825C8D0090B220 /* HomeAssistant.entitlements */, + B657A8F71CA646EB00121384 /* Info.plist */, + B657A8F41CA646EB00121384 /* LaunchScreen.storyboard */, + B657A8EF1CA646EB00121384 /* Main.storyboard */, B6617EEC1CFE79AD004DEE6D /* NSURL+QueryDictionary.swift */, + B6F700511CB374F700753BAB /* RootTabBarViewController.swift */, + B626AAF01D8F972800A0D225 /* SettingsDetailViewController.swift */, + B657A8ED1CA646EB00121384 /* SettingsViewController.swift */, + B6E857A11CB1CCCC00F96925 /* Utils.swift */, ); path = HomeAssistant; sourceTree = ""; @@ -812,8 +812,8 @@ isa = PBXGroup; children = ( B689EBCC1D8B91C80000AECE /* APNSAttachmentService.entitlements */, - B6AAD7A31D827DD40090B220 /* NotificationService.swift */, B6AAD7A51D827DD40090B220 /* Info.plist */, + B6AAD7A31D827DD40090B220 /* NotificationService.swift */, ); path = APNSAttachmentService; sourceTree = ""; @@ -824,44 +824,44 @@ B6F02BFF1CB4880C0029ABE7 /* Components */, B6F02BEC1CB46E810029ABE7 /* HA API Responses */, B6F02BE81CB46AF40029ABE7 /* Entity.swift */, - B6767A501D0234E700F2A08B /* SwitchableEntity.swift */, B62A679F1D80E933009E46F9 /* IdentifyRequest.swift */, B629E8D51DAD8CFA00040A90 /* PushRegistrationRequest.swift */, B60EAE9A1DBC347C0062C97C /* PushRegistrationResponse.swift */, + B6767A501D0234E700F2A08B /* SwitchableEntity.swift */, ); - name = Classes; + path = Classes; sourceTree = ""; }; B6F02BEC1CB46E810029ABE7 /* HA API Responses */ = { isa = PBXGroup; children = ( B64D047B1CB8915500B945C8 /* SSE */, - B6F02BED1CB46EB10029ABE7 /* Status.swift */, + B6FBE3961D46A4E500EE0E36 /* Beacons.swift */, B6F02BEF1CB46EC70029ABE7 /* Bootstrap.swift */, B6F02BF11CB470570029ABE7 /* Config.swift */, - B6F02BF51CB4728D0029ABE7 /* History.swift */, + B626AAEE1D8F44DC00A0D225 /* DiscoveryInfo.swift */, B6F02BF91CB47F930029ABE7 /* Events.swift */, - B6F02BFB1CB4800C0029ABE7 /* Services.swift */, + B6F02BF51CB4728D0029ABE7 /* History.swift */, B66428111CF7A83200903804 /* PushConfiguration.swift */, - B6FBE3961D46A4E500EE0E36 /* Beacons.swift */, - B626AAEE1D8F44DC00A0D225 /* DiscoveryInfo.swift */, + B6F02BFB1CB4800C0029ABE7 /* Services.swift */, + B6F02BED1CB46EB10029ABE7 /* Status.swift */, ); - name = "HA API Responses"; + path = "HA API Responses"; sourceTree = ""; }; B6F02BFF1CB4880C0029ABE7 /* Components */ = { isa = PBXGroup; children = ( B6DBF7651D89F7D800402A57 /* AutomationComponent.swift */, - B6DBF7671D89F8C100402A57 /* FanComponent.swift */, B6F02C001CB489770029ABE7 /* BinarySensorComponent.swift */, B6880B2A1D7B9E6400CCB899 /* ClimateComponent.swift */, B6F02C011CB489770029ABE7 /* DeviceTrackerComponent.swift */, + B6DBF7671D89F8C100402A57 /* FanComponent.swift */, B6F02C021CB489770029ABE7 /* GarageDoorComponent.swift */, B6F02BEA1CB46D090029ABE7 /* GroupComponent.swift */, B6F02C031CB489770029ABE7 /* InputBooleanComponent.swift */, - B64D09AE1D7D561E008EB487 /* InputSlider.swift */, B6F02C041CB489770029ABE7 /* InputSelectComponent.swift */, + B64D09AE1D7D561E008EB487 /* InputSlider.swift */, B6F02C051CB489770029ABE7 /* LightComponent.swift */, B6F02C061CB489770029ABE7 /* LockComponent.swift */, B6F02C071CB489770029ABE7 /* MediaPlayerComponent.swift */, @@ -874,7 +874,7 @@ B6F02C0E1CB489770029ABE7 /* WeblinkComponent.swift */, B6E47E8D1CBA3EDB0027F6CA /* ZoneComponent.swift */, ); - name = Components; + path = Components; sourceTree = ""; }; /* End PBXGroup section */ @@ -1559,6 +1559,7 @@ B627CB101D83C87B0057173E /* Base */, ); name = MainInterface.storyboard; + path = .; sourceTree = ""; }; B657A8EF1CA646EB00121384 /* Main.storyboard */ = { @@ -1567,6 +1568,7 @@ B657A8F01CA646EB00121384 /* Base */, ); name = Main.storyboard; + path = .; sourceTree = ""; }; B657A8F41CA646EB00121384 /* LaunchScreen.storyboard */ = { @@ -1575,6 +1577,7 @@ B657A8F51CA646EB00121384 /* Base */, ); name = LaunchScreen.storyboard; + path = .; sourceTree = ""; }; /* End PBXVariantGroup section */ @@ -1777,7 +1780,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "050c99c9-d23a-4537-8e4e-9eb293d13d49"; PROVISIONING_PROFILE_SPECIFIER = "match Development io.robbie.HomeAssistant 1475202231"; - SWIFT_OBJC_BRIDGING_HEADER = "HomeAssistant-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "HomeAssistant/HomeAssistant-Bridging-Header.h"; SWIFT_VERSION = 3.0; VERSIONING_SYSTEM = "apple-generic"; }; @@ -1836,7 +1839,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "bbef0c3e-93d6-48c3-9e98-ede0cc0b42b0"; PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.robbie.HomeAssistant 1473993199"; - SWIFT_OBJC_BRIDGING_HEADER = "HomeAssistant-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "HomeAssistant/HomeAssistant-Bridging-Header.h"; SWIFT_VERSION = 3.0; VERSIONING_SYSTEM = "apple-generic"; }; diff --git a/HomeAssistant/AutomationComponent.swift b/HomeAssistant/Classes/Components/AutomationComponent.swift similarity index 100% rename from HomeAssistant/AutomationComponent.swift rename to HomeAssistant/Classes/Components/AutomationComponent.swift diff --git a/HomeAssistant/BinarySensorComponent.swift b/HomeAssistant/Classes/Components/BinarySensorComponent.swift similarity index 100% rename from HomeAssistant/BinarySensorComponent.swift rename to HomeAssistant/Classes/Components/BinarySensorComponent.swift diff --git a/HomeAssistant/ClimateComponent.swift b/HomeAssistant/Classes/Components/ClimateComponent.swift similarity index 100% rename from HomeAssistant/ClimateComponent.swift rename to HomeAssistant/Classes/Components/ClimateComponent.swift diff --git a/HomeAssistant/DeviceTrackerComponent.swift b/HomeAssistant/Classes/Components/DeviceTrackerComponent.swift similarity index 100% rename from HomeAssistant/DeviceTrackerComponent.swift rename to HomeAssistant/Classes/Components/DeviceTrackerComponent.swift diff --git a/HomeAssistant/FanComponent.swift b/HomeAssistant/Classes/Components/FanComponent.swift similarity index 100% rename from HomeAssistant/FanComponent.swift rename to HomeAssistant/Classes/Components/FanComponent.swift diff --git a/HomeAssistant/GarageDoorComponent.swift b/HomeAssistant/Classes/Components/GarageDoorComponent.swift similarity index 100% rename from HomeAssistant/GarageDoorComponent.swift rename to HomeAssistant/Classes/Components/GarageDoorComponent.swift diff --git a/HomeAssistant/GroupComponent.swift b/HomeAssistant/Classes/Components/GroupComponent.swift similarity index 100% rename from HomeAssistant/GroupComponent.swift rename to HomeAssistant/Classes/Components/GroupComponent.swift diff --git a/HomeAssistant/InputBooleanComponent.swift b/HomeAssistant/Classes/Components/InputBooleanComponent.swift similarity index 100% rename from HomeAssistant/InputBooleanComponent.swift rename to HomeAssistant/Classes/Components/InputBooleanComponent.swift diff --git a/HomeAssistant/InputSelectComponent.swift b/HomeAssistant/Classes/Components/InputSelectComponent.swift similarity index 100% rename from HomeAssistant/InputSelectComponent.swift rename to HomeAssistant/Classes/Components/InputSelectComponent.swift diff --git a/HomeAssistant/InputSlider.swift b/HomeAssistant/Classes/Components/InputSlider.swift similarity index 100% rename from HomeAssistant/InputSlider.swift rename to HomeAssistant/Classes/Components/InputSlider.swift diff --git a/HomeAssistant/LightComponent.swift b/HomeAssistant/Classes/Components/LightComponent.swift similarity index 100% rename from HomeAssistant/LightComponent.swift rename to HomeAssistant/Classes/Components/LightComponent.swift diff --git a/HomeAssistant/LockComponent.swift b/HomeAssistant/Classes/Components/LockComponent.swift similarity index 100% rename from HomeAssistant/LockComponent.swift rename to HomeAssistant/Classes/Components/LockComponent.swift diff --git a/HomeAssistant/MediaPlayerComponent.swift b/HomeAssistant/Classes/Components/MediaPlayerComponent.swift similarity index 100% rename from HomeAssistant/MediaPlayerComponent.swift rename to HomeAssistant/Classes/Components/MediaPlayerComponent.swift diff --git a/HomeAssistant/SceneComponent.swift b/HomeAssistant/Classes/Components/SceneComponent.swift similarity index 100% rename from HomeAssistant/SceneComponent.swift rename to HomeAssistant/Classes/Components/SceneComponent.swift diff --git a/HomeAssistant/ScriptComponent.swift b/HomeAssistant/Classes/Components/ScriptComponent.swift similarity index 100% rename from HomeAssistant/ScriptComponent.swift rename to HomeAssistant/Classes/Components/ScriptComponent.swift diff --git a/HomeAssistant/SensorComponent.swift b/HomeAssistant/Classes/Components/SensorComponent.swift similarity index 100% rename from HomeAssistant/SensorComponent.swift rename to HomeAssistant/Classes/Components/SensorComponent.swift diff --git a/HomeAssistant/SunComponent.swift b/HomeAssistant/Classes/Components/SunComponent.swift similarity index 100% rename from HomeAssistant/SunComponent.swift rename to HomeAssistant/Classes/Components/SunComponent.swift diff --git a/HomeAssistant/SwitchComponent.swift b/HomeAssistant/Classes/Components/SwitchComponent.swift similarity index 100% rename from HomeAssistant/SwitchComponent.swift rename to HomeAssistant/Classes/Components/SwitchComponent.swift diff --git a/HomeAssistant/ThermostatComponent.swift b/HomeAssistant/Classes/Components/ThermostatComponent.swift similarity index 100% rename from HomeAssistant/ThermostatComponent.swift rename to HomeAssistant/Classes/Components/ThermostatComponent.swift diff --git a/HomeAssistant/WeblinkComponent.swift b/HomeAssistant/Classes/Components/WeblinkComponent.swift similarity index 100% rename from HomeAssistant/WeblinkComponent.swift rename to HomeAssistant/Classes/Components/WeblinkComponent.swift diff --git a/HomeAssistant/ZoneComponent.swift b/HomeAssistant/Classes/Components/ZoneComponent.swift similarity index 100% rename from HomeAssistant/ZoneComponent.swift rename to HomeAssistant/Classes/Components/ZoneComponent.swift diff --git a/HomeAssistant/Entity.swift b/HomeAssistant/Classes/Entity.swift similarity index 100% rename from HomeAssistant/Entity.swift rename to HomeAssistant/Classes/Entity.swift diff --git a/HomeAssistant/Beacons.swift b/HomeAssistant/Classes/HA API Responses/Beacons.swift similarity index 100% rename from HomeAssistant/Beacons.swift rename to HomeAssistant/Classes/HA API Responses/Beacons.swift diff --git a/HomeAssistant/Bootstrap.swift b/HomeAssistant/Classes/HA API Responses/Bootstrap.swift similarity index 100% rename from HomeAssistant/Bootstrap.swift rename to HomeAssistant/Classes/HA API Responses/Bootstrap.swift diff --git a/HomeAssistant/Config.swift b/HomeAssistant/Classes/HA API Responses/Config.swift similarity index 100% rename from HomeAssistant/Config.swift rename to HomeAssistant/Classes/HA API Responses/Config.swift diff --git a/HomeAssistant/DiscoveryInfo.swift b/HomeAssistant/Classes/HA API Responses/DiscoveryInfo.swift similarity index 100% rename from HomeAssistant/DiscoveryInfo.swift rename to HomeAssistant/Classes/HA API Responses/DiscoveryInfo.swift diff --git a/HomeAssistant/Events.swift b/HomeAssistant/Classes/HA API Responses/Events.swift similarity index 100% rename from HomeAssistant/Events.swift rename to HomeAssistant/Classes/HA API Responses/Events.swift diff --git a/HomeAssistant/History.swift b/HomeAssistant/Classes/HA API Responses/History.swift similarity index 100% rename from HomeAssistant/History.swift rename to HomeAssistant/Classes/HA API Responses/History.swift diff --git a/HomeAssistant/PushConfiguration.swift b/HomeAssistant/Classes/HA API Responses/PushConfiguration.swift similarity index 100% rename from HomeAssistant/PushConfiguration.swift rename to HomeAssistant/Classes/HA API Responses/PushConfiguration.swift diff --git a/HomeAssistant/CallService.swift b/HomeAssistant/Classes/HA API Responses/SSE/CallService.swift similarity index 100% rename from HomeAssistant/CallService.swift rename to HomeAssistant/Classes/HA API Responses/SSE/CallService.swift diff --git a/HomeAssistant/Event.swift b/HomeAssistant/Classes/HA API Responses/SSE/Event.swift similarity index 100% rename from HomeAssistant/Event.swift rename to HomeAssistant/Classes/HA API Responses/SSE/Event.swift diff --git a/HomeAssistant/ServiceExecuted.swift b/HomeAssistant/Classes/HA API Responses/SSE/ServiceExecuted.swift similarity index 100% rename from HomeAssistant/ServiceExecuted.swift rename to HomeAssistant/Classes/HA API Responses/SSE/ServiceExecuted.swift diff --git a/HomeAssistant/StateChanged.swift b/HomeAssistant/Classes/HA API Responses/SSE/StateChanged.swift similarity index 100% rename from HomeAssistant/StateChanged.swift rename to HomeAssistant/Classes/HA API Responses/SSE/StateChanged.swift diff --git a/HomeAssistant/Services.swift b/HomeAssistant/Classes/HA API Responses/Services.swift similarity index 100% rename from HomeAssistant/Services.swift rename to HomeAssistant/Classes/HA API Responses/Services.swift diff --git a/HomeAssistant/Status.swift b/HomeAssistant/Classes/HA API Responses/Status.swift similarity index 100% rename from HomeAssistant/Status.swift rename to HomeAssistant/Classes/HA API Responses/Status.swift diff --git a/HomeAssistant/IdentifyRequest.swift b/HomeAssistant/Classes/IdentifyRequest.swift similarity index 100% rename from HomeAssistant/IdentifyRequest.swift rename to HomeAssistant/Classes/IdentifyRequest.swift diff --git a/HomeAssistant/PushRegistrationRequest.swift b/HomeAssistant/Classes/PushRegistrationRequest.swift similarity index 100% rename from HomeAssistant/PushRegistrationRequest.swift rename to HomeAssistant/Classes/PushRegistrationRequest.swift diff --git a/HomeAssistant/PushRegistrationResponse.swift b/HomeAssistant/Classes/PushRegistrationResponse.swift similarity index 100% rename from HomeAssistant/PushRegistrationResponse.swift rename to HomeAssistant/Classes/PushRegistrationResponse.swift diff --git a/HomeAssistant/SwitchableEntity.swift b/HomeAssistant/Classes/SwitchableEntity.swift similarity index 100% rename from HomeAssistant/SwitchableEntity.swift rename to HomeAssistant/Classes/SwitchableEntity.swift diff --git a/HomeAssistant-Bridging-Header.h b/HomeAssistant/HomeAssistant-Bridging-Header.h similarity index 100% rename from HomeAssistant-Bridging-Header.h rename to HomeAssistant/HomeAssistant-Bridging-Header.h diff --git a/HomeAssistant/Alexa/AlexaSounds.csv b/HomeAssistant/Sounds/Alexa/AlexaSounds.csv similarity index 100% rename from HomeAssistant/Alexa/AlexaSounds.csv rename to HomeAssistant/Sounds/Alexa/AlexaSounds.csv diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Back-Door-Opened.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Back-Door-Opened.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Back-Door-Opened.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Back-Door-Opened.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Back-Door-Unlocked.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Back-Door-Unlocked.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Back-Door-Unlocked.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Back-Door-Unlocked.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Basement-Door-Opened.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Basement-Door-Opened.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Basement-Door-Opened.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Basement-Door-Opened.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Basement-Door-Unlocked.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Basement-Door-Unlocked.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Basement-Door-Unlocked.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Basement-Door-Unlocked.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Boyfriend-Is-Arriving.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Boyfriend-Is-Arriving.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Boyfriend-Is-Arriving.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Boyfriend-Is-Arriving.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Daughter-Is-Arriving.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Daughter-Is-Arriving.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Daughter-Is-Arriving.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Daughter-Is-Arriving.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Front-Door-Opened.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Front-Door-Opened.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Front-Door-Opened.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Front-Door-Opened.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Front-Door-Unlocked.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Front-Door-Unlocked.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Front-Door-Unlocked.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Front-Door-Unlocked.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Garage-Door-Opened.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Garage-Door-Opened.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Garage-Door-Opened.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Garage-Door-Opened.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Girlfriend-Is-Arriving.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Girlfriend-Is-Arriving.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Girlfriend-Is-Arriving.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Girlfriend-Is-Arriving.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Good-Morning.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Good-Morning.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Good-Morning.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Good-Morning.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Good-Night.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Good-Night.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Good-Night.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Good-Night.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Husband-Is-Arriving.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Husband-Is-Arriving.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Husband-Is-Arriving.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Husband-Is-Arriving.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Mail-Has-Arrived.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Mail-Has-Arrived.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Mail-Has-Arrived.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Mail-Has-Arrived.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Motion-At-Back-Door.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Motion-At-Back-Door.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Motion-At-Back-Door.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Motion-At-Back-Door.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Motion-At-Front-Door.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Motion-At-Front-Door.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Motion-At-Front-Door.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Motion-At-Front-Door.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Motion-Detected-Generic.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Motion-Detected-Generic.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Motion-Detected-Generic.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Motion-Detected-Generic.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Motion-In-Back-Yard.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Motion-In-Back-Yard.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Motion-In-Back-Yard.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Motion-In-Back-Yard.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Motion-In-Basement.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Motion-In-Basement.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Motion-In-Basement.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Motion-In-Basement.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Motion-In-Front-Yard.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Motion-In-Front-Yard.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Motion-In-Front-Yard.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Motion-In-Front-Yard.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Motion-In-Garage.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Motion-In-Garage.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Motion-In-Garage.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Motion-In-Garage.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Patio-Door-Opened.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Patio-Door-Opened.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Patio-Door-Opened.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Patio-Door-Opened.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Patio-Door-Unlocked.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Patio-Door-Unlocked.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Patio-Door-Unlocked.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Patio-Door-Unlocked.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Smoke-Detected-Generic.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Smoke-Detected-Generic.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Smoke-Detected-Generic.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Smoke-Detected-Generic.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Smoke-Detected-In-Basement.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Smoke-Detected-In-Basement.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Smoke-Detected-In-Basement.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Smoke-Detected-In-Basement.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Smoke-Detected-In-Garage.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Smoke-Detected-In-Garage.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Smoke-Detected-In-Garage.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Smoke-Detected-In-Garage.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Smoke-Detected-In-Kitchen.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Smoke-Detected-In-Kitchen.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Smoke-Detected-In-Kitchen.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Smoke-Detected-In-Kitchen.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Son-Is-Arriving.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Son-Is-Arriving.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Son-Is-Arriving.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Son-Is-Arriving.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Water-Detected-Generic.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Water-Detected-Generic.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Water-Detected-Generic.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Water-Detected-Generic.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Water-Detected-In-Basement.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Water-Detected-In-Basement.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Water-Detected-In-Basement.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Water-Detected-In-Basement.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Water-Detected-In-Garage.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Water-Detected-In-Garage.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Water-Detected-In-Garage.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Water-Detected-In-Garage.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Water-Detected-In-Kitchen.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Water-Detected-In-Kitchen.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Water-Detected-In-Kitchen.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Water-Detected-In-Kitchen.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Welcome-Home.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Welcome-Home.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Welcome-Home.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Welcome-Home.wav diff --git a/HomeAssistant/Alexa/US-EN-Alexa-Wife-Is-Arriving.wav b/HomeAssistant/Sounds/Alexa/US-EN-Alexa-Wife-Is-Arriving.wav similarity index 100% rename from HomeAssistant/Alexa/US-EN-Alexa-Wife-Is-Arriving.wav rename to HomeAssistant/Sounds/Alexa/US-EN-Alexa-Wife-Is-Arriving.wav diff --git a/HomeAssistant/Generic/GenericSounds.csv b/HomeAssistant/Sounds/Generic/GenericSounds.csv similarity index 100% rename from HomeAssistant/Generic/GenericSounds.csv rename to HomeAssistant/Sounds/Generic/GenericSounds.csv diff --git a/HomeAssistant/Generic/US-EN-Daisy-Back-Door-Motion.wav b/HomeAssistant/Sounds/Generic/US-EN-Daisy-Back-Door-Motion.wav similarity index 100% rename from HomeAssistant/Generic/US-EN-Daisy-Back-Door-Motion.wav rename to HomeAssistant/Sounds/Generic/US-EN-Daisy-Back-Door-Motion.wav diff --git a/HomeAssistant/Generic/US-EN-Daisy-Back-Door-Open.wav b/HomeAssistant/Sounds/Generic/US-EN-Daisy-Back-Door-Open.wav similarity index 100% rename from HomeAssistant/Generic/US-EN-Daisy-Back-Door-Open.wav rename to HomeAssistant/Sounds/Generic/US-EN-Daisy-Back-Door-Open.wav diff --git a/HomeAssistant/Generic/US-EN-Daisy-Front-Door-Motion.wav b/HomeAssistant/Sounds/Generic/US-EN-Daisy-Front-Door-Motion.wav similarity index 100% rename from HomeAssistant/Generic/US-EN-Daisy-Front-Door-Motion.wav rename to HomeAssistant/Sounds/Generic/US-EN-Daisy-Front-Door-Motion.wav diff --git a/HomeAssistant/Generic/US-EN-Daisy-Front-Door-Open.wav b/HomeAssistant/Sounds/Generic/US-EN-Daisy-Front-Door-Open.wav similarity index 100% rename from HomeAssistant/Generic/US-EN-Daisy-Front-Door-Open.wav rename to HomeAssistant/Sounds/Generic/US-EN-Daisy-Front-Door-Open.wav diff --git a/HomeAssistant/Generic/US-EN-Daisy-Front-Window-Open.wav b/HomeAssistant/Sounds/Generic/US-EN-Daisy-Front-Window-Open.wav similarity index 100% rename from HomeAssistant/Generic/US-EN-Daisy-Front-Window-Open.wav rename to HomeAssistant/Sounds/Generic/US-EN-Daisy-Front-Window-Open.wav diff --git a/HomeAssistant/Generic/US-EN-Daisy-Garage-Door-Open.wav b/HomeAssistant/Sounds/Generic/US-EN-Daisy-Garage-Door-Open.wav similarity index 100% rename from HomeAssistant/Generic/US-EN-Daisy-Garage-Door-Open.wav rename to HomeAssistant/Sounds/Generic/US-EN-Daisy-Garage-Door-Open.wav diff --git a/HomeAssistant/Generic/US-EN-Daisy-Guest-Bath-Leak.wav b/HomeAssistant/Sounds/Generic/US-EN-Daisy-Guest-Bath-Leak.wav similarity index 100% rename from HomeAssistant/Generic/US-EN-Daisy-Guest-Bath-Leak.wav rename to HomeAssistant/Sounds/Generic/US-EN-Daisy-Guest-Bath-Leak.wav diff --git a/HomeAssistant/Generic/US-EN-Daisy-Kitchen-Sink-Leak.wav b/HomeAssistant/Sounds/Generic/US-EN-Daisy-Kitchen-Sink-Leak.wav similarity index 100% rename from HomeAssistant/Generic/US-EN-Daisy-Kitchen-Sink-Leak.wav rename to HomeAssistant/Sounds/Generic/US-EN-Daisy-Kitchen-Sink-Leak.wav diff --git a/HomeAssistant/Generic/US-EN-Daisy-Kitchen-Window-Open.wav b/HomeAssistant/Sounds/Generic/US-EN-Daisy-Kitchen-Window-Open.wav similarity index 100% rename from HomeAssistant/Generic/US-EN-Daisy-Kitchen-Window-Open.wav rename to HomeAssistant/Sounds/Generic/US-EN-Daisy-Kitchen-Window-Open.wav diff --git a/HomeAssistant/Generic/US-EN-Daisy-Laundry-Room-Leak.wav b/HomeAssistant/Sounds/Generic/US-EN-Daisy-Laundry-Room-Leak.wav similarity index 100% rename from HomeAssistant/Generic/US-EN-Daisy-Laundry-Room-Leak.wav rename to HomeAssistant/Sounds/Generic/US-EN-Daisy-Laundry-Room-Leak.wav diff --git a/HomeAssistant/Generic/US-EN-Daisy-Master-Bath-Leak.wav b/HomeAssistant/Sounds/Generic/US-EN-Daisy-Master-Bath-Leak.wav similarity index 100% rename from HomeAssistant/Generic/US-EN-Daisy-Master-Bath-Leak.wav rename to HomeAssistant/Sounds/Generic/US-EN-Daisy-Master-Bath-Leak.wav diff --git a/HomeAssistant/Generic/US-EN-Daisy-Master-Bedroom-Window-Open.wav b/HomeAssistant/Sounds/Generic/US-EN-Daisy-Master-Bedroom-Window-Open.wav similarity index 100% rename from HomeAssistant/Generic/US-EN-Daisy-Master-Bedroom-Window-Open.wav rename to HomeAssistant/Sounds/Generic/US-EN-Daisy-Master-Bedroom-Window-Open.wav diff --git a/HomeAssistant/Generic/US-EN-Daisy-Office-Window-Open.wav b/HomeAssistant/Sounds/Generic/US-EN-Daisy-Office-Window-Open.wav similarity index 100% rename from HomeAssistant/Generic/US-EN-Daisy-Office-Window-Open.wav rename to HomeAssistant/Sounds/Generic/US-EN-Daisy-Office-Window-Open.wav diff --git a/HomeAssistant/Generic/US-EN-Daisy-Refrigerator-Leak.wav b/HomeAssistant/Sounds/Generic/US-EN-Daisy-Refrigerator-Leak.wav similarity index 100% rename from HomeAssistant/Generic/US-EN-Daisy-Refrigerator-Leak.wav rename to HomeAssistant/Sounds/Generic/US-EN-Daisy-Refrigerator-Leak.wav diff --git a/HomeAssistant/Generic/US-EN-Daisy-Water-Heater-Leak.wav b/HomeAssistant/Sounds/Generic/US-EN-Daisy-Water-Heater-Leak.wav similarity index 100% rename from HomeAssistant/Generic/US-EN-Daisy-Water-Heater-Leak.wav rename to HomeAssistant/Sounds/Generic/US-EN-Daisy-Water-Heater-Leak.wav diff --git a/HomeAssistant/MorganFreeman/MorganFreemanSounds.csv b/HomeAssistant/Sounds/MorganFreeman/MorganFreemanSounds.csv similarity index 100% rename from HomeAssistant/MorganFreeman/MorganFreemanSounds.csv rename to HomeAssistant/Sounds/MorganFreeman/MorganFreemanSounds.csv diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Back-Door-Closed.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Back-Door-Closed.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Back-Door-Closed.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Back-Door-Closed.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Back-Door-Locked.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Back-Door-Locked.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Back-Door-Locked.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Back-Door-Locked.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Back-Door-Opened.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Back-Door-Opened.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Back-Door-Opened.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Back-Door-Opened.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Back-Door-Unlocked.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Back-Door-Unlocked.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Back-Door-Unlocked.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Back-Door-Unlocked.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Basement-Door-Closed.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Basement-Door-Closed.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Basement-Door-Closed.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Basement-Door-Closed.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Basement-Door-Locked.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Basement-Door-Locked.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Basement-Door-Locked.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Basement-Door-Locked.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Basement-Door-Opened.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Basement-Door-Opened.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Basement-Door-Opened.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Basement-Door-Opened.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Basement-Door-Unlocked.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Basement-Door-Unlocked.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Basement-Door-Unlocked.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Basement-Door-Unlocked.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Boss-Is-Arriving.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Boss-Is-Arriving.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Boss-Is-Arriving.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Boss-Is-Arriving.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Boyfriend-Is-Arriving.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Boyfriend-Is-Arriving.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Boyfriend-Is-Arriving.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Boyfriend-Is-Arriving.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Cleaning-Supplies-Closet-Opened.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Cleaning-Supplies-Closet-Opened.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Cleaning-Supplies-Closet-Opened.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Cleaning-Supplies-Closet-Opened.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Coworker-Is-Arriving.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Coworker-Is-Arriving.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Coworker-Is-Arriving.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Coworker-Is-Arriving.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Daughter-Is-Arriving.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Daughter-Is-Arriving.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Daughter-Is-Arriving.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Daughter-Is-Arriving.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Friend-Is-Arriving.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Friend-Is-Arriving.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Friend-Is-Arriving.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Friend-Is-Arriving.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Front-Door-Closed.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Front-Door-Closed.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Front-Door-Closed.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Front-Door-Closed.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Front-Door-Locked.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Front-Door-Locked.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Front-Door-Locked.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Front-Door-Locked.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Front-Door-Opened.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Front-Door-Opened.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Front-Door-Opened.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Front-Door-Opened.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Front-Door-Unlocked.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Front-Door-Unlocked.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Front-Door-Unlocked.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Front-Door-Unlocked.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Garage-Door-Closed.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Garage-Door-Closed.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Garage-Door-Closed.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Garage-Door-Closed.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Garage-Door-Opened.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Garage-Door-Opened.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Garage-Door-Opened.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Garage-Door-Opened.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Girlfriend-Is-Arriving.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Girlfriend-Is-Arriving.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Girlfriend-Is-Arriving.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Girlfriend-Is-Arriving.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Good-Morning.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Good-Morning.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Good-Morning.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Good-Morning.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Good-Night.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Good-Night.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Good-Night.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Good-Night.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Liquor-Cabinet-Opened.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Liquor-Cabinet-Opened.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Liquor-Cabinet-Opened.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Liquor-Cabinet-Opened.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Motion-Detected.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Motion-Detected.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Motion-Detected.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Motion-Detected.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Basement.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Basement.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Basement.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Basement.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Bedroom.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Bedroom.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Bedroom.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Bedroom.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Game-Room.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Game-Room.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Game-Room.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Game-Room.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Garage.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Garage.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Garage.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Garage.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Kitchen.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Kitchen.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Kitchen.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Kitchen.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Living-Room.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Living-Room.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Living-Room.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Living-Room.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Theater.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Theater.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Theater.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Theater.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Wine-Cellar.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Wine-Cellar.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Wine-Cellar.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Motion-In-Wine-Cellar.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Patio-Door-Closed.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Patio-Door-Closed.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Patio-Door-Closed.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Patio-Door-Closed.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Patio-Door-Locked.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Patio-Door-Locked.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Patio-Door-Locked.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Patio-Door-Locked.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Patio-Door-Opened.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Patio-Door-Opened.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Patio-Door-Opened.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Patio-Door-Opened.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Patio-Door-Unlocked.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Patio-Door-Unlocked.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Patio-Door-Unlocked.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Patio-Door-Unlocked.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Roommate-Is-Arriving.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Roommate-Is-Arriving.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Roommate-Is-Arriving.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Roommate-Is-Arriving.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Searching-For-Car-Keys.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Searching-For-Car-Keys.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Searching-For-Car-Keys.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Searching-For-Car-Keys.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Setting-The-Mood.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Setting-The-Mood.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Setting-The-Mood.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Setting-The-Mood.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Smartthings-Detected-A-Flood.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Smartthings-Detected-A-Flood.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Smartthings-Detected-A-Flood.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Smartthings-Detected-A-Flood.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Smartthings-Detected-Carbon-Monoxide.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Smartthings-Detected-Carbon-Monoxide.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Smartthings-Detected-Carbon-Monoxide.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Smartthings-Detected-Carbon-Monoxide.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Smartthings-Detected-Smoke.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Smartthings-Detected-Smoke.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Smartthings-Detected-Smoke.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Smartthings-Detected-Smoke.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Smoke-Detected-In-Basement.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Smoke-Detected-In-Basement.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Smoke-Detected-In-Basement.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Smoke-Detected-In-Basement.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Smoke-Detected-In-Garage.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Smoke-Detected-In-Garage.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Smoke-Detected-In-Garage.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Smoke-Detected-In-Garage.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Smoke-Detected-In-Kitchen.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Smoke-Detected-In-Kitchen.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Smoke-Detected-In-Kitchen.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Smoke-Detected-In-Kitchen.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Someone-Is-Arriving.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Someone-Is-Arriving.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Someone-Is-Arriving.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Someone-Is-Arriving.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Son-Is-Arriving.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Son-Is-Arriving.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Son-Is-Arriving.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Son-Is-Arriving.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Starting-Movie-Mode.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Starting-Movie-Mode.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Starting-Movie-Mode.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Starting-Movie-Mode.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Starting-Party-Mode.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Starting-Party-Mode.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Starting-Party-Mode.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Starting-Party-Mode.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Starting-Romance-Mode.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Starting-Romance-Mode.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Starting-Romance-Mode.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Starting-Romance-Mode.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-All-The-Lights.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-All-The-Lights.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-All-The-Lights.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-All-The-Lights.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Air-Conditioner.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Air-Conditioner.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Air-Conditioner.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Air-Conditioner.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Bar-Lights.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Bar-Lights.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Bar-Lights.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Bar-Lights.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Chandelier.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Chandelier.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Chandelier.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Chandelier.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Family-Room-Lights.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Family-Room-Lights.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Family-Room-Lights.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Family-Room-Lights.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Hallway-Lights.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Hallway-Lights.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Hallway-Lights.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Hallway-Lights.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Kitchen-Light.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Kitchen-Light.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Kitchen-Light.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Kitchen-Light.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Light.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Light.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Light.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Light.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Lights.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Lights.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Lights.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Lights.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Mood-Lights.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Mood-Lights.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Mood-Lights.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-Mood-Lights.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-TV.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-TV.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-TV.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-Off-The-TV.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Air-Conditioner.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Air-Conditioner.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Air-Conditioner.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Air-Conditioner.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Bar-Lights.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Bar-Lights.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Bar-Lights.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Bar-Lights.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Chandelier.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Chandelier.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Chandelier.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Chandelier.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Family-Room-Lights.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Family-Room-Lights.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Family-Room-Lights.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Family-Room-Lights.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Hallway-Lights.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Hallway-Lights.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Hallway-Lights.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Hallway-Lights.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Kitchen-Light.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Kitchen-Light.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Kitchen-Light.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Kitchen-Light.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Light.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Light.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Light.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Light.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Lights.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Lights.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Lights.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Lights.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Mood-Lights.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Mood-Lights.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Mood-Lights.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-Mood-Lights.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-TV.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-TV.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-TV.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Turning-On-The-TV.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Vacate-The-Premises.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Vacate-The-Premises.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Vacate-The-Premises.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Vacate-The-Premises.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Water-Detected-In-Basement.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Water-Detected-In-Basement.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Water-Detected-In-Basement.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Water-Detected-In-Basement.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Water-Detected-In-Garage.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Water-Detected-In-Garage.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Water-Detected-In-Garage.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Water-Detected-In-Garage.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Water-Detected-In-Kitchen.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Water-Detected-In-Kitchen.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Water-Detected-In-Kitchen.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Water-Detected-In-Kitchen.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Welcome-Home.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Welcome-Home.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Welcome-Home.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Welcome-Home.wav diff --git a/HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Wife-Is-Arriving.wav b/HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Wife-Is-Arriving.wav similarity index 100% rename from HomeAssistant/MorganFreeman/US-EN-Morgan-Freeman-Wife-Is-Arriving.wav rename to HomeAssistant/Sounds/MorganFreeman/US-EN-Morgan-Freeman-Wife-Is-Arriving.wav