diff --git a/Content.Server/Body/Components/BrainComponent.cs b/Content.Server/Body/Components/BrainComponent.cs
deleted file mode 100644
index 441bcd3154..0000000000
--- a/Content.Server/Body/Components/BrainComponent.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Content.Server.Body.Systems;
-
-namespace Content.Server.Body.Components
-{
-    [RegisterComponent, Access(typeof(BrainSystem))]
-    public sealed partial class BrainComponent : Component
-    {
-        /// <summary>
-        ///     Shitmed Change: Is this brain currently controlling the entity?
-        /// </summary>
-        [DataField]
-        public bool Active = true;
-    }
-}
diff --git a/Content.Server/Ghost/Components/GhostOnMoveComponent.cs b/Content.Server/Ghost/Components/GhostOnMoveComponent.cs
deleted file mode 100644
index e3abc97688..0000000000
--- a/Content.Server/Ghost/Components/GhostOnMoveComponent.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Content.Server.Ghost.Components
-{
-    [RegisterComponent]
-    public sealed partial class GhostOnMoveComponent : Component
-    {
-        [DataField("canReturn")] public bool CanReturn { get; set; } = true;
-
-        [DataField("mustBeDead")]
-        public bool MustBeDead = false;
-    }
-}
diff --git a/Content.Shared/Body/Components/BrainComponent.cs b/Content.Shared/Body/Components/BrainComponent.cs
new file mode 100644
index 0000000000..20d4f04a61
--- /dev/null
+++ b/Content.Shared/Body/Components/BrainComponent.cs
@@ -0,0 +1,13 @@
+using Content.Shared.Body.Systems;
+
+namespace Content.Shared.Body.Components;
+
+[RegisterComponent, Access(typeof(BrainSystem))]
+public sealed partial class BrainComponent : Component
+{
+    /// <summary>
+    ///     Shitmed Change: Is this brain currently controlling the entity?
+    /// </summary>
+    [DataField]
+    public bool Active = true;
+}
diff --git a/Content.Server/Body/Systems/BrainSystem.cs b/Content.Shared/Body/Systems/BrainSystem.cs
similarity index 90%
rename from Content.Server/Body/Systems/BrainSystem.cs
rename to Content.Shared/Body/Systems/BrainSystem.cs
index 197248dadf..cda62fc019 100644
--- a/Content.Server/Body/Systems/BrainSystem.cs
+++ b/Content.Shared/Body/Systems/BrainSystem.cs
@@ -1,23 +1,19 @@
-using Content.Server.Body.Components;
-using Content.Server.Ghost.Components;
-using Content.Shared.Body.Components;
+using Content.Shared.Body.Components;
 using Content.Shared.Body.Events;
+using Content.Shared.Ghost;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Pointing;
+using Content.Shared._Shitmed.Body.Organ; // Shitmed
+using Content.Shared.Body.Systems; // Shitmed 
 
-// Shitmed Change
-using Content.Shared._Shitmed.Body.Organ;
-using Content.Server._Shitmed.DelayedDeath;
-using Content.Shared.Body.Systems;
-
-namespace Content.Server.Body.Systems;
+namespace Content.Shared.Body.Systems;
 
 public sealed class BrainSystem : EntitySystem
 {
     [Dependency] private readonly SharedMindSystem _mindSystem = default!;
-    [Dependency] private readonly SharedBodySystem _bodySystem = default!; // Shitmed Change
+    [Dependency] private readonly SharedBodySystem _bodySystem = default!; // Shitmed
     public override void Initialize()
     {
         base.Initialize();
diff --git a/Content.Shared/Ghost/GhostOnMoveComponent.cs b/Content.Shared/Ghost/GhostOnMoveComponent.cs
new file mode 100644
index 0000000000..44cb3d0168
--- /dev/null
+++ b/Content.Shared/Ghost/GhostOnMoveComponent.cs
@@ -0,0 +1,13 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Ghost;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class GhostOnMoveComponent : Component
+{
+    [DataField]
+    public bool CanReturn = true;
+
+    [DataField]
+    public bool MustBeDead;
+}