Merge branch 'master' into buckle-locker-fix-1262

Content.Client/Construction/ConstructionMenu.cs

@@ -185,16 +185,16 @@ namespace Content.Client.Construction
                             switch (tool.ToolQuality)
                             {
                                 case ToolQuality.Anchoring:
-                                    icon = _resourceCache.GetResource<TextureResource>("/Textures/Objects/Tools/wrench.png");
+                                    icon = _resourceCache.GetResource<TextureResource>("/Textures/Objects/Tools/wrench.rsi/icon.png");
                                     text = "Wrench";
                                     break;
                                 case ToolQuality.Prying:
-                                    icon = _resourceCache.GetResource<TextureResource>("/Textures/Objects/Tools/crowbar.png");
+                                    icon = _resourceCache.GetResource<TextureResource>("/Textures/Objects/Tools/crowbar.rsi/icon.png");
                                     text = "Crowbar";
                                     break;
                                 case ToolQuality.Screwing:
                                     icon = _resourceCache.GetResource<TextureResource>(
-                                        "/Textures/Objects/Tools/screwdriver.png");
+                                        "/Textures/Objects/Tools/screwdriver.rsi/screwdriver-map.png");
                                     text = "Screwdriver";
                                     break;
                                 case ToolQuality.Welding:
@@ -204,7 +204,7 @@ namespace Content.Client.Construction
                                     break;
                                 case ToolQuality.Cutting:
                                     icon = _resourceCache.GetResource<TextureResource>(
-                                        "/Textures/Objects/Tools/wirecutter.png");
+                                        "/Textures/Objects/Tools/wirecutters.rsi/cutters-map.png");
                                     text = "Wirecutters";
                                     break;
                                 default:

Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs

@@ -53,8 +53,8 @@ namespace Content.Client.GameObjects
 
             void AddButton(out ItemSlotButton variable, Slots slot, string textureName)
             {
-                var texture = _resourceCache.GetTexture($"/Textures/UserInterface/Inventory/{textureName}.png");
-                var storageTexture = _resourceCache.GetTexture("/Textures/UserInterface/Inventory/back.png");
+                var texture = _resourceCache.GetTexture($"/Textures/Interface/Inventory/{textureName}.png");
+                var storageTexture = _resourceCache.GetTexture("/Textures/Interface/Inventory/back.png");
                 variable = new ItemSlotButton(texture, storageTexture)
                 {
                     OnPressed = (e) => AddToInventory(e, slot),
@@ -193,8 +193,8 @@ namespace Content.Client.GameObjects
 
                 void AddButton(Slots slot, string textureName, Vector2 position)
                 {
-                    var texture = resourceCache.GetTexture($"/Textures/UserInterface/Inventory/{textureName}.png");
-                    var storageTexture = resourceCache.GetTexture("/Textures/UserInterface/Inventory/back.png");
+                    var texture = resourceCache.GetTexture($"/Textures/Interface/Inventory/{textureName}.png");
+                    var storageTexture = resourceCache.GetTexture("/Textures/Interface/Inventory/back.png");
                     var button = new ItemSlotButton(texture, storageTexture);
 
                     LayoutContainer.SetPosition(button, position);

Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs

@@ -37,7 +37,7 @@ namespace Content.Client.GameObjects.Components.Kitchen
                     var audioParams = AudioParams.Default;
                     audioParams.Loop = true;
                     var schedSound = new ScheduledSound();
-                    schedSound.Filename = "/Audio/machines/microwave_loop.ogg";
+                    schedSound.Filename = "/Audio/Machines/microwave_loop.ogg";
                     schedSound.AudioParams = audioParams;
                     _loopingSoundComponent.StopAllSounds();
                     _loopingSoundComponent.AddScheduledSound(schedSound);

Content.Client/GameObjects/Components/PDA/PDAComponent.cs

@@ -17,11 +17,11 @@ namespace Content.Client.GameObjects.Components.PDA
             switch(message)
             {
                 case PDAUplinkBuySuccessMessage _ :
-                    EntitySystem.Get<AudioSystem>().Play("/Audio/effects/kaching.ogg", Owner, AudioParams.Default.WithVolume(-2f));
+                    EntitySystem.Get<AudioSystem>().Play("/Audio/Effects/kaching.ogg", Owner, AudioParams.Default.WithVolume(-2f));
                     break;
 
                 case PDAUplinkInsufficientFundsMessage _ :
-                    EntitySystem.Get<AudioSystem>().Play("/Audio/effects/error.ogg", Owner, AudioParams.Default);
+                    EntitySystem.Get<AudioSystem>().Play("/Audio/Effects/error.ogg", Owner, AudioParams.Default);
                     break;
 
             }

Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientMagazineBarrelComponent.cs

@@ -180,7 +180,7 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels
                                 },
                                 (_chamberedBullet = new TextureRect
                                 {
-                                    Texture = StaticIoC.ResC.GetTexture("/Textures/UserInterface/status/bullets/chambered.png"),
+                                    Texture = StaticIoC.ResC.GetTexture("/Textures/Interface/ItemStatus/Bullets/chambered.png"),
                                     SizeFlagsVertical = SizeFlags.ShrinkCenter,
                                     SizeFlagsHorizontal = SizeFlags.ShrinkEnd | SizeFlags.Fill,
                                 })
@@ -211,15 +211,15 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels
                 string texturePath;
                 if (capacity <= 20)
                 {
-                    texturePath = "/Textures/UserInterface/status/bullets/normal.png";
+                    texturePath = "/Textures/Interface/ItemStatus/Bullets/normal.png";
                 }
                 else if (capacity <= 30)
                 {
-                    texturePath = "/Textures/UserInterface/status/bullets/small.png";
+                    texturePath = "/Textures/Interface/ItemStatus/Bullets/small.png";
                 }
                 else
                 {
-                    texturePath = "/Textures/UserInterface/status/bullets/tiny.png";
+                    texturePath = "/Textures/Interface/ItemStatus/Bullets/tiny.png";
                 }
 
                 var texture = StaticIoC.ResC.GetTexture(texturePath);

Content.Client/GameObjects/Components/Wires/WiresMenu.cs

@@ -43,7 +43,7 @@ namespace Content.Client.GameObjects.Components.Wires
 
             MouseFilter = MouseFilterMode.Stop;
 
-            var panelTex = resourceCache.GetTexture("/Nano/button.svg.96dpi.png");
+            var panelTex = resourceCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png");
             var back = new StyleBoxTexture
             {
                 Texture = panelTex,
@@ -306,7 +306,7 @@ namespace Content.Client.GameObjects.Components.Wires
 
         private sealed class WireControl : Control
         {
-            private const string TextureContact = "/Textures/UserInterface/WireHacking/contact.svg.96dpi.png";
+            private const string TextureContact = "/Textures/Interface/WireHacking/contact.svg.96dpi.png";
 
             public event Action WireClicked;
             public event Action ContactsClicked;
@@ -405,20 +405,20 @@ namespace Content.Client.GameObjects.Components.Wires
 
                 private static readonly string[] TextureNormal =
                 {
-                    "/Textures/UserInterface/WireHacking/wire_1.svg.96dpi.png",
-                    "/Textures/UserInterface/WireHacking/wire_2.svg.96dpi.png"
+                    "/Textures/Interface/WireHacking/wire_1.svg.96dpi.png",
+                    "/Textures/Interface/WireHacking/wire_2.svg.96dpi.png"
                 };
 
                 private static readonly string[] TextureCut =
                 {
-                    "/Textures/UserInterface/WireHacking/wire_1_cut.svg.96dpi.png",
-                    "/Textures/UserInterface/WireHacking/wire_2_cut.svg.96dpi.png",
+                    "/Textures/Interface/WireHacking/wire_1_cut.svg.96dpi.png",
+                    "/Textures/Interface/WireHacking/wire_2_cut.svg.96dpi.png",
                 };
 
                 private static readonly string[] TextureCopper =
                 {
-                    "/Textures/UserInterface/WireHacking/wire_1_copper.svg.96dpi.png",
-                    "/Textures/UserInterface/WireHacking/wire_2_copper.svg.96dpi.png"
+                    "/Textures/Interface/WireHacking/wire_1_copper.svg.96dpi.png",
+                    "/Textures/Interface/WireHacking/wire_2_copper.svg.96dpi.png"
                 };
 
                 public WireRender(WireColor color, bool isCut, bool flip, bool mirror, int type)
@@ -532,7 +532,7 @@ namespace Content.Client.GameObjects.Components.Wires
                         new TextureRect
                         {
                             Texture = resC.GetTexture(
-                                "/Textures/UserInterface/WireHacking/light_off_base.svg.96dpi.png"),
+                                "/Textures/Interface/WireHacking/light_off_base.svg.96dpi.png"),
                             Stretch = TextureRect.StretchMode.KeepCentered,
                             ModulateSelfOverride = dimColor
                         },
@@ -541,7 +541,7 @@ namespace Content.Client.GameObjects.Components.Wires
                             ModulateSelfOverride = data.Color.WithAlpha(0.4f),
                             Stretch = TextureRect.StretchMode.KeepCentered,
                             Texture =
-                                resC.GetTexture("/Textures/UserInterface/WireHacking/light_on_base.svg.96dpi.png"),
+                                resC.GetTexture("/Textures/Interface/WireHacking/light_on_base.svg.96dpi.png"),
                         })
                     }
                 };

Content.Client/GameObjects/EntitySystems/VerbSystem.cs

@@ -576,7 +576,7 @@ namespace Content.Client.GameObjects.EntitySystems
                         new TextureRect
                         {
                             Texture = IoCManager.Resolve<IResourceCache>()
-                                .GetTexture("/Textures/UserInterface/VerbIcons/group.svg.96dpi.png"),
+                                .GetTexture("/Textures/Interface/VerbIcons/group.svg.96dpi.png"),
                             Stretch = TextureRect.StretchMode.KeepCentered,
                         }
                     }

Content.Client/Sandbox/SandboxManager.cs

@@ -44,6 +44,8 @@ namespace Content.Client.Sandbox
             _netManager.RegisterNetMessage<MsgSandboxStatus>(nameof(MsgSandboxStatus),
                 message => SetAllowed(message.SandboxAllowed));
 
+            _netManager.RegisterNetMessage<MsgSandboxRespawn>(nameof(MsgSandboxRespawn));
+
             _gameHud.SandboxButtonToggled = SandboxButtonPressed;
 
             _inputManager.SetInputCommand(ContentKeyFunctions.OpenEntitySpawnWindow,

Content.Client/State/LauncherConnecting.cs

@@ -34,7 +34,7 @@ namespace Content.Client.State
 
         public override void Startup()
         {
-            var panelTex = ResC.GetTexture("/Nano/button.svg.96dpi.png");
+            var panelTex = ResC.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png");
             var back = new StyleBoxTexture
             {
                 Texture = panelTex,

Content.Client/UserInterface/CharacterSetupGui.cs

@@ -45,7 +45,7 @@ namespace Content.Client.UserInterface
 
             AddChild(margin);
 
-            var panelTex = resourceCache.GetTexture("/Nano/button.svg.96dpi.png");
+            var panelTex = resourceCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png");
             var back = new StyleBoxTexture
             {
                 Texture = panelTex,

Content.Client/UserInterface/GameHud.cs

@@ -111,12 +111,12 @@ namespace Content.Client.UserInterface
             RootControl = new LayoutContainer();
             LayoutContainer.SetAnchorPreset(RootControl, LayoutContainer.LayoutPreset.Wide);
 
-            var escapeTexture = _resourceCache.GetTexture("/Textures/UserInterface/hamburger.svg.96dpi.png");
-            var characterTexture = _resourceCache.GetTexture("/Textures/UserInterface/character.svg.96dpi.png");
-            var inventoryTexture = _resourceCache.GetTexture("/Textures/UserInterface/inventory.svg.96dpi.png");
-            var craftingTexture = _resourceCache.GetTexture("/Textures/UserInterface/hammer.svg.96dpi.png");
-            var tutorialTexture = _resourceCache.GetTexture("/Textures/UserInterface/students-cap.svg.96dpi.png");
-            var sandboxTexture = _resourceCache.GetTexture("/Textures/UserInterface/sandbox.svg.96dpi.png");
+            var escapeTexture = _resourceCache.GetTexture("/Textures/Interface/hamburger.svg.96dpi.png");
+            var characterTexture = _resourceCache.GetTexture("/Textures/Interface/character.svg.96dpi.png");
+            var inventoryTexture = _resourceCache.GetTexture("/Textures/Interface/inventory.svg.96dpi.png");
+            var craftingTexture = _resourceCache.GetTexture("/Textures/Interface/hammer.svg.96dpi.png");
+            var tutorialTexture = _resourceCache.GetTexture("/Textures/Interface/students-cap.svg.96dpi.png");
+            var sandboxTexture = _resourceCache.GetTexture("/Textures/Interface/sandbox.svg.96dpi.png");
 
             _topButtonsContainer = new HBoxContainer
             {

Content.Client/UserInterface/HandsGui.cs

@@ -40,10 +40,10 @@ namespace Content.Client.UserInterface
         {
             IoCManager.InjectDependencies(this);
 
-            var textureHandLeft = _resourceCache.GetTexture("/Textures/UserInterface/Inventory/hand_l.png");
-            var textureHandRight = _resourceCache.GetTexture("/Textures/UserInterface/Inventory/hand_r.png");
-            var textureHandActive = _resourceCache.GetTexture("/Textures/UserInterface/Inventory/hand_active.png");
-            var storageTexture = _resourceCache.GetTexture("/Textures/UserInterface/Inventory/back.png");
+            var textureHandLeft = _resourceCache.GetTexture("/Textures/Interface/Inventory/hand_l.png");
+            var textureHandRight = _resourceCache.GetTexture("/Textures/Interface/Inventory/hand_r.png");
+            var textureHandActive = _resourceCache.GetTexture("/Textures/Interface/Inventory/hand_active.png");
+            var storageTexture = _resourceCache.GetTexture("/Textures/Interface/Inventory/back.png");
 
             _rightStatusPanel = new ItemStatusPanel(true);
             _leftStatusPanel = new ItemStatusPanel(false);

Content.Client/UserInterface/HumanoidProfileEditor.cs

@@ -567,7 +567,7 @@ namespace Content.Client.UserInterface
 
                 if (job.Icon != null)
                 {
-                    var specifier = new SpriteSpecifier.Rsi(new ResourcePath("/Textures/job_icons.rsi"), job.Icon);
+                    var specifier = new SpriteSpecifier.Rsi(new ResourcePath("/Textures/Interface/Misc/job_icons.rsi"), job.Icon);
                     icon.Texture = specifier.Frame0();
                 }
 

Content.Client/UserInterface/ItemStatusPanel.cs

@@ -35,8 +35,8 @@ namespace Content.Client.UserInterface
             var panel = new StyleBoxTexture
             {
                 Texture = ResC.GetTexture(isRightHand
-                    ? "/Nano/item_status_right.svg.96dpi.png"
-                    : "/Nano/item_status_left.svg.96dpi.png")
+                    ? "/Textures/Interface/Nano/item_status_right.svg.96dpi.png"
+                    : "/Textures/Interface/Nano/item_status_left.svg.96dpi.png")
             };
             panel.SetContentMarginOverride(StyleBox.Margin.Vertical, 4);
             panel.SetContentMarginOverride(StyleBox.Margin.Horizontal, 6);

Content.Client/UserInterface/LobbyGui.cs

@@ -39,7 +39,7 @@ namespace Content.Client.UserInterface
 
             AddChild(margin);
 
-            var panelTex = resourceCache.GetTexture("/Nano/button.svg.96dpi.png");
+            var panelTex = resourceCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png");
             var back = new StyleBoxTexture
             {
                 Texture = panelTex,

Content.Client/UserInterface/Stylesheets/StyleBase.cs

@@ -19,10 +19,10 @@ namespace Content.Client.UserInterface.Stylesheets
 
         protected StyleBase(IResourceCache resCache)
         {
-            var notoSans12 = resCache.GetFont("/Nano/NotoSans/NotoSans-Regular.ttf", 12);
+            var notoSans12 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Regular.ttf", 12);
 
             // Button styles.
-            var buttonTex = resCache.GetTexture("/Nano/button.svg.96dpi.png");
+            var buttonTex = resCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png");
             BaseButton = new StyleBoxTexture
             {
                 Texture = buttonTex,

Content.Client/UserInterface/Stylesheets/StyleNano.cs

@@ -41,17 +41,17 @@ namespace Content.Client.UserInterface.Stylesheets
 
         public StyleNano(IResourceCache resCache) : base(resCache)
         {
-            var notoSans10 = resCache.GetFont("/Nano/NotoSans/NotoSans-Regular.ttf", 10);
-            var notoSansItalic10 = resCache.GetFont("/Nano/NotoSans/NotoSans-Italic.ttf", 10);
-            var notoSans12 = resCache.GetFont("/Nano/NotoSans/NotoSans-Regular.ttf", 12);
-            var notoSansItalic12 = resCache.GetFont("/Nano/NotoSans/NotoSans-Italic.ttf", 12);
-            var notoSansBold12 = resCache.GetFont("/Nano/NotoSans/NotoSans-Bold.ttf", 12);
+            var notoSans10 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Regular.ttf", 10);
+            var notoSansItalic10 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Italic.ttf", 10);
+            var notoSans12 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Regular.ttf", 12);
+            var notoSansItalic12 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Italic.ttf", 12);
+            var notoSansBold12 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Bold.ttf", 12);
             var notoSansDisplayBold14 = resCache.GetFont("/Fonts/NotoSansDisplay/NotoSansDisplay-Bold.ttf", 14);
-            var notoSans16 = resCache.GetFont("/Nano/NotoSans/NotoSans-Regular.ttf", 16);
-            var notoSansBold16 = resCache.GetFont("/Nano/NotoSans/NotoSans-Bold.ttf", 16);
-            var notoSansBold20 = resCache.GetFont("/Nano/NotoSans/NotoSans-Bold.ttf", 20);
-            var textureCloseButton = resCache.GetTexture("/Nano/cross.svg.png");
-            var windowHeaderTex = resCache.GetTexture("/Nano/window_header.png");
+            var notoSans16 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Regular.ttf", 16);
+            var notoSansBold16 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Bold.ttf", 16);
+            var notoSansBold20 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Bold.ttf", 20);
+            var textureCloseButton = resCache.GetTexture("/Textures/Interface/Nano/cross.svg.png");
+            var windowHeaderTex = resCache.GetTexture("/Textures/Interface/Nano/window_header.png");
             var windowHeader = new StyleBoxTexture
             {
                 Texture = windowHeaderTex,
@@ -59,7 +59,7 @@ namespace Content.Client.UserInterface.Stylesheets
                 ExpandMarginBottom = 3,
                 ContentMarginBottomOverride = 0
             };
-            var windowBackgroundTex = resCache.GetTexture("/Nano/window_background.png");
+            var windowBackgroundTex = resCache.GetTexture("/Textures/Interface/Nano/window_background.png");
             var windowBackground = new StyleBoxTexture
             {
                 Texture = windowBackgroundTex,
@@ -67,7 +67,7 @@ namespace Content.Client.UserInterface.Stylesheets
             windowBackground.SetPatchMargin(StyleBox.Margin.Horizontal | StyleBox.Margin.Bottom, 2);
             windowBackground.SetExpandMargin(StyleBox.Margin.Horizontal | StyleBox.Margin.Bottom, 2);
 
-            var textureInvertedTriangle = resCache.GetTexture("/Nano/inverted_triangle.svg.png");
+            var textureInvertedTriangle = resCache.GetTexture("/Textures/Interface/Nano/inverted_triangle.svg.png");
 
             // Button styles.
             var buttonNormal = new StyleBoxTexture(BaseButton)
@@ -90,7 +90,7 @@ namespace Content.Client.UserInterface.Stylesheets
                 Modulate = ButtonColorDisabled
             };
 
-            var lineEditTex = resCache.GetTexture("/Nano/lineedit.png");
+            var lineEditTex = resCache.GetTexture("/Textures/Interface/Nano/lineedit.png");
             var lineEdit = new StyleBoxTexture
             {
                 Texture = lineEditTex,
@@ -98,7 +98,7 @@ namespace Content.Client.UserInterface.Stylesheets
             lineEdit.SetPatchMargin(StyleBox.Margin.All, 3);
             lineEdit.SetContentMarginOverride(StyleBox.Margin.Horizontal, 5);
 
-            var tabContainerPanelTex = resCache.GetTexture("/Nano/tabcontainer_panel.png");
+            var tabContainerPanelTex = resCache.GetTexture("/Textures/Interface/Nano/tabcontainer_panel.png");
             var tabContainerPanel = new StyleBoxTexture
             {
                 Texture = tabContainerPanelTex,
@@ -152,11 +152,11 @@ namespace Content.Client.UserInterface.Stylesheets
             progressBarForeground.SetContentMarginOverride(StyleBox.Margin.Vertical, 5);
 
             // CheckBox
-            var checkBoxTextureChecked = resCache.GetTexture("/Nano/checkbox_checked.svg.96dpi.png");
-            var checkBoxTextureUnchecked = resCache.GetTexture("/Nano/checkbox_unchecked.svg.96dpi.png");
+            var checkBoxTextureChecked = resCache.GetTexture("/Textures/Interface/Nano/checkbox_checked.svg.96dpi.png");
+            var checkBoxTextureUnchecked = resCache.GetTexture("/Textures/Interface/Nano/checkbox_unchecked.svg.96dpi.png");
 
             // Tooltip box
-            var tooltipTexture = resCache.GetTexture("/Nano/tooltip.png");
+            var tooltipTexture = resCache.GetTexture("/Textures/Interface/Nano/tooltip.png");
             var tooltipBox = new StyleBoxTexture
             {
                 Texture = tooltipTexture,
@@ -165,7 +165,7 @@ namespace Content.Client.UserInterface.Stylesheets
             tooltipBox.SetContentMarginOverride(StyleBox.Margin.Horizontal, 5);
 
             // Placeholder
-            var placeholderTexture = resCache.GetTexture("/Nano/placeholder.png");
+            var placeholderTexture = resCache.GetTexture("/Textures/Interface/Nano/placeholder.png");
             var placeholder = new StyleBoxTexture {Texture = placeholderTexture};
             placeholder.SetPatchMargin(StyleBox.Margin.All, 19);
             placeholder.SetExpandMargin(StyleBox.Margin.All, -5);
@@ -185,7 +185,7 @@ namespace Content.Client.UserInterface.Stylesheets
             itemListItemBackgroundTransparent.SetContentMarginOverride(StyleBox.Margin.Horizontal, 4);
 
             // NanoHeading
-            var nanoHeadingTex = resCache.GetTexture("/Nano/nanoheading.svg.96dpi.png");
+            var nanoHeadingTex = resCache.GetTexture("/Textures/Interface/Nano/nanoheading.svg.96dpi.png");
             var nanoHeadingBox = new StyleBoxTexture
             {
                 Texture = nanoHeadingTex,
@@ -199,7 +199,7 @@ namespace Content.Client.UserInterface.Stylesheets
             nanoHeadingBox.SetPatchMargin(StyleBox.Margin.Left | StyleBox.Margin.Bottom, 2);
 
             // Stripe background
-            var stripeBackTex = resCache.GetTexture("/Nano/stripeback.svg.96dpi.png");
+            var stripeBackTex = resCache.GetTexture("/Textures/Interface/Nano/stripeback.svg.96dpi.png");
             var stripeBack = new StyleBoxTexture
             {
                 Texture = stripeBackTex,
@@ -207,9 +207,9 @@ namespace Content.Client.UserInterface.Stylesheets
             };
 
             // Slider
-            var sliderOutlineTex = resCache.GetTexture("/Nano/slider_outline.svg.96dpi.png");
-            var sliderFillTex = resCache.GetTexture("/Nano/slider_fill.svg.96dpi.png");
-            var sliderGrabTex = resCache.GetTexture("/Nano/slider_grabber.svg.96dpi.png");
+            var sliderOutlineTex = resCache.GetTexture("/Textures/Interface/Nano/slider_outline.svg.96dpi.png");
+            var sliderFillTex = resCache.GetTexture("/Textures/Interface/Nano/slider_fill.svg.96dpi.png");
+            var sliderGrabTex = resCache.GetTexture("/Textures/Interface/Nano/slider_grabber.svg.96dpi.png");
 
             var sliderFillBox = new StyleBoxTexture
             {

Content.Client/UserInterface/Stylesheets/StyleSpace.cs

@@ -22,8 +22,8 @@ namespace Content.Client.UserInterface.Stylesheets
 
         public StyleSpace(IResourceCache resCache) : base(resCache)
         {
-            var notoSans10 = resCache.GetFont("/Nano/NotoSans/NotoSans-Regular.ttf", 10);
-            var notoSansBold16 = resCache.GetFont("/Nano/NotoSans/NotoSans-Bold.ttf", 16);
+            var notoSans10 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Regular.ttf", 10);
+            var notoSansBold16 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Bold.ttf", 16);
 
             // Button styles.
             var buttonNormal = new StyleBoxTexture(BaseButton)

Content.Client/UserInterface/TargetingDoll.cs

@@ -11,9 +11,9 @@ namespace Content.Client.UserInterface
         private TargetingZone _activeZone = TargetingZone.Middle;
         public const string StyleClassTargetDollZone = "target-doll-zone";
 
-        private const string TextureHigh = "/Textures/UserInterface/target-doll-high.svg.96dpi.png";
-        private const string TextureMiddle = "/Textures/UserInterface/target-doll-middle.svg.96dpi.png";
-        private const string TextureLow = "/Textures/UserInterface/target-doll-low.svg.96dpi.png";
+        private const string TextureHigh = "/Textures/Interface/target-doll-high.svg.96dpi.png";
+        private const string TextureMiddle = "/Textures/Interface/target-doll-middle.svg.96dpi.png";
+        private const string TextureLow = "/Textures/Interface/target-doll-low.svg.96dpi.png";
 
         private readonly TextureButton _buttonHigh;
         private readonly TextureButton _buttonMiddle;

Content.Client/UserInterface/TutorialWindow.cs

@@ -46,7 +46,7 @@ namespace Content.Client.UserInterface
             //Get section header font
             var cache = IoCManager.Resolve<IResourceCache>();
             var inputManager = IoCManager.Resolve<IInputManager>();
-            Font headerFont = new VectorFont(cache.GetResource<FontResource>("/Nano/NotoSans/NotoSans-Regular.ttf"), _headerFontSize);
+            Font headerFont = new VectorFont(cache.GetResource<FontResource>("/Textures/Interface/Nano/NotoSans/NotoSans-Regular.ttf"), _headerFontSize);
 
             var scrollContainer = new ScrollContainer();
             scrollContainer.AddChild(VBox = new VBoxContainer());

Content.IntegrationTests/Tests/AI/AiControllerTest.cs

@@ -0,0 +1,67 @@
+using NUnit.Framework;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.Interfaces.Map;
+using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Content.Server.GameObjects.Components.Movement;
+using Content.Shared.VendingMachines;
+using Robust.Server.AI;
+using Robust.Shared.Log;
+using Robust.Server.Interfaces.Maps;
+using Robust.Server.Interfaces.Timing;
+using Robust.Shared.Interfaces.Reflection;
+using Robust.Shared.IoC;
+using Robust.Shared.Maths;
+
+namespace Content.IntegrationTests.Tests
+{
+    [TestFixture]
+    [TestOf(typeof(AiControllerTest))]
+    public class AiControllerTest : ContentIntegrationTest
+    {
+        [Test]
+        public async Task AiProcessorNamesValidTest()
+        {
+            var server = StartServerDummyTicker();
+
+            server.Assert(() =>
+            {
+                var entityManager = IoCManager.Resolve<IEntityManager>();
+                var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
+                var reflectionManager = IoCManager.Resolve<IReflectionManager>();
+                var mapManager = IoCManager.Resolve<IMapManager>();
+
+                mapManager.CreateMap(new MapId(1));
+                var grid = mapManager.CreateGrid(new MapId(1));
+
+                var processorNames = new List<string>();
+
+                // Verify they all have the required attribute
+                foreach (var processor in reflectionManager.GetAllChildren(typeof(AiLogicProcessor)))
+                {
+                    var attrib = (AiLogicProcessorAttribute) Attribute.GetCustomAttribute(processor, typeof(AiLogicProcessorAttribute));
+                    Assert.That(attrib != null, $"No AiLogicProcessorAttribute found on {processor.Name}");
+                    processorNames.Add(attrib.SerializeName);
+                }
+                
+                foreach (var entity in prototypeManager.EnumeratePrototypes<EntityPrototype>())
+                {
+                    var comps = entity.Components;
+
+                    if (!comps.ContainsKey("AiController")) continue;
+
+                    var aiEntity = entityManager.SpawnEntity(entity.ID, new GridCoordinates(new Vector2(0, 0), grid.Index));
+                    var aiController = aiEntity.GetComponent<AiControllerComponent>();
+                    Assert.That(processorNames.Contains(aiController.LogicName), $"Could not find valid processor named {aiController.LogicName} on entity {entity.ID}");
+                }
+            });
+
+            await server.WaitIdleAsync();
+        }
+
+    }
+}

Content.Server/Explosions/ExplosionHelper.cs

@@ -128,7 +128,7 @@ namespace Content.Server.Explosions
                 Shaded = false
             };
             entitySystemManager.GetEntitySystem<EffectSystem>().CreateParticle(message);
-            entitySystemManager.GetEntitySystem<AudioSystem>().PlayAtCoords("/Audio/effects/explosion.ogg", coords);
+            entitySystemManager.GetEntitySystem<AudioSystem>().PlayAtCoords("/Audio/Effects/explosion.ogg", coords);
 
             // Knock back cameras of all players in the area.
 

Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs

@@ -325,7 +325,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
         private void ClickSound()
         {
 
-            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/machines/machine_switch.ogg", Owner, AudioParams.Default.WithVolume(-2f));
+            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/Machines/machine_switch.ogg", Owner, AudioParams.Default.WithVolume(-2f));
 
         }
 

Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs

@@ -46,7 +46,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
         private SolutionCaps _capabilities;
         private string _fillInitState;
         private int _fillInitSteps;
-        private string _fillPathString = "Objects/Chemistry/fillings.rsi";
+        private string _fillPathString = "Objects/Specific/Chemistry/fillings.rsi";
         private ResourcePath _fillPath;
         private SpriteSpecifier _fillSprite;
 
@@ -494,7 +494,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
             }
 
             //Play reaction sound client-side
-            _audioSystem.PlayAtCoords("/Audio/effects/chemistry/bubbles.ogg", Owner.Transform.GridPosition);
+            _audioSystem.PlayAtCoords("/Audio/Effects/chemistry/bubbles.ogg", Owner.Transform.GridPosition);
         }
 
         /// <summary>

Content.Server/GameObjects/Components/Doors/AirlockComponent.cs

@@ -382,7 +382,7 @@ namespace Content.Server.GameObjects.Components.Doors
             BoltsDown = newBolts;
 
             EntitySystem.Get<AudioSystem>()
-                .PlayFromEntity(newBolts ? "/Audio/machines/boltsdown.ogg" : "/Audio/machines/boltsup.ogg", Owner);
+                .PlayFromEntity(newBolts ? "/Audio/Machines/boltsdown.ogg" : "/Audio/Machines/boltsup.ogg", Owner);
         }
     }
 }

Content.Server/GameObjects/Components/Explosion/FlashExplosiveComponent.cs

@@ -31,7 +31,7 @@ namespace Content.Server.GameObjects.Components.Explosion
 
             serializer.DataField(ref _range, "range", 7.0f);
             serializer.DataField(ref _duration, "duration", 8.0);
-            serializer.DataField(ref _sound, "sound", "/Audio/effects/flash_bang.ogg");
+            serializer.DataField(ref _sound, "sound", "/Audio/Effects/flash_bang.ogg");
             serializer.DataField(ref _deleteOnFlash, "deleteOnFlash", true);
         }
 

Content.Server/GameObjects/Components/Fluids/BucketComponent.cs

@@ -42,7 +42,7 @@ namespace Content.Server.GameObjects.Components.Fluids
         /// <inheritdoc />
         public override void ExposeData(ObjectSerializer serializer)
         {
-            serializer.DataFieldCached(ref _sound, "sound", "/Audio/effects/Fluids/watersplash.ogg");
+            serializer.DataFieldCached(ref _sound, "sound", "/Audio/Effects/Fluids/watersplash.ogg");
         }
 
         /// <inheritdoc />

Content.Server/GameObjects/Components/Fluids/MopComponent.cs

@@ -49,7 +49,7 @@ namespace Content.Server.GameObjects.Components.Fluids
         /// <inheritdoc />
         public override void ExposeData(ObjectSerializer serializer)
         {
-            serializer.DataFieldCached(ref _pickupSound, "pickup_sound", "/Audio/effects/Fluids/slosh.ogg");
+            serializer.DataFieldCached(ref _pickupSound, "pickup_sound", "/Audio/Effects/Fluids/slosh.ogg");
             // The turbo mop will pickup more
             serializer.DataFieldCached(ref _pickupAmount, "pickup_amount", ReagentUnit.New(5));
         }

Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs

@@ -85,7 +85,7 @@ namespace Content.Server.GameObjects.Components.Fluids
         /// <inheritdoc />
         public override void ExposeData(ObjectSerializer serializer)
         {
-            serializer.DataFieldCached(ref _spillSound, "spill_sound", "/Audio/effects/Fluids/splat.ogg");
+            serializer.DataFieldCached(ref _spillSound, "spill_sound", "/Audio/Effects/Fluids/splat.ogg");
             serializer.DataField(ref _overflowVolume, "overflow_volume", ReagentUnit.New(20));
             serializer.DataField(ref _evaporateTime, "evaporate_time", 600.0f);
             // Long-term probably have this based on the underlying reagents

Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs

@@ -69,7 +69,7 @@ namespace Content.Server.GameObjects.Components.Interactable
                 return false;
             }
 
-            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/items/weapons/pistol_magin.ogg", Owner);
+            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/Items/pistol_magin.ogg", Owner);
 
 
             Dirty();
@@ -137,7 +137,7 @@ namespace Content.Server.GameObjects.Components.Interactable
             SetState(false);
             Activated = false;
 
-            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/items/flashlight_toggle.ogg", Owner);
+            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/Items/flashlight_toggle.ogg", Owner);
 
         }
 
@@ -152,7 +152,7 @@ namespace Content.Server.GameObjects.Components.Interactable
             if (cell == null)
             {
 
-                EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/machines/button.ogg", Owner);
+                EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/Machines/button.ogg", Owner);
 
                 _notifyManager.PopupMessage(Owner, user, _localizationManager.GetString("Cell missing..."));
                 return;
@@ -163,7 +163,7 @@ namespace Content.Server.GameObjects.Components.Interactable
             // Simple enough.
             if (Wattage > cell.CurrentCharge)
             {
-                EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/machines/button.ogg", Owner);
+                EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/Machines/button.ogg", Owner);
                 _notifyManager.PopupMessage(Owner, user, _localizationManager.GetString("Dead cell..."));
                 return;
             }
@@ -171,7 +171,7 @@ namespace Content.Server.GameObjects.Components.Interactable
             Activated = true;
             SetState(true);
 
-            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/items/flashlight_toggle.ogg", Owner);
+            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/Items/flashlight_toggle.ogg", Owner);
 
         }
 
@@ -219,7 +219,7 @@ namespace Content.Server.GameObjects.Components.Interactable
                 cell.Owner.Transform.GridPosition = user.Transform.GridPosition;
             }
 
-            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/items/weapons/pistol_magout.ogg", Owner);
+            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/Items/pistol_magout.ogg", Owner);
 
         }
 

Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs

@@ -53,7 +53,7 @@ namespace Content.Server.GameObjects.Components.Items
             {
                 var desiredTile = _tileDefinitionManager[_outputTile];
                 mapGrid.SetTile(eventArgs.ClickLocation, new Tile(desiredTile.TileId));
-                EntitySystem.Get<AudioSystem>().PlayAtCoords("/Audio/items/genhit.ogg", eventArgs.ClickLocation);
+                EntitySystem.Get<AudioSystem>().PlayAtCoords("/Audio/Items/genhit.ogg", eventArgs.ClickLocation);
                 if(_stack.Count < 1){
                     Owner.Delete();
                 }

Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs

@@ -2,7 +2,6 @@
 using System.Linq;
 using Content.Server.GameObjects.Components.Interactable;
 using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Interactable;
@@ -170,7 +169,7 @@ namespace Content.Server.GameObjects.Components
             }
 
             ModifyComponents();
-            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/machines/closetclose.ogg", Owner);
+            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/Machines/closetclose.ogg", Owner);
             _lastInternalOpenAttempt = default;
         }
 
@@ -179,7 +178,7 @@ namespace Content.Server.GameObjects.Components
             Open = true;
             EmptyContents();
             ModifyComponents();
-            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/machines/closetopen.ogg", Owner);
+            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/Machines/closetopen.ogg", Owner);
         }
 
         private void ModifyComponents()

Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs

@@ -109,7 +109,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage
             if (CheckAccess(user)) return;
 
             Locked = false;
-            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/machines/door_lock_off.ogg", Owner, AudioParams.Default.WithVolume(-5));
+            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/Machines/door_lock_off.ogg", Owner, AudioParams.Default.WithVolume(-5));
         }
 
         private void DoLock(IEntity user)
@@ -117,7 +117,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage
             if (CheckAccess(user)) return;
 
             Locked = true;
-            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/machines/door_lock_on.ogg", Owner, AudioParams.Default.WithVolume(-5));
+            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/Machines/door_lock_on.ogg", Owner, AudioParams.Default.WithVolume(-5));
         }
 
         private bool CheckAccess(IEntity user)

Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs

@@ -84,8 +84,8 @@ namespace Content.Server.GameObjects.Components.Kitchen
             serializer.DataField(ref _badRecipeName, "failureResult", "FoodBadRecipe");
             serializer.DataField(ref _cookTimeDefault, "cookTime", 5);
             serializer.DataField(ref _cookTimeMultiplier, "cookTimeMultiplier", 1000);
-            serializer.DataField(ref _startCookingSound, "beginCookingSound","/Audio/machines/microwave_start_beep.ogg" );
-            serializer.DataField(ref _cookingCompleteSound, "foodDoneSound","/Audio/machines/microwave_done_beep.ogg" );
+            serializer.DataField(ref _startCookingSound, "beginCookingSound","/Audio/Machines/microwave_start_beep.ogg" );
+            serializer.DataField(ref _cookingCompleteSound, "foodDoneSound","/Audio/Machines/microwave_done_beep.ogg" );
         }
 
         public override void Initialize()
@@ -442,7 +442,7 @@ namespace Content.Server.GameObjects.Components.Kitchen
 
         private void ClickSound()
         {
-            _audioSystem.PlayFromEntity("/Audio/machines/machine_switch.ogg",Owner,AudioParams.Default.WithVolume(-2f));
+            _audioSystem.PlayFromEntity("/Audio/Machines/machine_switch.ogg",Owner,AudioParams.Default.WithVolume(-2f));
         }
 
         public SuicideKind Suicide(IEntity victim, IChatManager chat)

Content.Server/GameObjects/Components/Mining/PickaxeComponent.cs

@@ -14,7 +14,7 @@ namespace Content.Server.GameObjects.Components.Mining
         public override void ExposeData(ObjectSerializer serializer)
         {
             base.ExposeData(serializer);
-            serializer.DataField(ref MiningSound, "miningSound", "/Audio/items/mining/pickaxe.ogg");
+            serializer.DataField(ref MiningSound, "miningSound", "/Audio/Items/mining/pickaxe.ogg");
             serializer.DataField(ref MiningSpeedMultiplier, "miningSpeedMultiplier", 1f);
         }
     }

Content.Server/GameObjects/Components/Mobs/BuckleComponent.cs

@@ -1,6 +1,5 @@
 #nullable enable
 using Content.Server.GameObjects.Components.Strap;
-using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces;
 using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Mobs;
@@ -57,7 +56,7 @@ namespace Content.Server.GameObjects.Components.Mobs
                 status.ChangeStatusEffectIcon(StatusEffect.Buckled,
                     Buckled
                         ? BuckledTo!.BuckledIcon
-                        : "/Textures/Mob/UI/Buckle/unbuckled.png");
+                        : "/Textures/Interface/StatusEffects/Buckle/unbuckled.png");
             }
         }
 

Content.Server/GameObjects/Components/Mobs/DamageThresholdTemplates/HumanTemplate.cs

@@ -39,17 +39,17 @@ namespace Content.Server.GameObjects
         [UsedImplicitly]
         public static readonly string[] _humanStatusImages =
         {
-            "/Textures/Mob/UI/Human/human0.png",
-            "/Textures/Mob/UI/Human/human1.png",
-            "/Textures/Mob/UI/Human/human2.png",
-            "/Textures/Mob/UI/Human/human3.png",
-            "/Textures/Mob/UI/Human/human4.png",
-            "/Textures/Mob/UI/Human/human5.png",
-            "/Textures/Mob/UI/Human/human6-0.png",
-            "/Textures/Mob/UI/Human/human6-1.png",
-            "/Textures/Mob/UI/Human/humancrit-0.png",
-            "/Textures/Mob/UI/Human/humancrit-1.png",
-            "/Textures/Mob/UI/Human/humandead.png",
+            "/Textures/Interface/StatusEffects/Human/human0.png",
+            "/Textures/Interface/StatusEffects/Human/human1.png",
+            "/Textures/Interface/StatusEffects/Human/human2.png",
+            "/Textures/Interface/StatusEffects/Human/human3.png",
+            "/Textures/Interface/StatusEffects/Human/human4.png",
+            "/Textures/Interface/StatusEffects/Human/human5.png",
+            "/Textures/Interface/StatusEffects/Human/human6-0.png",
+            "/Textures/Interface/StatusEffects/Human/human6-1.png",
+            "/Textures/Interface/StatusEffects/Human/humancrit-0.png",
+            "/Textures/Interface/StatusEffects/Human/humancrit-1.png",
+            "/Textures/Interface/StatusEffects/Human/humandead.png",
         };
 
         public override void ChangeHudState(DamageableComponent damage)
@@ -67,7 +67,7 @@ namespace Content.Server.GameObjects
                     }
                     var modifier = totaldamage / (critvalue / normalstates); //integer division floors towards zero
                     statusEffectsComponent?.ChangeStatusEffectIcon(StatusEffect.Health,
-                            "/Textures/Mob/UI/Human/human" + modifier + ".png");
+                            "/Textures/Interface/StatusEffects/Human/human" + modifier + ".png");
 
                     overlayComponent?.RemoveOverlay(OverlayType.GradientCircleMaskOverlay);
                     overlayComponent?.RemoveOverlay(OverlayType.CircleMaskOverlay);
@@ -76,7 +76,7 @@ namespace Content.Server.GameObjects
                 case ThresholdType.Critical:
                     statusEffectsComponent?.ChangeStatusEffectIcon(
                         StatusEffect.Health,
-                        "/Textures/Mob/UI/Human/humancrit-0.png");
+                        "/Textures/Interface/StatusEffects/Human/humancrit-0.png");
                     overlayComponent?.ClearOverlays();
                     overlayComponent?.AddOverlay(OverlayType.GradientCircleMaskOverlay);
 
@@ -84,7 +84,7 @@ namespace Content.Server.GameObjects
                 case ThresholdType.Death:
                     statusEffectsComponent?.ChangeStatusEffectIcon(
                         StatusEffect.Health,
-                        "/Textures/Mob/UI/Human/humandead.png");
+                        "/Textures/Interface/StatusEffects/Human/humandead.png");
                     overlayComponent?.ClearOverlays();
                     overlayComponent?.AddOverlay(OverlayType.CircleMaskOverlay);
 

Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs

@@ -71,7 +71,7 @@ namespace Content.Server.GameObjects.Components.Mobs
             serializer.DataField(ref _helpInterval, "helpInterval", 1f);
             serializer.DataField(ref _helpKnockdownRemove, "helpKnockdownRemove", 1f);
             serializer.DataField(ref _stunTexture, "stunTexture",
-                "/Textures/Objects/Melee/stunbaton.rsi/stunbaton_off.png");
+                "/Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_off.png");
         }
 
         /// <summary>
@@ -171,7 +171,7 @@ namespace Content.Server.GameObjects.Components.Mobs
             Timer.Spawn(((int) _helpInterval * 1000), () => _canHelp = true);
 
             EntitySystem.Get<AudioSystem>()
-                .PlayFromEntity("/Audio/effects/thudswoosh.ogg", Owner, AudioHelpers.WithVariation(0.25f));
+                .PlayFromEntity("/Audio/Effects/thudswoosh.ogg", Owner, AudioHelpers.WithVariation(0.25f));
 
             _knockdownTimer -= _helpKnockdownRemove;
 

Content.Server/GameObjects/Components/Movement/ServerPortalComponent.cs

@@ -49,8 +49,8 @@ namespace Content.Server.GameObjects.Components.Movement
             serializer.DataField(ref _individualPortalCooldown, "individual_cooldown", 2.1f);
             // How long before anyone can go in it
             serializer.DataField(ref _overallPortalCooldown, "overall_cooldown", 2.0f);
-            serializer.DataField(ref _departureSound, "departure_sound", "/Audio/effects/teleport_departure.ogg");
-            serializer.DataField(ref _arrivalSound, "arrival_sound", "/Audio/effects/teleport_arrival.ogg");
+            serializer.DataField(ref _departureSound, "departure_sound", "/Audio/Effects/teleport_departure.ogg");
+            serializer.DataField(ref _arrivalSound, "arrival_sound", "/Audio/Effects/teleport_arrival.ogg");
         }
 
         public override void Initialize()

Content.Server/GameObjects/Components/Movement/ServerTeleporterComponent.cs

@@ -58,8 +58,8 @@ namespace Content.Server.GameObjects.Components.Movement
             serializer.DataField(ref _chargeTime, "charge_time", 0.2f);
             serializer.DataField(ref _cooldown, "cooldown", 2.0f);
             serializer.DataField(ref _avoidCollidable, "avoid_walls", true);
-            serializer.DataField(ref _departureSound, "departure_sound", "/Audio/effects/teleport_departure.ogg");
-            serializer.DataField(ref _arrivalSound, "arrival_sound", "/Audio/effects/teleport_arrival.ogg");
+            serializer.DataField(ref _departureSound, "departure_sound", "/Audio/Effects/teleport_departure.ogg");
+            serializer.DataField(ref _arrivalSound, "arrival_sound", "/Audio/Effects/teleport_arrival.ogg");
             serializer.DataField(ref _cooldownSound, "cooldown_sound", null);
             serializer.DataField(ref _portalAliveTime, "portal_alive_time", 5.0f);  // TODO: Change this to 0 before PR?
         }

Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs

@@ -55,7 +55,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
         public override void ExposeData(ObjectSerializer serializer)
         {
             base.ExposeData(serializer);
-            serializer.DataField(ref _useSound, "useSound", "/Audio/items/drink.ogg");
+            serializer.DataField(ref _useSound, "useSound", "/Audio/Items/drink.ogg");
             serializer.DataField(ref _defaultToOpened, "isOpen", false); //For things like cups of coffee.
             serializer.DataField(ref _soundCollection, "openSounds","canOpenSounds");
         }

Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs

@@ -48,7 +48,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
         public override void ExposeData(ObjectSerializer serializer)
         {
             base.ExposeData(serializer);
-            serializer.DataField(ref _useSound, "useSound", "/Audio/items/eatfood.ogg");
+            serializer.DataField(ref _useSound, "useSound", "/Audio/Items/eatfood.ogg");
             serializer.DataField(ref _transferAmount, "transferAmount", ReagentUnit.New(5));
             serializer.DataField(ref _trashPrototype, "trash", null);
 

Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs

@@ -72,11 +72,11 @@ namespace Content.Server.GameObjects.Components.Nutrition
         [UsedImplicitly]
         public static readonly string[] _hungerThresholdImages =
         {
-            "/Textures/Mob/UI/Hunger/Overfed.png",
-            "/Textures/Mob/UI/Hunger/Okay.png",
-            "/Textures/Mob/UI/Hunger/Peckish.png",
-            "/Textures/Mob/UI/Hunger/Starving.png",
-            "/Textures/Mob/UI/Hunger/Dead.png",
+            "/Textures/Interface/StatusEffects/Hunger/Overfed.png",
+            "/Textures/Interface/StatusEffects/Hunger/Okay.png",
+            "/Textures/Interface/StatusEffects/Hunger/Peckish.png",
+            "/Textures/Interface/StatusEffects/Hunger/Starving.png",
+            "/Textures/Interface/StatusEffects/Hunger/Dead.png",
         };
 
         public void HungerThresholdEffect(bool force = false)

Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs

@@ -66,11 +66,11 @@ namespace Content.Server.GameObjects.Components.Nutrition
         [UsedImplicitly]
         public static readonly string[] _thirstThresholdImages =
         {
-            "/Textures/Mob/UI/Thirst/OverHydrated.png",
-            "/Textures/Mob/UI/Thirst/Okay.png",
-            "/Textures/Mob/UI/Thirst/Thirsty.png",
-            "/Textures/Mob/UI/Thirst/Parched.png",
-            "/Textures/Mob/UI/Thirst/Dead.png",
+            "/Textures/Interface/StatusEffects/Thirst/OverHydrated.png",
+            "/Textures/Interface/StatusEffects/Thirst/Okay.png",
+            "/Textures/Interface/StatusEffects/Thirst/Thirsty.png",
+            "/Textures/Interface/StatusEffects/Thirst/Parched.png",
+            "/Textures/Interface/StatusEffects/Thirst/Dead.png",
         };
         
         public override void ExposeData(ObjectSerializer serializer)
@@ -92,7 +92,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
 
                 // Update UI
                 Owner.TryGetComponent(out ServerStatusEffectsComponent statusEffectsComponent);
-                statusEffectsComponent?.ChangeStatusEffectIcon(StatusEffect.Thirst, "/Textures/Mob/UI/Thirst/" +
+                statusEffectsComponent?.ChangeStatusEffectIcon(StatusEffect.Thirst, "/Textures/Interface/StatusEffects/Thirst/" +
                                                                           _currentThirstThreshold + ".png");
 
                 switch (_currentThirstThreshold)

Content.Server/GameObjects/Components/PDA/PDAComponent.cs

@@ -200,7 +200,7 @@ namespace Content.Server.GameObjects.Components.PDA
         {
             _idSlot.Insert(card.Owner);
             ContainedID = card;
-            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/Guns/MagIn/batrifle_magin.ogg", Owner);
+            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/Weapons/Guns/MagIn/batrifle_magin.ogg", Owner);
         }
 
         /// <summary>
@@ -224,7 +224,7 @@ namespace Content.Server.GameObjects.Components.PDA
         {
             _lightOn = !_lightOn;
             _pdaLight.Enabled = _lightOn;
-            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/items/flashlight_toggle.ogg", Owner);
+            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/Items/flashlight_toggle.ogg", Owner);
             UpdatePDAUserInterface();
         }
 
@@ -243,7 +243,7 @@ namespace Content.Server.GameObjects.Components.PDA
             hands.PutInHandOrDrop(cardItemComponent);
             ContainedID = null;
 
-            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/machines/id_swipe.ogg", Owner);
+            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/Machines/id_swipe.ogg", Owner);
             UpdatePDAUserInterface();
         }
 

Content.Server/GameObjects/Components/PottedPlantHideComponent.cs

@@ -88,7 +88,7 @@ namespace Content.Server.GameObjects.Components
         private void Rustle()
         {
             EntitySystem.Get<AudioSystem>()
-                .PlayFromEntity("/Audio/effects/plant_rustle.ogg", Owner, AudioHelpers.WithVariation(0.25f));
+                .PlayFromEntity("/Audio/Effects/plant_rustle.ogg", Owner, AudioHelpers.WithVariation(0.25f));
         }
     }
 }

Content.Server/GameObjects/Components/Power/ApcNetComponents/ApcComponent.cs

@@ -80,7 +80,7 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents
             {
                 MainBreakerEnabled = !MainBreakerEnabled;
                 _uiDirty = true;
-                EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/machines/machine_switch.ogg", Owner, AudioParams.Default.WithVolume(-2f));
+                EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/Machines/machine_switch.ogg", Owner, AudioParams.Default.WithVolume(-2f));
             }
         }
 

Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs

@@ -100,7 +100,7 @@ namespace Content.Server.GameObjects.Components.Power
             {
                 damageableComponent.TakeDamage(DamageType.Heat, 20, Owner);
                 var audioSystem = EntitySystem.Get<AudioSystem>();
-                audioSystem.PlayFromEntity("/Audio/effects/lightburn.ogg", Owner);
+                audioSystem.PlayFromEntity("/Audio/Effects/lightburn.ogg", Owner);
             }
 
             void Eject()
@@ -193,7 +193,7 @@ namespace Content.Server.GameObjects.Components.Power
                         if (time > _lastThunk + _thunkDelay)
                         {
                             _lastThunk = time;
-                            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/machines/light_tube_on.ogg", Owner, AudioParams.Default.WithVolume(-10f));
+                            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/Machines/light_tube_on.ogg", Owner, AudioParams.Default.WithVolume(-10f));
                         }
                     }
                     else

Content.Server/GameObjects/Components/Projectiles/HitscanComponent.cs

@@ -52,10 +52,10 @@ namespace Content.Server.GameObjects.Components.Projectiles
             serializer.DataField(ref _collisionMask, "layers", (int) CollisionGroup.Opaque, WithFormat.Flags<CollisionLayer>());
             serializer.DataField(ref _damage, "damage", 10.0f);
             serializer.DataField(ref _damageType, "damageType", DamageType.Heat);
-            serializer.DataField(ref _spriteName, "spriteName", "Objects/Guns/Projectiles/laser.png");
+            serializer.DataField(ref _spriteName, "spriteName", "Objects/Weapons/Guns/Projectiles/laser.png");
             serializer.DataField(ref _muzzleFlash, "muzzleFlash", null);
             serializer.DataField(ref _impactFlash, "impactFlash", null);
-            serializer.DataField(ref _soundHitWall, "soundHitWall", "/Audio/Guns/Hits/laser_sear_wall.ogg");
+            serializer.DataField(ref _soundHitWall, "soundHitWall", "/Audio/Weapons/Guns/Hits/laser_sear_wall.ogg");
         }
 
         public void FireEffects(IEntity user, float distance, Angle angle, IEntity hitEntity = null)

Content.Server/GameObjects/Components/RotatableComponent.cs

@@ -46,7 +46,7 @@ namespace Content.Server.GameObjects.Components
 
                 data.CategoryData = VerbCategories.Rotate;
                 data.Text = "Rotate clockwise";
-                data.IconTexture = "/Textures/UserInterface/VerbIcons/rotate_cw.svg.96dpi.png";
+                data.IconTexture = "/Textures/Interface/VerbIcons/rotate_cw.svg.96dpi.png";
             }
 
             protected override void Activate(IEntity user, RotatableComponent component)
@@ -68,7 +68,7 @@ namespace Content.Server.GameObjects.Components
 
                 data.CategoryData = VerbCategories.Rotate;
                 data.Text = "Rotate counter-clockwise";
-                data.IconTexture = "/Textures/UserInterface/VerbIcons/rotate_ccw.svg.96dpi.png";
+                data.IconTexture = "/Textures/Interface/VerbIcons/rotate_ccw.svg.96dpi.png";
             }
 
             protected override void Activate(IEntity user, RotatableComponent component)

Content.Server/GameObjects/Components/Strap/StrapComponent.cs

@@ -128,8 +128,8 @@ namespace Content.Server.GameObjects.Components.Strap
             base.ExposeData(serializer);
 
             serializer.DataField(ref _position, "position", StrapPosition.None);
-            serializer.DataField(ref _buckleSound, "buckleSound", "/Audio/effects/buckle.ogg");
-            serializer.DataField(ref _unbuckleSound, "unbuckleSound", "/Audio/effects/unbuckle.ogg");
+            serializer.DataField(ref _buckleSound, "buckleSound", "/Audio/Effects/buckle.ogg");
+            serializer.DataField(ref _unbuckleSound, "unbuckleSound", "/Audio/Effects/unbuckle.ogg");
             serializer.DataField(ref _buckledIcon, "buckledIcon", "/Textures/Mob/UI/Buckle/buckled.png");
             serializer.DataField(ref _rotation, "rotation", 0);
 

Content.Server/GameObjects/Components/Utensil/UtensilComponent.cs

@@ -94,7 +94,7 @@ namespace Content.Server.GameObjects.Components.Utensil
             }
 
             serializer.DataField(ref _breakChance, "breakChance", 0);
-            serializer.DataField(ref _breakSound, "breakSound", "/Audio/items/snap.ogg");
+            serializer.DataField(ref _breakSound, "breakSound", "/Audio/Items/snap.ogg");
         }
 
         void IAfterInteract.AfterInteract(AfterInteractEventArgs eventArgs)

Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs

@@ -87,7 +87,7 @@ namespace Content.Server.GameObjects.Components.VendingMachines
             if (!string.IsNullOrEmpty(_spriteName))
             {
                 var spriteComponent = Owner.GetComponent<SpriteComponent>();
-                const string vendingMachineRSIPath = "Buildings/VendingMachines/{0}.rsi";
+                const string vendingMachineRSIPath = "Constructible/Power/VendingMachines/{0}.rsi";
                 spriteComponent.BaseRSIPath = string.Format(vendingMachineRSIPath, _spriteName);
             }
 

Content.Server/GameObjects/Components/Weapon/Melee/FlashComponent.cs

@@ -120,7 +120,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
                     });
                 }
 
-                EntitySystem.Get<AudioSystem>().PlayAtCoords("/Audio/weapons/flash.ogg", Owner.Transform.GridPosition,
+                EntitySystem.Get<AudioSystem>().PlayAtCoords("/Audio/Weapons/flash.ogg", Owner.Transform.GridPosition,
                     AudioParams.Default);
 
                 return true;

Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs

@@ -77,7 +77,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
             serializer.DataField(ref _range, "range", 1);
             serializer.DataField(ref _arcWidth, "arcwidth", 90);
             serializer.DataField(ref _arc, "arc", "default");
-            serializer.DataField(ref _hitSound, "hitSound", "/Audio/weapons/genhit1.ogg");
+            serializer.DataField(ref _hitSound, "hitSound", "/Audio/Weapons/genhit1.ogg");
             serializer.DataField(ref _cooldownTime, "cooldownTime", 1f);
         }
 
@@ -116,7 +116,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
 
             var audioSystem = EntitySystem.Get<AudioSystem>();
             var emitter = hitEntities.Count == 0 ? eventArgs.User : hitEntities[0];
-            audioSystem.PlayFromEntity(hitEntities.Count > 0 ? _hitSound : "/Audio/weapons/punchmiss.ogg", emitter);
+            audioSystem.PlayFromEntity(hitEntities.Count > 0 ? _hitSound : "/Audio/Weapons/punchmiss.ogg", emitter);
 
             if (Arc != null)
             {

Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs

@@ -96,7 +96,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
             {
                 return false;
             }
-            EntitySystem.Get<AudioSystem>().PlayAtCoords("/Audio/weapons/egloves.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f));
+            EntitySystem.Get<AudioSystem>().PlayAtCoords("/Audio/Weapons/egloves.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f));
 
             foreach (var entity in entities)
             {
@@ -166,7 +166,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
 
             if (cell == null)
             {
-                EntitySystem.Get<AudioSystem>().PlayAtCoords("/Audio/machines/button.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f));
+                EntitySystem.Get<AudioSystem>().PlayAtCoords("/Audio/Machines/button.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f));
 
                 _notifyManager.PopupMessage(Owner, user, _localizationManager.GetString("Cell missing..."));
                 return;
@@ -174,7 +174,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
 
             if (cell.CurrentCharge < EnergyPerUse)
             {
-                EntitySystem.Get<AudioSystem>().PlayAtCoords("/Audio/machines/button.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f));
+                EntitySystem.Get<AudioSystem>().PlayAtCoords("/Audio/Machines/button.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f));
                 _notifyManager.PopupMessage(Owner, user, _localizationManager.GetString("Dead cell..."));
                 return;
             }
@@ -206,7 +206,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
                 return false;
             }
 
-            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/items/weapons/pistol_magin.ogg", Owner);
+            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/Items/pistol_magin.ogg", Owner);
 
             Dirty();
 
@@ -237,7 +237,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
                 cell.Owner.Transform.GridPosition = user.Transform.GridPosition;
             }
 
-            EntitySystem.Get<AudioSystem>().PlayAtCoords("/Audio/items/weapons/pistol_magout.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f));
+            EntitySystem.Get<AudioSystem>().PlayAtCoords("/Audio/Items/pistol_magout.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f));
         }
 
         public void Examine(FormattedMessage message, bool inDetailsRange)

Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs

@@ -89,7 +89,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition
             serializer.DataField(ref _caseless, "caseless", false);
             // Being both caseless and shooting yourself doesn't make sense
             DebugTools.Assert(!(_ammoIsProjectile && _caseless));
-            serializer.DataField(ref _muzzleFlashSprite, "muzzleFlash", "Objects/Guns/Projectiles/bullet_muzzle.png");
+            serializer.DataField(ref _muzzleFlashSprite, "muzzleFlash", "Objects/Weapons/Guns/Projectiles/bullet_muzzle.png");
             serializer.DataField(ref _soundCollectionEject, "soundCollectionEject", "CasingEject");
 
             if (_projectilesFired < 1)

Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs

@@ -103,10 +103,10 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
             serializer.DataField(ref _fillPrototype, "fillPrototype", null);
             serializer.DataField(ref _autoCycle, "autoCycle", false);
 
-            serializer.DataField(ref _soundCycle, "soundCycle", "/Audio/Guns/Cock/sf_rifle_cock.ogg");
-            serializer.DataField(ref _soundBoltOpen, "soundBoltOpen", "/Audio/Guns/Bolt/rifle_bolt_open.ogg");
-            serializer.DataField(ref _soundBoltClosed, "soundBoltClosed", "/Audio/Guns/Bolt/rifle_bolt_closed.ogg");
-            serializer.DataField(ref _soundInsert, "soundInsert", "/Audio/Guns/MagIn/bullet_insert.ogg");
+            serializer.DataField(ref _soundCycle, "soundCycle", "/Audio/Weapons/Guns/Cock/sf_rifle_cock.ogg");
+            serializer.DataField(ref _soundBoltOpen, "soundBoltOpen", "/Audio/Weapons/Guns/Bolt/rifle_bolt_open.ogg");
+            serializer.DataField(ref _soundBoltClosed, "soundBoltClosed", "/Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg");
+            serializer.DataField(ref _soundInsert, "soundInsert", "/Audio/Weapons/Guns/MagIn/bullet_insert.ogg");
         }
 
         void IMapInit.MapInit()

Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs

@@ -66,8 +66,8 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
             serializer.DataField(ref _fillPrototype, "fillPrototype", null);
             serializer.DataField(ref _manualCycle, "manualCycle", true);
 
-            serializer.DataField(ref _soundCycle, "soundCycle", "/Audio/Guns/Cock/sf_rifle_cock.ogg");
-            serializer.DataField(ref _soundInsert, "soundInsert", "/Audio/Guns/MagIn/bullet_insert.ogg");
+            serializer.DataField(ref _soundCycle, "soundCycle", "/Audio/Weapons/Guns/Cock/sf_rifle_cock.ogg");
+            serializer.DataField(ref _soundInsert, "soundInsert", "/Audio/Weapons/Guns/MagIn/bullet_insert.ogg");
 
             _spawnedAmmo = new Stack<IEntity>(_capacity - 1);
         }

Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/RevolverBarrelComponent.cs

@@ -58,9 +58,9 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
             serializer.DataField(ref _fillPrototype, "fillPrototype", null);
 
             // Sounds
-            serializer.DataField(ref _soundEject, "soundEject", "/Audio/Guns/MagOut/revolver_magout.ogg");
-            serializer.DataField(ref _soundInsert, "soundInsert", "/Audio/Guns/MagIn/revolver_magin.ogg");
-            serializer.DataField(ref _soundSpin, "soundSpin", "/Audio/Guns/Misc/revolver_spin.ogg");
+            serializer.DataField(ref _soundEject, "soundEject", "/Audio/Weapons/Guns/MagOut/revolver_magout.ogg");
+            serializer.DataField(ref _soundInsert, "soundInsert", "/Audio/Weapons/Guns/MagIn/revolver_magin.ogg");
+            serializer.DataField(ref _soundSpin, "soundSpin", "/Audio/Weapons/Guns/Misc/revolver_spin.ogg");
         }
 
         public override void Initialize()

Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs

@@ -114,7 +114,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
             serializer.DataField(ref _soundRack, "soundRack", null);
             serializer.DataField(ref _soundMagInsert, "soundMagInsert", null);
             serializer.DataField(ref _soundMagEject, "soundMagEject", null);
-            serializer.DataField(ref _soundAutoEject, "soundAutoEject", "/Audio/Guns/EmptyAlarm/smg_empty_alarm.ogg");
+            serializer.DataField(ref _soundAutoEject, "soundAutoEject", "/Audio/Weapons/Guns/EmptyAlarm/smg_empty_alarm.ogg");
         }
 
         public override ComponentState GetComponentState()

Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs

@@ -121,7 +121,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
             serializer.DataField(ref _canMuzzleFlash, "canMuzzleFlash", true);
             // Sounds
             serializer.DataField(ref _soundGunshot, "soundGunshot", null);
-            serializer.DataField(ref _soundEmpty, "soundEmpty", "/Audio/Guns/Empty/empty.ogg");
+            serializer.DataField(ref _soundEmpty, "soundEmpty", "/Audio/Weapons/Guns/Empty/empty.ogg");
         }
 
         public override void OnAdd()

Content.Server/GameObjects/Components/WiresComponent.cs

@@ -430,7 +430,7 @@ namespace Content.Server.GameObjects.Components
                                 return;
                             }
 
-                            _audioSystem.PlayFromEntity("/Audio/effects/multitool_pulse.ogg", Owner);
+                            _audioSystem.PlayFromEntity("/Audio/Effects/multitool_pulse.ogg", Owner);
                             break;
                     }
 
@@ -476,7 +476,7 @@ namespace Content.Server.GameObjects.Components
 
             IsPanelOpen = !IsPanelOpen;
             EntitySystem.Get<AudioSystem>()
-                .PlayFromEntity(IsPanelOpen ? "/Audio/machines/screwdriveropen.ogg" : "/Audio/machines/screwdriverclose.ogg",
+                .PlayFromEntity(IsPanelOpen ? "/Audio/Machines/screwdriveropen.ogg" : "/Audio/Machines/screwdriverclose.ogg",
                     Owner);
             return true;
         }

Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs

@@ -40,17 +40,15 @@ namespace Content.Server.GameObjects.EntitySystems.AI
             foreach (var processor in processors)
             {
                 var att = (AiLogicProcessorAttribute)Attribute.GetCustomAttribute(processor, typeof(AiLogicProcessorAttribute));
-                if (att != null)
-                {
+                // Tests should pick this up
+                DebugTools.AssertNotNull(att);
                 _processorTypes.Add(att.SerializeName, processor);
             }
         }
-        }
 
         /// <inheritdoc />
         public override void Update(float frameTime)
         {
-
             var entities = EntityManager.GetEntities(EntityQuery);
             foreach (var entity in entities)
             {
@@ -77,15 +75,14 @@ namespace Content.Server.GameObjects.EntitySystems.AI
             if (controller.Processor != null) return;
             controller.Processor = CreateProcessor(controller.LogicName);
             controller.Processor.SelfEntity = controller.Owner;
-            controller.Processor.VisionRadius = controller.VisionRadius;
             controller.Processor.Setup();
         }
 
-        private UtilityAi CreateProcessor(string name)
+        private AiLogicProcessor CreateProcessor(string name)
         {
             if (_processorTypes.TryGetValue(name, out var type))
             {
-                return (UtilityAi)_typeFactory.CreateInstance(type);
+                return (AiLogicProcessor)_typeFactory.CreateInstance(type);
             }
 
             // processor needs to inherit AiLogicProcessor, and needs an AiLogicProcessorAttribute to define the YAML name

Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs

@@ -275,7 +275,7 @@ namespace Content.Server.GameObjects.EntitySystems
             }
 
             // OK WE'RE GOOD CONSTRUCTION STARTED.
-            Get<AudioSystem>().PlayAtCoords("/Audio/items/deconstruct.ogg", loc);
+            Get<AudioSystem>().PlayAtCoords("/Audio/Items/deconstruct.ogg", loc);
             if (prototype.Stages.Count == 2)
             {
                 // Exactly 2 stages, so don't make an intermediate frame.
@@ -327,7 +327,7 @@ namespace Content.Server.GameObjects.EntitySystems
             }
 
             // OK WE'RE GOOD CONSTRUCTION STARTED.
-            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/items/deconstruct.ogg", placingEnt);
+            EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/Items/deconstruct.ogg", placingEnt);
             if (prototype.Stages.Count == 2)
             {
                 // Exactly 2 stages, so don't make an intermediate frame.

Content.Server/GameObjects/EntitySystems/GravitySystem.cs

@@ -93,7 +93,7 @@ namespace Content.Server.Interfaces.GameObjects.Components.Interaction
             {
                 if (player.AttachedEntity == null
                     || player.AttachedEntity.Transform.GridID != gridId) continue;
-                EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/effects/alert.ogg", player.AttachedEntity);
+                EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/Effects/alert.ogg", player.AttachedEntity);
             }
         }
 

Content.Shared/GameObjects/Verbs/VerbCategories.cs

@@ -6,7 +6,7 @@ namespace Content.Shared.GameObjects
     public static class VerbCategories
     {
         public static readonly VerbCategoryData Debug =
-            ("Debug", "/Textures/UserInterface/VerbIcons/debug.svg.96dpi.png");
+            ("Debug", "/Textures/Interface/VerbIcons/debug.svg.96dpi.png");
 
         public static readonly VerbCategoryData Rotate = ("Rotate", null);
     }

Resources/.gitignore

@@ -3,5 +3,5 @@
 # you can do a negation with !.
 *.import
 # Negation would be like this:
-#!/Textures/UserInterface/handsbox.png.import
+#!/Textures/Interface/handsbox.png.import
 /I_MADE_THE_SYMLINK