diff --git a/NewHorizons/Builder/Body/BrambleDimensionBuilder.cs b/NewHorizons/Builder/Body/BrambleDimensionBuilder.cs
index 02f32731..13291446 100644
--- a/NewHorizons/Builder/Body/BrambleDimensionBuilder.cs
+++ b/NewHorizons/Builder/Body/BrambleDimensionBuilder.cs
@@ -10,6 +10,7 @@ using System.Linq;
 using UnityEngine;
 using Logger = NewHorizons.Utility.Logger;
 using static NewHorizons.Main;
+using NewHorizons.Utility.OWMLUtilities;
 
 namespace NewHorizons.Builder.Body
 {
diff --git a/NewHorizons/Builder/Body/CloakBuilder.cs b/NewHorizons/Builder/Body/CloakBuilder.cs
index 4b0ee558..33804959 100644
--- a/NewHorizons/Builder/Body/CloakBuilder.cs
+++ b/NewHorizons/Builder/Body/CloakBuilder.cs
@@ -1,6 +1,7 @@
 using NewHorizons.Components;
 using NewHorizons.External.Modules;
 using NewHorizons.Utility;
+using NewHorizons.Utility.OWMLUtilities;
 using OWML.Common;
 using UnityEngine;
 using Logger = NewHorizons.Utility.Logger;
diff --git a/NewHorizons/Builder/Body/FunnelBuilder.cs b/NewHorizons/Builder/Body/FunnelBuilder.cs
index aeeea881..a7ce3724 100644
--- a/NewHorizons/Builder/Body/FunnelBuilder.cs
+++ b/NewHorizons/Builder/Body/FunnelBuilder.cs
@@ -5,6 +5,7 @@ using UnityEngine;
 using Logger = NewHorizons.Utility.Logger;
 using NewHorizons.External.Modules.VariableSize;
 using NewHorizons.Components.Orbital;
+using NewHorizons.Utility.OWMLUtilities;
 
 namespace NewHorizons.Builder.Body
 {
diff --git a/NewHorizons/Builder/Body/SingularityBuilder.cs b/NewHorizons/Builder/Body/SingularityBuilder.cs
index 96466121..79b4d61b 100644
--- a/NewHorizons/Builder/Body/SingularityBuilder.cs
+++ b/NewHorizons/Builder/Body/SingularityBuilder.cs
@@ -10,6 +10,7 @@ using NewHorizons.Components.SizeControllers;
 using System.Drawing;
 using Color = UnityEngine.Color;
 using NewHorizons.Components.Volumes;
+using NewHorizons.Utility.OWMLUtilities;
 
 namespace NewHorizons.Builder.Body
 {
diff --git a/NewHorizons/Builder/Body/WaterBuilder.cs b/NewHorizons/Builder/Body/WaterBuilder.cs
index 857358e5..e71e957c 100644
--- a/NewHorizons/Builder/Body/WaterBuilder.cs
+++ b/NewHorizons/Builder/Body/WaterBuilder.cs
@@ -3,6 +3,7 @@ using NewHorizons.Utility;
 using UnityEngine;
 using NewHorizons.External.Modules.VariableSize;
 using Tessellation;
+using NewHorizons.Utility.OWMLUtilities;
 
 namespace NewHorizons.Builder.Body
 {
diff --git a/NewHorizons/Builder/General/AstroObjectBuilder.cs b/NewHorizons/Builder/General/AstroObjectBuilder.cs
index 26eb7f3b..c1120159 100644
--- a/NewHorizons/Builder/General/AstroObjectBuilder.cs
+++ b/NewHorizons/Builder/General/AstroObjectBuilder.cs
@@ -1,6 +1,6 @@
 using NewHorizons.Components.Orbital;
 using NewHorizons.External.Configs;
-using NewHorizons.Utility;
+using NewHorizons.Utility.OWMLUtilities;
 using UnityEngine;
 using Logger = NewHorizons.Utility.Logger;
 namespace NewHorizons.Builder.General
diff --git a/NewHorizons/Builder/General/SpawnPointBuilder.cs b/NewHorizons/Builder/General/SpawnPointBuilder.cs
index 437fb1b6..f773fc85 100644
--- a/NewHorizons/Builder/General/SpawnPointBuilder.cs
+++ b/NewHorizons/Builder/General/SpawnPointBuilder.cs
@@ -1,5 +1,6 @@
 using NewHorizons.External.Modules;
 using NewHorizons.Utility;
+using NewHorizons.Utility.OWMLUtilities;
 using System;
 using System.Reflection;
 using UnityEngine;
diff --git a/NewHorizons/Builder/Orbital/OrbitlineBuilder.cs b/NewHorizons/Builder/Orbital/OrbitlineBuilder.cs
index 88ebf55b..e0fa3a58 100644
--- a/NewHorizons/Builder/Orbital/OrbitlineBuilder.cs
+++ b/NewHorizons/Builder/Orbital/OrbitlineBuilder.cs
@@ -1,6 +1,7 @@
 using NewHorizons.Components.Orbital;
 using NewHorizons.External.Configs;
 using NewHorizons.Utility;
+using NewHorizons.Utility.OWMLUtilities;
 using UnityEngine;
 namespace NewHorizons.Builder.Orbital
 {
diff --git a/NewHorizons/Builder/Props/BrambleNodeBuilder.cs b/NewHorizons/Builder/Props/BrambleNodeBuilder.cs
index 6b8415cd..a4bdeebb 100644
--- a/NewHorizons/Builder/Props/BrambleNodeBuilder.cs
+++ b/NewHorizons/Builder/Props/BrambleNodeBuilder.cs
@@ -3,6 +3,7 @@ using NewHorizons.Components;
 using NewHorizons.External.Configs;
 using NewHorizons.Handlers;
 using NewHorizons.Utility;
+using NewHorizons.Utility.OWMLUtilities;
 using OWML.Common;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/NewHorizons/Builder/Props/GeyserBuilder.cs b/NewHorizons/Builder/Props/GeyserBuilder.cs
index 11c9f02c..5315e091 100644
--- a/NewHorizons/Builder/Props/GeyserBuilder.cs
+++ b/NewHorizons/Builder/Props/GeyserBuilder.cs
@@ -1,5 +1,6 @@
 using NewHorizons.External.Modules;
 using NewHorizons.Utility;
+using NewHorizons.Utility.OWMLUtilities;
 using UnityEngine;
 using Logger = NewHorizons.Utility.Logger;
 
diff --git a/NewHorizons/Builder/Props/NomaiTextBuilder.cs b/NewHorizons/Builder/Props/NomaiTextBuilder.cs
index 5e630fec..c0910bfa 100644
--- a/NewHorizons/Builder/Props/NomaiTextBuilder.cs
+++ b/NewHorizons/Builder/Props/NomaiTextBuilder.cs
@@ -1,6 +1,7 @@
 using NewHorizons.External.Modules;
 using NewHorizons.Handlers;
 using NewHorizons.Utility;
+using NewHorizons.Utility.OWMLUtilities;
 using OWML.Common;
 using OWML.Utils;
 using System;
diff --git a/NewHorizons/Builder/Props/QuantumBuilder.cs b/NewHorizons/Builder/Props/QuantumBuilder.cs
index 8a5a383b..e7e1423f 100644
--- a/NewHorizons/Builder/Props/QuantumBuilder.cs
+++ b/NewHorizons/Builder/Props/QuantumBuilder.cs
@@ -2,7 +2,7 @@ using HarmonyLib;
 using NewHorizons.Components.Quantum;
 using NewHorizons.External.Configs;
 using NewHorizons.External.Modules;
-using NewHorizons.Utility;
+using NewHorizons.Utility.UnityUtilities;
 using OWML.Common;
 using System;
 using System.Collections.Generic;
diff --git a/NewHorizons/Builder/Props/ScatterBuilder.cs b/NewHorizons/Builder/Props/ScatterBuilder.cs
index f6583c4d..827453df 100644
--- a/NewHorizons/Builder/Props/ScatterBuilder.cs
+++ b/NewHorizons/Builder/Props/ScatterBuilder.cs
@@ -1,6 +1,7 @@
 using NewHorizons.External.Configs;
 using NewHorizons.External.Modules;
 using NewHorizons.Utility;
+using NewHorizons.Utility.OWMLUtilities;
 using OWML.Common;
 using System;
 using System.Collections.Generic;
diff --git a/NewHorizons/Builder/Props/SignalBuilder.cs b/NewHorizons/Builder/Props/SignalBuilder.cs
index 876fc2c2..b6d0669f 100644
--- a/NewHorizons/Builder/Props/SignalBuilder.cs
+++ b/NewHorizons/Builder/Props/SignalBuilder.cs
@@ -1,5 +1,6 @@
 using NewHorizons.External.Modules;
 using NewHorizons.Utility;
+using NewHorizons.Utility.OWMLUtilities;
 using OWML.Common;
 using OWML.Utils;
 using System.Collections.Generic;
diff --git a/NewHorizons/Builder/Props/TornadoBuilder.cs b/NewHorizons/Builder/Props/TornadoBuilder.cs
index 2b63bd52..4b5b4db8 100644
--- a/NewHorizons/Builder/Props/TornadoBuilder.cs
+++ b/NewHorizons/Builder/Props/TornadoBuilder.cs
@@ -2,6 +2,7 @@ using NewHorizons.Components;
 using NewHorizons.External.Modules;
 using NewHorizons.Handlers;
 using NewHorizons.Utility;
+using NewHorizons.Utility.OWMLUtilities;
 using System;
 using UnityEngine;
 using Logger = NewHorizons.Utility.Logger;
diff --git a/NewHorizons/Builder/Props/TranslatorText/NomaiTextArcArranger.cs b/NewHorizons/Builder/Props/TranslatorText/NomaiTextArcArranger.cs
index d05bda58..1ef74572 100644
--- a/NewHorizons/Builder/Props/TranslatorText/NomaiTextArcArranger.cs
+++ b/NewHorizons/Builder/Props/TranslatorText/NomaiTextArcArranger.cs
@@ -1,4 +1,4 @@
-using NewHorizons.Utility;
+using NewHorizons.Utility.UnityUtilities;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/NewHorizons/Builder/Props/TranslatorText/TranslatorTextBuilder.cs b/NewHorizons/Builder/Props/TranslatorText/TranslatorTextBuilder.cs
index 96899393..533d5fa3 100644
--- a/NewHorizons/Builder/Props/TranslatorText/TranslatorTextBuilder.cs
+++ b/NewHorizons/Builder/Props/TranslatorText/TranslatorTextBuilder.cs
@@ -13,6 +13,8 @@ using Random = UnityEngine.Random;
 using OWML.Utils;
 using Newtonsoft.Json;
 using System;
+using NewHorizons.Utility.OWMLUtilities;
+using NewHorizons.Utility.UnityUtilities;
 
 namespace NewHorizons.Builder.Props
 {
diff --git a/NewHorizons/Builder/Props/VolcanoBuilder.cs b/NewHorizons/Builder/Props/VolcanoBuilder.cs
index e5e90235..0a552a38 100644
--- a/NewHorizons/Builder/Props/VolcanoBuilder.cs
+++ b/NewHorizons/Builder/Props/VolcanoBuilder.cs
@@ -1,5 +1,6 @@
 using NewHorizons.External.Modules;
 using NewHorizons.Utility;
+using NewHorizons.Utility.OWMLUtilities;
 using UnityEngine;
 using Logger = NewHorizons.Utility.Logger;
 
diff --git a/NewHorizons/Builder/ShipLog/RumorModeBuilder.cs b/NewHorizons/Builder/ShipLog/RumorModeBuilder.cs
index 0543b0ae..cdba01fa 100644
--- a/NewHorizons/Builder/ShipLog/RumorModeBuilder.cs
+++ b/NewHorizons/Builder/ShipLog/RumorModeBuilder.cs
@@ -2,6 +2,7 @@ using NewHorizons.External.Configs;
 using NewHorizons.External.Modules;
 using NewHorizons.Handlers;
 using NewHorizons.Utility;
+using NewHorizons.Utility.OWMLUtilities;
 using OWML.Utils;
 using System;
 using System.Collections.Generic;
diff --git a/NewHorizons/Builder/StarSystem/SkyboxBuilder.cs b/NewHorizons/Builder/StarSystem/SkyboxBuilder.cs
index 8fb429ea..0ef97d83 100644
--- a/NewHorizons/Builder/StarSystem/SkyboxBuilder.cs
+++ b/NewHorizons/Builder/StarSystem/SkyboxBuilder.cs
@@ -1,5 +1,6 @@
 using NewHorizons.External.Configs;
 using NewHorizons.Utility;
+using NewHorizons.Utility.OWMLUtilities;
 using OWML.Common;
 using System;
 using UnityEngine;
diff --git a/NewHorizons/Components/RingOpacityController.cs b/NewHorizons/Components/RingOpacityController.cs
index df707a33..0f762506 100644
--- a/NewHorizons/Components/RingOpacityController.cs
+++ b/NewHorizons/Components/RingOpacityController.cs
@@ -1,6 +1,5 @@
 using NewHorizons.Components.Volumes;
 using NewHorizons.External.Modules.VariableSize;
-using NewHorizons.Utility;
 using UnityEngine;
 
 namespace NewHorizons.Components
diff --git a/NewHorizons/Components/ShipLog/ShipLogStarChartMode.cs b/NewHorizons/Components/ShipLog/ShipLogStarChartMode.cs
index 03510628..8582c1ad 100644
--- a/NewHorizons/Components/ShipLog/ShipLogStarChartMode.cs
+++ b/NewHorizons/Components/ShipLog/ShipLogStarChartMode.cs
@@ -1,5 +1,6 @@
 using NewHorizons.Handlers;
 using NewHorizons.Utility;
+using NewHorizons.Utility.OWMLUtilities;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/NewHorizons/Components/ShipWarpController.cs b/NewHorizons/Components/ShipWarpController.cs
index 3ff96a3a..8bfa4bee 100644
--- a/NewHorizons/Components/ShipWarpController.cs
+++ b/NewHorizons/Components/ShipWarpController.cs
@@ -1,5 +1,6 @@
 using NewHorizons.Builder.General;
 using NewHorizons.Utility;
+using NewHorizons.Utility.OWMLUtilities;
 using UnityEngine;
 using Logger = NewHorizons.Utility.Logger;
 namespace NewHorizons.Components
diff --git a/NewHorizons/Components/SizeControllers/SizeController.cs b/NewHorizons/Components/SizeControllers/SizeController.cs
index 334f5a84..eb9b6264 100644
--- a/NewHorizons/Components/SizeControllers/SizeController.cs
+++ b/NewHorizons/Components/SizeControllers/SizeController.cs
@@ -1,4 +1,4 @@
-using NewHorizons.Utility;
+using NewHorizons.External.Modules.VariableSize;
 using UnityEngine;
 namespace NewHorizons.Components.SizeControllers
 {
diff --git a/NewHorizons/Components/SizeControllers/StarEvolutionController.cs b/NewHorizons/Components/SizeControllers/StarEvolutionController.cs
index 6c84317e..c0d6508e 100644
--- a/NewHorizons/Components/SizeControllers/StarEvolutionController.cs
+++ b/NewHorizons/Components/SizeControllers/StarEvolutionController.cs
@@ -4,6 +4,7 @@ using NewHorizons.Components.Stars;
 using NewHorizons.External.Modules.VariableSize;
 using NewHorizons.Handlers;
 using NewHorizons.Utility;
+using NewHorizons.Utility.OWMLUtilities;
 using System;
 using System.Linq;
 using UnityEngine;
diff --git a/NewHorizons/External/Modules/RingModule.cs b/NewHorizons/External/Modules/RingModule.cs
index a5c93c4c..ef60c6cf 100644
--- a/NewHorizons/External/Modules/RingModule.cs
+++ b/NewHorizons/External/Modules/RingModule.cs
@@ -1,6 +1,6 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-using NewHorizons.Utility;
+using NewHorizons.External.Modules.VariableSize;
 using Newtonsoft.Json;
 
 namespace NewHorizons.External.Modules
diff --git a/NewHorizons/Utility/TimeValuePair.cs b/NewHorizons/External/Modules/VariableSize/TimeValuePair.cs
similarity index 85%
rename from NewHorizons/Utility/TimeValuePair.cs
rename to NewHorizons/External/Modules/VariableSize/TimeValuePair.cs
index acacda16..38ec9be3 100644
--- a/NewHorizons/Utility/TimeValuePair.cs
+++ b/NewHorizons/External/Modules/VariableSize/TimeValuePair.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace NewHorizons.Utility
+namespace NewHorizons.External.Modules.VariableSize
 {
     [JsonObject]
     public class TimeValuePair
diff --git a/NewHorizons/External/Modules/VariableSize/VariableSizeModule.cs b/NewHorizons/External/Modules/VariableSize/VariableSizeModule.cs
index 92ba2dd1..5e5767b1 100644
--- a/NewHorizons/External/Modules/VariableSize/VariableSizeModule.cs
+++ b/NewHorizons/External/Modules/VariableSize/VariableSizeModule.cs
@@ -1,4 +1,3 @@
-using NewHorizons.Utility;
 using Newtonsoft.Json;
 using UnityEngine;
 
diff --git a/NewHorizons/Handlers/AudioTypeHandler.cs b/NewHorizons/Handlers/AudioTypeHandler.cs
index ee12465a..db7c784b 100644
--- a/NewHorizons/Handlers/AudioTypeHandler.cs
+++ b/NewHorizons/Handlers/AudioTypeHandler.cs
@@ -1,4 +1,5 @@
 using NewHorizons.Utility;
+using NewHorizons.Utility.OWMLUtilities;
 using OWML.Common;
 using OWML.Utils;
 using System;
diff --git a/NewHorizons/Handlers/PlanetCreationHandler.cs b/NewHorizons/Handlers/PlanetCreationHandler.cs
index e69411ee..c4ec1980 100644
--- a/NewHorizons/Handlers/PlanetCreationHandler.cs
+++ b/NewHorizons/Handlers/PlanetCreationHandler.cs
@@ -9,6 +9,7 @@ using NewHorizons.Components.Quantum;
 using NewHorizons.Components.Stars;
 using NewHorizons.OtherMods.OWRichPresence;
 using NewHorizons.Utility;
+using NewHorizons.Utility.OWMLUtilities;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/NewHorizons/Handlers/PlanetDestructionHandler.cs b/NewHorizons/Handlers/PlanetDestructionHandler.cs
index 05ad3455..3bc3b6c2 100644
--- a/NewHorizons/Handlers/PlanetDestructionHandler.cs
+++ b/NewHorizons/Handlers/PlanetDestructionHandler.cs
@@ -1,5 +1,6 @@
 using NewHorizons.Components.Stars;
 using NewHorizons.Utility;
+using NewHorizons.Utility.OWMLUtilities;
 using OWML.Utils;
 using System;
 using System.Collections.Generic;
diff --git a/NewHorizons/Handlers/RemoteHandler.cs b/NewHorizons/Handlers/RemoteHandler.cs
index a012074f..539dcf28 100644
--- a/NewHorizons/Handlers/RemoteHandler.cs
+++ b/NewHorizons/Handlers/RemoteHandler.cs
@@ -1,4 +1,4 @@
-using NewHorizons.Utility;
+using NewHorizons.Utility.OWMLUtilities;
 using OWML.Common;
 using OWML.Utils;
 using System;
diff --git a/NewHorizons/Handlers/SystemCreationHandler.cs b/NewHorizons/Handlers/SystemCreationHandler.cs
index cd0dc346..594128e8 100644
--- a/NewHorizons/Handlers/SystemCreationHandler.cs
+++ b/NewHorizons/Handlers/SystemCreationHandler.cs
@@ -1,6 +1,8 @@
 using NewHorizons.Builder.StarSystem;
 using NewHorizons.Components;
 using NewHorizons.Utility;
+using NewHorizons.Utility.OWMLUtilities;
+using NewHorizons.Utility.OWUtilities;
 using UnityEngine;
 using Logger = NewHorizons.Utility.Logger;
 using Object = UnityEngine.Object;
diff --git a/NewHorizons/Handlers/VesselWarpHandler.cs b/NewHorizons/Handlers/VesselWarpHandler.cs
index adcbf3fb..a056d95c 100644
--- a/NewHorizons/Handlers/VesselWarpHandler.cs
+++ b/NewHorizons/Handlers/VesselWarpHandler.cs
@@ -7,6 +7,7 @@ using NewHorizons.Utility;
 using Logger = NewHorizons.Utility.Logger;
 using static NewHorizons.Main;
 using NewHorizons.Components.Orbital;
+using NewHorizons.Utility.OWMLUtilities;
 
 namespace NewHorizons.Handlers
 {
diff --git a/NewHorizons/Patches/WarpPatches/VesselWarpControllerPatches.cs b/NewHorizons/Patches/WarpPatches/VesselWarpControllerPatches.cs
index 1a6df743..39eb3d72 100644
--- a/NewHorizons/Patches/WarpPatches/VesselWarpControllerPatches.cs
+++ b/NewHorizons/Patches/WarpPatches/VesselWarpControllerPatches.cs
@@ -1,5 +1,6 @@
 using HarmonyLib;
 using NewHorizons.Utility;
+using NewHorizons.Utility.OWUtilities;
 
 namespace NewHorizons.Patches.WarpPatches
 {
diff --git a/NewHorizons/Utility/Cache.cs b/NewHorizons/Utility/Cache.cs
index 0c98d021..f19aaced 100644
--- a/NewHorizons/Utility/Cache.cs
+++ b/NewHorizons/Utility/Cache.cs
@@ -1,10 +1,8 @@
 using Newtonsoft.Json;
 using OWML.Common;
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Runtime.Serialization;
 
 namespace NewHorizons.Utility
 {
diff --git a/NewHorizons/Utility/DebugUtilities/DebugRaycaster.cs b/NewHorizons/Utility/DebugUtilities/DebugRaycaster.cs
index 9433eda9..d8a65a6b 100644
--- a/NewHorizons/Utility/DebugUtilities/DebugRaycaster.cs
+++ b/NewHorizons/Utility/DebugUtilities/DebugRaycaster.cs
@@ -1,6 +1,7 @@
 using NewHorizons.Builder.Props;
 using NewHorizons.External.Modules;
 using NewHorizons.Handlers;
+using NewHorizons.Utility.UnityUtilities;
 using UnityEngine;
 using UnityEngine.InputSystem;
 
diff --git a/NewHorizons/Utility/AddDebugShape.cs b/NewHorizons/Utility/Geometry/AddDebugShape.cs
similarity index 91%
rename from NewHorizons/Utility/AddDebugShape.cs
rename to NewHorizons/Utility/Geometry/AddDebugShape.cs
index 50fb4816..53a4af5d 100644
--- a/NewHorizons/Utility/AddDebugShape.cs
+++ b/NewHorizons/Utility/Geometry/AddDebugShape.cs
@@ -1,5 +1,5 @@
 using UnityEngine;
-namespace NewHorizons.Utility
+namespace NewHorizons.Utility.UnityUtilities
 {
     public static class AddDebugShape
     {
@@ -20,7 +20,7 @@ namespace NewHorizons.Utility
             catch
             {
                 // Something went wrong so make sure the sphere is deleted
-                GameObject.Destroy(sphere);
+                Object.Destroy(sphere);
             }
 
             return sphere.gameObject;
diff --git a/NewHorizons/Utility/BoxShapeVisualizer.cs b/NewHorizons/Utility/Geometry/BoxShapeVisualizer.cs
similarity index 70%
rename from NewHorizons/Utility/BoxShapeVisualizer.cs
rename to NewHorizons/Utility/Geometry/BoxShapeVisualizer.cs
index df5b5af2..77dbf6cf 100644
--- a/NewHorizons/Utility/BoxShapeVisualizer.cs
+++ b/NewHorizons/Utility/Geometry/BoxShapeVisualizer.cs
@@ -1,12 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
-using Popcron;
 
-namespace NewHorizons.Utility
+namespace NewHorizons.Utility.Geometry
 {
     public class BoxShapeVisualizer : MonoBehaviour
     {
diff --git a/NewHorizons/Utility/MakeMeshDoubleFaced.cs b/NewHorizons/Utility/Geometry/MakeMeshDoubleFaced.cs
similarity index 96%
rename from NewHorizons/Utility/MakeMeshDoubleFaced.cs
rename to NewHorizons/Utility/Geometry/MakeMeshDoubleFaced.cs
index ce3e036c..6bbae8b7 100644
--- a/NewHorizons/Utility/MakeMeshDoubleFaced.cs
+++ b/NewHorizons/Utility/Geometry/MakeMeshDoubleFaced.cs
@@ -1,5 +1,6 @@
-using UnityEngine;
-namespace NewHorizons.Utility
+using UnityEngine;
+
+namespace NewHorizons.Utility.Geometry
 {
     public class MakeMeshDoubleFaced : MonoBehaviour
     {
diff --git a/NewHorizons/Utility/MeshUtilities.cs b/NewHorizons/Utility/Geometry/MeshUtilities.cs
similarity index 79%
rename from NewHorizons/Utility/MeshUtilities.cs
rename to NewHorizons/Utility/Geometry/MeshUtilities.cs
index b9f2d320..1631bffd 100644
--- a/NewHorizons/Utility/MeshUtilities.cs
+++ b/NewHorizons/Utility/Geometry/MeshUtilities.cs
@@ -1,11 +1,7 @@
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
 
-namespace NewHorizons.Utility
+namespace NewHorizons.Utility.Geometry
 {
     public class MeshUtilities
     {
@@ -19,7 +15,7 @@ namespace NewHorizons.Utility
             };
 
             MVector3[] normals = new MVector3[verts.Length];
-            for (int i = 0; i<verts.Length; i++) normals[i] = new Vector3(0, 0, 1);
+            for (int i = 0; i < verts.Length; i++) normals[i] = new Vector3(0, 0, 1);
 
             MVector2[] uv = new MVector2[] {
                 new Vector2(0, 0), new Vector2(0, 1),
diff --git a/NewHorizons/Utility/Logger.cs b/NewHorizons/Utility/Logger.cs
index cfb99981..f083f241 100644
--- a/NewHorizons/Utility/Logger.cs
+++ b/NewHorizons/Utility/Logger.cs
@@ -1,7 +1,6 @@
 using OWML.Common;
 using System;
-using System.ComponentModel;
-using UnityEngine;
+
 namespace NewHorizons.Utility
 {
     public static class Logger
diff --git a/NewHorizons/Utility/Delay.cs b/NewHorizons/Utility/OWMLUtilities/Delay.cs
similarity index 91%
rename from NewHorizons/Utility/Delay.cs
rename to NewHorizons/Utility/OWMLUtilities/Delay.cs
index 84bff778..3d8288f0 100644
--- a/NewHorizons/Utility/Delay.cs
+++ b/NewHorizons/Utility/OWMLUtilities/Delay.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace NewHorizons.Utility
+namespace NewHorizons.Utility.OWMLUtilities
 {
     public static class Delay
     {
diff --git a/NewHorizons/Utility/EnumUtilities.cs b/NewHorizons/Utility/OWMLUtilities/EnumUtilities.cs
similarity index 95%
rename from NewHorizons/Utility/EnumUtilities.cs
rename to NewHorizons/Utility/OWMLUtilities/EnumUtilities.cs
index fa202c19..aec5f721 100644
--- a/NewHorizons/Utility/EnumUtilities.cs
+++ b/NewHorizons/Utility/OWMLUtilities/EnumUtilities.cs
@@ -1,9 +1,8 @@
+using OWML.Utils;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using OWML.Utils;
 
-namespace NewHorizons.Utility
+namespace NewHorizons.Utility.OWMLUtilities
 {
     public static class EnumUtilities
     {
diff --git a/NewHorizons/Utility/TimeLoopUtilities.cs b/NewHorizons/Utility/OWUtilities/TimeLoopUtilities.cs
similarity index 96%
rename from NewHorizons/Utility/TimeLoopUtilities.cs
rename to NewHorizons/Utility/OWUtilities/TimeLoopUtilities.cs
index 69b3fccc..32a9b5aa 100644
--- a/NewHorizons/Utility/TimeLoopUtilities.cs
+++ b/NewHorizons/Utility/OWUtilities/TimeLoopUtilities.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace NewHorizons.Utility
+namespace NewHorizons.Utility.OWUtilities
 {
     public static class TimeLoopUtilities
     {
diff --git a/NewHorizons/Utility/RandomUtility.cs b/NewHorizons/Utility/RandomUtility.cs
index efd073f2..971e1526 100644
--- a/NewHorizons/Utility/RandomUtility.cs
+++ b/NewHorizons/Utility/RandomUtility.cs
@@ -1,5 +1,6 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using UnityEngine;
+
 namespace NewHorizons.Utility
 {
     public static class RandomUtility