Organize + validate

NewHorizons/Builder/Atmosphere/AirBuilder.cs

@@ -1,8 +1,5 @@
-using NewHorizons.External;
-using OWML.Utils;
+using NewHorizons.External.Modules;
 using UnityEngine;
-using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Builder.Atmosphere
 {
     public static class AirBuilder

NewHorizons/Builder/Atmosphere/AtmosphereBuilder.cs

@@ -1,7 +1,5 @@
-using NewHorizons.External;
+using NewHorizons.External.Modules;
 using UnityEngine;
-using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Builder.Atmosphere
 {
     public static class AtmosphereBuilder

NewHorizons/Builder/Atmosphere/CloudsBuilder.cs

@@ -1,11 +1,9 @@
-using NewHorizons.External;
+using NewHorizons.External.Modules;
 using NewHorizons.Utility;
 using OWML.Common;
-using OWML.Utils;
 using System;
 using UnityEngine;
 using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Builder.Atmosphere
 {
     public static class CloudsBuilder

NewHorizons/Builder/Atmosphere/EffectsBuilder.cs

@@ -1,9 +1,6 @@
-using NewHorizons.External;
+using NewHorizons.External.Modules;
 using NewHorizons.Utility;
-using OWML.Utils;
 using UnityEngine;
-using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Builder.Atmosphere
 {
     public static class EffectsBuilder

NewHorizons/Builder/Atmosphere/FogBuilder.cs

@@ -1,13 +1,5 @@
-using NewHorizons.External;
-using OWML.Utils;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using NewHorizons.External.Modules;
 using UnityEngine;
-using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Builder.Atmosphere
 {
     public static class FogBuilder

NewHorizons/Builder/Atmosphere/SunOverrideBuilder.cs

@@ -1,8 +1,5 @@
-using NewHorizons.External;
-using OWML.Utils;
+using NewHorizons.External.Modules;
 using UnityEngine;
-using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Builder.Atmosphere
 {
     public static class SunOverrideBuilder

NewHorizons/Builder/Atmosphere/VolumesBuilder.cs

@@ -1,14 +1,10 @@
-using NewHorizons.External;
-using NewHorizons.External.Configs;
-using OWML.Utils;
+using NewHorizons.External.Configs;
 using UnityEngine;
-using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Builder.Atmosphere
 {
     public static class VolumesBuilder
     {
-        public static void Make(GameObject planetGO, IPlanetConfig config, float sphereOfInfluence)
+        public static void Make(GameObject planetGO, PlanetConfig config, float sphereOfInfluence)
         {
             var innerRadius = config.Base.SurfaceSize;
             var useMiniMap = config.Base.IsSatellite;

NewHorizons/Builder/Body/AsteroidBeltBuilder.cs

@@ -1,22 +1,15 @@
-using NewHorizons.External;
+using NewHorizons.External.Configs;
+using NewHorizons.External.Modules;
+using NewHorizons.Handlers;
 using NewHorizons.Utility;
 using OWML.Common;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
-using NewHorizons.External.Configs;
-using Logger = NewHorizons.Utility.Logger;
 using Random = UnityEngine.Random;
-using NewHorizons.Handlers;
-
 namespace NewHorizons.Builder.Body
 {
     public static class AsteroidBeltBuilder
     {
-        public static void Make(string bodyName, IPlanetConfig parentConfig, IModBehaviour mod)
+        public static void Make(string bodyName, PlanetConfig parentConfig, IModBehaviour mod)
         {
             var belt = parentConfig.AsteroidBelt;
 

NewHorizons/Builder/Body/CloakBuilder.cs

@@ -1,12 +1,6 @@
 using NewHorizons.Components;
 using NewHorizons.Utility;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
-
 namespace NewHorizons.Builder.Body
 {
     public static class CloakBuilder

NewHorizons/Builder/Body/CometTailBuilder.cs

@@ -1,18 +1,10 @@
-using NewHorizons.External;
-using NewHorizons.External.Configs;
-using OWML.Utils;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using NewHorizons.External.Configs;
 using UnityEngine;
-
 namespace NewHorizons.Builder.Body
 {
     public static class CometTailBuilder
     {
-        public static void Make(GameObject planetGO, Sector sector, IPlanetConfig config)
+        public static void Make(GameObject planetGO, Sector sector, PlanetConfig config)
         {
             var cometTail = GameObject.Instantiate(GameObject.Find("Comet_Body/Sector_CO/Effects_CO/Effects_CO_TailMeshes"), sector?.transform ?? planetGO.transform);
             cometTail.transform.position = planetGO.transform.position;

NewHorizons/Builder/Body/FunnelBuilder.cs

@@ -1,13 +1,8 @@
 using NewHorizons.Components;
-using NewHorizons.External.VariableSize;
 using NewHorizons.Utility;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
 using Logger = NewHorizons.Utility.Logger;
+using NewHorizons.External.Modules.VariableSize;
 
 namespace NewHorizons.Builder.Body
 {

NewHorizons/Builder/Body/Geometry/CubeSphere.cs

@@ -1,12 +1,6 @@
 using NewHorizons.Utility;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
 using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Builder.Body.Geometry
 {
     static class CubeSphere

NewHorizons/Builder/Body/Geometry/Icosphere.cs

@@ -1,11 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
 using Random = UnityEngine.Random;
-
 namespace NewHorizons.Builder.Body.Geometry
 {
     public static class Icosphere

NewHorizons/Builder/Body/Geometry/Perlin.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-
+using UnityEngine;
 namespace NewHorizons.Builder.Body.Geometry
 {
     // Perlin noise generator for Unity

NewHorizons/Builder/Body/GeometryBuilder.cs

@@ -1,6 +1,4 @@
 using UnityEngine;
-using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Builder.Body
 {
     public static class GeometryBuilder

NewHorizons/Builder/Body/HeightMapBuilder.cs

@@ -1,16 +1,10 @@
 using NewHorizons.Builder.Body.Geometry;
-using NewHorizons.Builder.Props;
-using NewHorizons.External;
+using NewHorizons.External.Modules;
 using NewHorizons.Utility;
 using OWML.Common;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
 using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Builder.Body
 {
     public static class HeightMapBuilder

NewHorizons/Builder/Body/LavaBuilder.cs

@@ -1,12 +1,6 @@
-using NewHorizons.External.VariableSize;
-using OWML.Utils;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using UnityEngine;
-using Logger = NewHorizons.Utility.Logger;
+using NewHorizons.External.Modules.VariableSize;
 
 namespace NewHorizons.Builder.Body
 {

NewHorizons/Builder/Body/ProcGenBuilder.cs

@@ -1,13 +1,7 @@
 using NewHorizons.Builder.Body.Geometry;
-using NewHorizons.External;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
+using NewHorizons.External.Modules;
 using NewHorizons.Utility;
-
+using UnityEngine;
 namespace NewHorizons.Builder.Body
 {
     public static class ProcGenBuilder

NewHorizons/Builder/Body/ProxyBuilder.cs

@@ -2,12 +2,11 @@
 using NewHorizons.Builder.Props;
 using NewHorizons.Components;
 using NewHorizons.Components.SizeControllers;
-using NewHorizons.External.VariableSize;
 using NewHorizons.Utility;
-using OWML.Common;
 using System;
 using UnityEngine;
 using Logger = NewHorizons.Utility.Logger;
+using NewHorizons.External.Modules.VariableSize;
 
 namespace NewHorizons.Builder.Body
 {

NewHorizons/Builder/Body/RingBuilder.cs

@@ -1,16 +1,12 @@
-using NewHorizons.External;
+using NewHorizons.Components;
+using NewHorizons.Components.SizeControllers;
+using NewHorizons.Utility;
 using OWML.Common;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
-using NewHorizons.Utility;
 using Logger = NewHorizons.Utility.Logger;
-using NewHorizons.External.VariableSize;
-using NewHorizons.Components;
-using NewHorizons.Components.SizeControllers;
+using NewHorizons.External.Modules.VariableSize;
 
 namespace NewHorizons.Builder.Body
 {

NewHorizons/Builder/Body/SandBuilder.cs

@@ -1,11 +1,6 @@
-using NewHorizons.External.VariableSize;
-using NewHorizons.Utility;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using NewHorizons.Utility;
 using UnityEngine;
+using NewHorizons.External.Modules.VariableSize;
 
 namespace NewHorizons.Builder.Body
 {

NewHorizons/Builder/Body/SingularityBuilder.cs

@@ -1,15 +1,9 @@
 using NewHorizons.Components;
-using NewHorizons.External;
+using NewHorizons.External.Configs;
 using NewHorizons.Utility;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
-using NewHorizons.External.Configs;
 using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Builder.Body
 {
     public static class SingularityBuilder
@@ -23,18 +17,8 @@ namespace NewHorizons.Builder.Body
         private static Shader blackHoleShader = null;
         private static Shader whiteHoleShader = null;
 
-        public static void Make(GameObject go, Sector sector, OWRigidbody OWRB, IPlanetConfig config)
+        public static void Make(GameObject go, Sector sector, OWRigidbody OWRB, PlanetConfig config)
         {
-            // Backwards compatibility
-            if(config.Singularity == null)
-            {
-                if(config.Base.BlackHoleSize != 0)
-                {
-                    MakeBlackHole(go, sector, Vector3.zero, config.Base.BlackHoleSize, true, null);
-                }
-                return;
-            }
-
             var size = config.Singularity.Size;
             var pairedSingularity = config.Singularity.PairedSingularity;
 

NewHorizons/Builder/Body/StarBuilder.cs

@@ -1,16 +1,9 @@
-using NewHorizons.External;
-using OWML.Utils;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-using NewHorizons.Utility;
-using Logger = NewHorizons.Utility.Logger;
-using NewHorizons.External.VariableSize;
-using NewHorizons.Components;
+using NewHorizons.Components;
 using NewHorizons.Components.SizeControllers;
+using NewHorizons.Utility;
+using OWML.Utils;
+using UnityEngine;
+using NewHorizons.External.Modules.VariableSize;
 
 namespace NewHorizons.Builder.Body
 {

NewHorizons/Builder/Body/WaterBuilder.cs

@@ -1,11 +1,8 @@
-using NewHorizons.External;
-using NewHorizons.External.VariableSize;
-using OWML.Utils;
-using UnityEngine;
-using NewHorizons.Utility;
-using Logger = NewHorizons.Utility.Logger;
-using NewHorizons.Components;
+using NewHorizons.Components;
 using NewHorizons.Components.SizeControllers;
+using NewHorizons.Utility;
+using UnityEngine;
+using NewHorizons.External.Modules.VariableSize;
 
 namespace NewHorizons.Builder.Body
 {

NewHorizons/Builder/General/AmbientLightBuilder.cs

@@ -1,9 +1,4 @@
-using NewHorizons.External;
-using NewHorizons.Utility;
-using OWML.Utils;
-using UnityEngine;
-using Logger = NewHorizons.Utility.Logger;
-
+using UnityEngine;
 namespace NewHorizons.Builder.General
 {
     public static class AmbientLightBuilder

NewHorizons/Builder/General/AstroObjectBuilder.cs

@@ -1,17 +1,12 @@
-using NewHorizons.External;
-using NewHorizons.Utility;
-using OWML.Utils;
-using System;
-using UnityEngine;
+using NewHorizons.Components.Orbital;
 using NewHorizons.External.Configs;
+using UnityEngine;
 using Logger = NewHorizons.Utility.Logger;
-using NewHorizons.Components.Orbital;
-
 namespace NewHorizons.Builder.General
 {
     public static class AstroObjectBuilder
     {
-        public static NHAstroObject Make(GameObject body, AstroObject primaryBody, IPlanetConfig config)
+        public static NHAstroObject Make(GameObject body, AstroObject primaryBody, PlanetConfig config)
         {
             NHAstroObject astroObject = body.AddComponent<NHAstroObject>();
             astroObject.HideDisplayName = !config.Base.HasMapMarker;

NewHorizons/Builder/General/DetectorBuilder.cs

@@ -1,20 +1,12 @@
-using NewHorizons.Builder.Orbital;
-using NewHorizons.External;
-using NewHorizons.Components.Orbital;
-using OWML.Utils;
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using UnityEngine;
-using NewHorizons.Utility;
-using Logger = NewHorizons.Utility.Logger;
+using NewHorizons.Components.Orbital;
 using NewHorizons.External.Configs;
-
+using UnityEngine;
+using Logger = NewHorizons.Utility.Logger;
 namespace NewHorizons.Builder.General
 {
     public static class DetectorBuilder
     {
-        public static GameObject Make(GameObject planetGO, OWRigidbody OWRB, AstroObject primaryBody, AstroObject astroObject, IPlanetConfig config)
+        public static GameObject Make(GameObject planetGO, OWRigidbody OWRB, AstroObject primaryBody, AstroObject astroObject, PlanetConfig config)
         {
             GameObject detectorGO = new GameObject("FieldDetector");
             detectorGO.SetActive(false);

NewHorizons/Builder/General/GravityBuilder.cs

@@ -1,17 +1,11 @@
-using NewHorizons.External;
-using NewHorizons.Utility;
-using OWML.Utils;
-using System;
-using System.Reflection;
+using NewHorizons.External.Configs;
 using UnityEngine;
-using NewHorizons.External.Configs;
 using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Builder.General
 {
     public static class GravityBuilder
     {
-        public static GravityVolume Make(GameObject planetGO, AstroObject ao, IPlanetConfig config)
+        public static GravityVolume Make(GameObject planetGO, AstroObject ao, PlanetConfig config)
         {
             var exponent = config.Base.GravityFallOff.Equals("linear") ? 1f : 2f;
             var GM = config.Base.SurfaceGravity * Mathf.Pow(config.Base.SurfaceSize, exponent);

NewHorizons/Builder/General/MarkerBuilder.cs

@@ -1,16 +1,11 @@
-using NewHorizons.External;
-using OWML.Utils;
-using System.Reflection;
-using UnityEngine;
-using NewHorizons.External.Configs;
-using Logger = NewHorizons.Utility.Logger;
+using NewHorizons.External.Configs;
 using NewHorizons.Handlers;
-
+using UnityEngine;
 namespace NewHorizons.Builder.General
 {
     static class MarkerBuilder
     {
-        public static void Make(GameObject body, string name, IPlanetConfig config)
+        public static void Make(GameObject body, string name, PlanetConfig config)
         {
             MapMarker mapMarker = body.AddComponent<MapMarker>();
             mapMarker._labelID = (UITextType)TranslationHandler.AddUI(config.Name);

NewHorizons/Builder/General/RFVolumeBuilder.cs

@@ -1,8 +1,4 @@
-using NewHorizons.External;
-using OWML.Utils;
-using UnityEngine;
-using Logger = NewHorizons.Utility.Logger;
-
+using UnityEngine;
 namespace NewHorizons.Builder.General
 {
     public static class RFVolumeBuilder

NewHorizons/Builder/General/RigidBodyBuilder.cs

@@ -1,16 +1,10 @@
 using NewHorizons.External.Configs;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
-
 namespace NewHorizons.Builder.General
 {
     public static class RigidBodyBuilder
     {
-        public static OWRigidbody Make(GameObject body, IPlanetConfig config)
+        public static OWRigidbody Make(GameObject body, PlanetConfig config)
         {
             body.AddComponent<ProxyShadowCasterSuperGroup>();
 

NewHorizons/Builder/General/SectorBuilder.cs

@@ -1,9 +1,5 @@
-using NewHorizons.External;
-using OWML.Utils;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using UnityEngine;
-using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Builder.General
 {
     public static class MakeSector

NewHorizons/Builder/General/SpawnPointBuilder.cs

@@ -1,10 +1,6 @@
-using NewHorizons.External;
-using OWML.Utils;
-using System;
+using NewHorizons.External.Modules;
 using UnityEngine;
-using NewHorizons.Utility;
 using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Builder.General
 {
     public static class SpawnPointBuilder

NewHorizons/Builder/Orbital/FocalPointBuilder.cs

@@ -1,23 +1,16 @@
-using NewHorizons.Builder.General;
-using NewHorizons.Components.Orbital;
-using NewHorizons.External;
+using NewHorizons.Components.Orbital;
 using NewHorizons.External.Configs;
+using NewHorizons.External.Modules;
 using NewHorizons.Handlers;
 using NewHorizons.Utility;
 using OWML.Common;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
 using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Builder.Orbital
 {
     public static class FocalPointBuilder
     {
-        public static void Make(GameObject go, AstroObject ao, IPlanetConfig config, IModBehaviour mod)
+        public static void Make(GameObject go, AstroObject ao, PlanetConfig config, IModBehaviour mod)
         {
             var module = config.FocalPoint;
 
@@ -74,7 +67,7 @@ namespace NewHorizons.Builder.Orbital
             binary.FakeMassBody = PlanetCreationHandler.GenerateBody(new NewHorizonsBody(fakeMassConfig, mod));
         }
 
-        private static float GetGravitationalMass(IPlanetConfig config)
+        private static float GetGravitationalMass(PlanetConfig config)
         {
             var surfaceAcceleration = config.Base.SurfaceGravity;
             var upperSurfaceRadius = config.Base.SurfaceSize;

NewHorizons/Builder/Orbital/InitialMotionBuilder.cs

@@ -1,16 +1,7 @@
-using NewHorizons.External;
-using OWML.Utils;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using NewHorizons.Components.Orbital;
+using NewHorizons.External.Modules;
 using UnityEngine;
 using Logger = NewHorizons.Utility.Logger;
-using System.Reflection;
-using NewHorizons.Utility;
-using NewHorizons.Components.Orbital;
-
 namespace NewHorizons.Builder.Orbital
 {
     public static class InitialMotionBuilder

NewHorizons/Builder/Orbital/OrbitlineBuilder.cs

@@ -1,17 +1,11 @@
-using NewHorizons.External;
-using NewHorizons.Utility;
-using OWML.Utils;
-using UnityEngine;
+using NewHorizons.Components.Orbital;
 using NewHorizons.External.Configs;
-using Logger = NewHorizons.Utility.Logger;
-using NewHorizons.Components.Orbital;
-using System;
-
+using UnityEngine;
 namespace NewHorizons.Builder.Orbital
 {
     public static class OrbitlineBuilder
     {
-        public static OrbitLine Make(GameObject planetGO, NHAstroObject astroObject, bool isMoon, IPlanetConfig config)
+        public static OrbitLine Make(GameObject planetGO, NHAstroObject astroObject, bool isMoon, PlanetConfig config)
         {
             GameObject orbitGO = new GameObject("Orbit");
             orbitGO.transform.parent = planetGO.transform;

NewHorizons/Builder/Props/DetailBuilder.cs

@@ -1,22 +1,18 @@
-using NewHorizons.Utility;
+using NewHorizons.External.Configs;
+using NewHorizons.External.Modules;
+using NewHorizons.Handlers;
+using NewHorizons.Utility;
+using OWML.Common;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
-using Random = UnityEngine.Random;
 using Logger = NewHorizons.Utility.Logger;
-using NewHorizons.External;
-using OWML.Common;
-using NewHorizons.External.Configs;
-using NewHorizons.Handlers;
-
 namespace NewHorizons.Builder.Props
 {
     public static class DetailBuilder
     {
-        public static void Make(GameObject go, Sector sector, IPlanetConfig config, IModBehaviour mod, string uniqueModName, PropModule.DetailInfo detail)
+        public static void Make(GameObject go, Sector sector, PlanetConfig config, IModBehaviour mod, string uniqueModName, PropModule.DetailInfo detail)
         {
             GameObject detailGO = null;
 

NewHorizons/Builder/Props/DialogueBuilder.cs

@@ -1,15 +1,8 @@
-using NewHorizons.External;
+using NewHorizons.External.Modules;
 using NewHorizons.Handlers;
 using OWML.Common;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Xml;
 using UnityEngine;
-using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Builder.Props
 {
     public static class DialogueBuilder

NewHorizons/Builder/Props/GeyserBuilder.cs

@@ -1,12 +1,6 @@
-using NewHorizons.External;
+using NewHorizons.External.Modules;
 using NewHorizons.Utility;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
-
 namespace NewHorizons.Builder.Props
 {
     public static class GeyserBuilder

NewHorizons/Builder/Props/NomaiTextBuilder.cs

@@ -1,17 +1,13 @@
-using NewHorizons.External;
+using NewHorizons.External.Modules;
 using NewHorizons.Handlers;
 using NewHorizons.Utility;
 using OWML.Common;
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Xml;
 using UnityEngine;
 using Logger = NewHorizons.Utility.Logger;
 using Random = UnityEngine.Random;
-
 namespace NewHorizons.Builder.Props
 {
     public static class NomaiTextBuilder

NewHorizons/Builder/Props/ProjectionBuilder.cs

@@ -1,16 +1,11 @@
-using NewHorizons.External;
+using NewHorizons.External.Modules;
+using NewHorizons.Handlers;
+using NewHorizons.Utility;
+using OWML.Common;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
-using NewHorizons.Utility;
-using OWML.ModHelper;
-using OWML.Common;
-using NewHorizons.Handlers;
 using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Builder.Props
 {
     public static class ProjectionBuilder

NewHorizons/Builder/Props/PropBuildManager.cs

@@ -1,25 +1,14 @@
-using NewHorizons.External;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-using Random = UnityEngine.Random;
-using Logger = NewHorizons.Utility.Logger;
-using System.Reflection;
-using NewHorizons.Builder.General;
-using NewHorizons.Utility;
-using OWML.Common;
-using NewHorizons.Builder.ShipLog;
+using NewHorizons.Builder.ShipLog;
 using NewHorizons.External.Configs;
-using System.IO;
-
+using OWML.Common;
+using System;
+using UnityEngine;
+using Logger = NewHorizons.Utility.Logger;
 namespace NewHorizons.Builder.Props
 {
     public static class PropBuildManager
     {
-        public static void Make(GameObject go, Sector sector, OWRigidbody planetBody, IPlanetConfig config, IModBehaviour mod, string uniqueModName)
+        public static void Make(GameObject go, Sector sector, OWRigidbody planetBody, PlanetConfig config, IModBehaviour mod, string uniqueModName)
         {
             if (config.Props.Scatter != null)
             {

NewHorizons/Builder/Props/RaftBuilder.cs

@@ -1,17 +1,9 @@
-using NewHorizons.Builder.General;
-using NewHorizons.Components;
-using NewHorizons.External;
+using NewHorizons.Components;
+using NewHorizons.External.Modules;
 using NewHorizons.Handlers;
 using NewHorizons.Utility;
-using OWML.Utils;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
 using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Builder.Props
 {
     public static class RaftBuilder

NewHorizons/Builder/Props/ScatterBuilder.cs

@@ -1,26 +1,20 @@
-using NewHorizons.Utility;
+using NewHorizons.External.Configs;
+using NewHorizons.External.Modules;
+using NewHorizons.Utility;
+using OWML.Common;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
 using Random = UnityEngine.Random;
-using Logger = NewHorizons.Utility.Logger;
-using NewHorizons.External;
-using OWML.Common;
-using NewHorizons.External.Configs;
-
 namespace NewHorizons.Builder.Props
 {
     public static class ScatterBuilder
     {
-        public static void Make(GameObject go, Sector sector, IPlanetConfig config, IModBehaviour mod, string uniqueModName)
+        public static void Make(GameObject go, Sector sector, PlanetConfig config, IModBehaviour mod, string uniqueModName)
         {
             MakeScatter(go, config.Props.Scatter, config.Base.SurfaceSize, sector, mod, uniqueModName, config);
         }
 
-        private static void MakeScatter(GameObject go, PropModule.ScatterInfo[] scatterInfo, float radius, Sector sector, IModBehaviour mod, string uniqueModName, IPlanetConfig config)
+        private static void MakeScatter(GameObject go, PropModule.ScatterInfo[] scatterInfo, float radius, Sector sector, IModBehaviour mod, string uniqueModName, PlanetConfig config)
         {
             var heightMap = config.HeightMap;
 

NewHorizons/Builder/Props/SignalBuilder.cs

@@ -1,16 +1,11 @@
 using NewHorizons.Components;
-using NewHorizons.External;
-using NewHorizons.Handlers;
+using NewHorizons.External.Modules;
 using NewHorizons.Utility;
 using OWML.Common;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
 using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Builder.Props
 {
     public static class SignalBuilder

NewHorizons/Builder/Props/TornadoBuilder.cs

@@ -1,16 +1,10 @@
 using NewHorizons.Components;
-using NewHorizons.External;
+using NewHorizons.External.Modules;
 using NewHorizons.Handlers;
 using NewHorizons.Utility;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
 using Logger = NewHorizons.Utility.Logger;
 using Random = UnityEngine.Random;
-
 namespace NewHorizons.Builder.Props
 {
     public static class TornadoBuilder

NewHorizons/Builder/Props/VolcanoBuilder.cs

@@ -1,8 +1,6 @@
-using NewHorizons.External;
+using NewHorizons.External.Modules;
 using NewHorizons.Utility;
 using UnityEngine;
-using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Builder.Props
 {
     public static class VolcanoBuilder

NewHorizons/Builder/ShipLog/EntryLocationBuilder.cs

@@ -1,15 +1,7 @@
-using NewHorizons.Components;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Xml.Linq;
-using NewHorizons.External;
-using NewHorizons.Utility;
+using NewHorizons.External.Modules;
 using OWML.Common;
+using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.UI;
-using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Builder.ShipLog
 {
     public static class EntryLocationBuilder

NewHorizons/Builder/ShipLog/MapModeBuilder.cs

@@ -1,17 +1,13 @@
 using NewHorizons.Components;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Xml.Linq;
-using NewHorizons.External;
+using NewHorizons.External.Modules;
+using NewHorizons.Handlers;
 using NewHorizons.Utility;
-using OWML.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 using UnityEngine.UI;
 using Logger = NewHorizons.Utility.Logger;
-using System;
-using NewHorizons.Handlers;
-
 namespace NewHorizons.Builder.ShipLog
 {
     public static class MapModeBuilder

NewHorizons/Builder/ShipLog/RevealBuilder.cs

@@ -1,15 +1,7 @@
-using NewHorizons.Components;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Xml.Linq;
-using NewHorizons.External;
-using NewHorizons.Utility;
+using NewHorizons.External.Modules;
 using OWML.Common;
 using UnityEngine;
-using UnityEngine.UI;
 using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Builder.ShipLog
 {
     public static class RevealBuilder

NewHorizons/Builder/ShipLog/RumorModeBuilder.cs

@@ -1,17 +1,11 @@
-using System;
-using NewHorizons.Components;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Xml.Linq;
-using NewHorizons.External;
-using NewHorizons.Utility;
-using OWML.Common;
-using UnityEngine;
-using UnityEngine.UI;
-using Logger = NewHorizons.Utility.Logger;
+using NewHorizons.External.Modules;
 using NewHorizons.Handlers;
-
+using NewHorizons.Utility;
+using System;
+using System.Collections.Generic;
+using System.Xml.Linq;
+using UnityEngine;
+using Logger = NewHorizons.Utility.Logger;
 namespace NewHorizons.Builder.ShipLog
 {
     public static class RumorModeBuilder

NewHorizons/Builder/StarSystem/SkyboxBuilder.cs

@@ -1,11 +1,8 @@
-using System;
-using NewHorizons.External.Configs;
+using NewHorizons.External.Configs;
 using NewHorizons.Utility;
 using OWML.Common;
 using UnityEngine;
 using Logger = NewHorizons.Utility.Logger;
-using Object = System.Object;
-
 namespace NewHorizons.Builder.StarSystem
 {
     public class SkyboxBuilder

NewHorizons/Components/BlackHoleDestructionVolume.cs

@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Logger = NewHorizons.Utility.Logger;
-
-namespace NewHorizons.Components
+namespace NewHorizons.Components
 {
     public class BlackHoleDestructionVolume : DestructionVolume
     {

NewHorizons/Components/ChangeStarSystemVolume.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NewHorizons.Components
+namespace NewHorizons.Components
 {
     public class ChangeStarSystemVolume : BlackHoleDestructionVolume
     {

NewHorizons/Components/CloakSectorController.cs

@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
-
 namespace NewHorizons.Components
 {
     public class CloakSectorController : MonoBehaviour

NewHorizons/Components/CloakedAudioSignal.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-
+using UnityEngine;
 namespace NewHorizons.Components
 {
     public class CloakedAudioSignal : AudioSignal

NewHorizons/Components/FunnelController.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-
+using UnityEngine;
 namespace NewHorizons.Components
 {
     public class FunnelController : MonoBehaviour

NewHorizons/Components/MapSatelliteOrbitFix.cs

@@ -1,12 +1,6 @@
 using NewHorizons.Builder.General;
 using NewHorizons.External.Configs;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
-
 namespace NewHorizons.Components
 {
     public class MapSatelliteOrbitFix : MonoBehaviour

NewHorizons/Components/NHFluidVolume.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-
+using UnityEngine;
 namespace NewHorizons.Components
 {
     public class NHFluidVolume : RadialFluidVolume

NewHorizons/Components/NHProxy.cs

@@ -1,7 +1,5 @@
 using NewHorizons.Utility;
-using System.Collections.Generic;
 using UnityEngine;
-
 namespace NewHorizons.Components
 {
     public class NHProxy : ProxyPlanet

NewHorizons/Components/NHTornadoWanderController.cs

@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
+using UnityEngine;
 using Random = UnityEngine.Random;
-
 namespace NewHorizons.Components
 {
     public class NHTornadoWanderController : MonoBehaviour

NewHorizons/Components/Orbital/BinaryFocalPoint.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-
+using UnityEngine;
 namespace NewHorizons.Components.Orbital
 {
     public class BinaryFocalPoint : MonoBehaviour

NewHorizons/Components/Orbital/Gravity.cs

@@ -1,11 +1,5 @@
-using NewHorizons.External;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using NewHorizons.External.Modules;
 using UnityEngine;
-
 namespace NewHorizons.Components.Orbital
 {
     public class Gravity

NewHorizons/Components/Orbital/IOrbitalParameters.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NewHorizons.Components.Orbital
+namespace NewHorizons.Components.Orbital
 {
     public interface IOrbitalParameters
     {

NewHorizons/Components/Orbital/NHAstroObject.cs

@@ -1,10 +1,4 @@
-using NewHorizons.External;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
+using NewHorizons.External.Modules;
 namespace NewHorizons.Components.Orbital
 {
     public class NHAstroObject : AstroObject, IOrbitalParameters

NewHorizons/Components/Orbital/NHOrbitLine.cs

@@ -1,11 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
 using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Components.Orbital
 {
     public class NHOrbitLine : OrbitLine

NewHorizons/Components/Orbital/OrbitalParameters.cs

@@ -1,11 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
-using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Components.Orbital
 {
     public class OrbitalParameters : IOrbitalParameters

NewHorizons/Components/Orbital/TrackingOrbitLine.cs

@@ -1,11 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
 using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Components.Orbital
 {
     public class TrackingOrbitLine : OrbitLine

NewHorizons/Components/QuantumPlanet.cs

@@ -1,18 +1,12 @@
 using NewHorizons.Builder.General;
-using NewHorizons.Builder.Orbital;
 using NewHorizons.Components.Orbital;
-using NewHorizons.External;
+using NewHorizons.External.Modules;
 using NewHorizons.Handlers;
 using NewHorizons.Utility;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
-using Random = UnityEngine.Random;
 using Logger = NewHorizons.Utility.Logger;
-
+using Random = UnityEngine.Random;
 namespace NewHorizons.Components
 {
     public class QuantumPlanet : QuantumObject

NewHorizons/Components/RingShape.cs

@@ -1,7 +1,5 @@
 using System.Collections.Generic;
 using UnityEngine;
-using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Components
 {
     public class RingShape : Shape

NewHorizons/Components/ShipLogDetail.cs

@@ -1,10 +1,7 @@
-using System;
-using NewHorizons.External;
-using OWML.Common;
+using NewHorizons.External.Modules;
 using UnityEngine;
 using UnityEngine.UI;
 using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Components
 {
     public class ShipLogDetail : MonoBehaviour

NewHorizons/Components/ShipLogStarChartMode.cs

@@ -1,15 +1,10 @@
-using System;
+using NewHorizons.Handlers;
+using NewHorizons.Utility;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
-using NewHorizons.Utility;
 using Logger = NewHorizons.Utility.Logger;
-using UnityEngine.UI;
-using OWML.Common;
-using NewHorizons.Handlers;
-
 namespace NewHorizons.Components
 {
     public class ShipLogStarChartMode : ShipLogMode

NewHorizons/Components/ShipWarpController.cs

@@ -1,13 +1,6 @@
 using NewHorizons.Builder.General;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
-using NewHorizons.Utility;
 using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Components
 {
     public class ShipWarpController : MonoBehaviour

NewHorizons/Components/SizeControllers/SizeController.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-
+using UnityEngine;
 namespace NewHorizons.Components.SizeControllers
 {
     public class SizeController : MonoBehaviour

NewHorizons/Components/SizeControllers/StarAtmosphereSizeController.cs

@@ -1,11 +1,5 @@
 using NewHorizons.Builder.Body;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
-
 namespace NewHorizons.Components.SizeControllers
 {
     public class StarAtmosphereSizeController : SizeController

NewHorizons/Components/SizeControllers/WaterSizeController.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-
+using UnityEngine;
 namespace NewHorizons.Components.SizeControllers
 {
     public class WaterSizeController : SizeController

NewHorizons/Components/StarController.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-
+using UnityEngine;
 namespace NewHorizons.Components
 {
     public class StarController : MonoBehaviour

NewHorizons/Components/StarLightController.cs

@@ -1,12 +1,6 @@
-using NewHorizons.Utility;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using UnityEngine;
 using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.Components
 {
     [RequireComponent(typeof(SunLightController))]

NewHorizons/Components/TimeLoopController.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-
+using UnityEngine;
 namespace NewHorizons.Components
 {
     public class TimeLoopController : MonoBehaviour

NewHorizons/Components/TornadoFix.cs

@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-
-namespace NewHorizons.Components
+namespace NewHorizons.Components
 {
     public class TornadoFix : SectoredMonoBehaviour
     {

NewHorizons/External/Configs/Config.cs

@@ -1,10 +1,7 @@
-using NewHorizons.Utility;
+using NewHorizons.External.Modules;
+using NewHorizons.Utility;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace NewHorizons.External.Configs
 {
     public class Config

NewHorizons/External/Configs/IPlanetConfig.cs

@@ -1,34 +0,0 @@
-using NewHorizons.External.VariableSize;
-using NewHorizons.Utility;
-
-namespace NewHorizons.External.Configs
-{
-    public interface IPlanetConfig
-    {
-        string Name { get; }
-        string StarSystem { get; }
-        bool Destroy { get; }
-        string[] ChildrenToDestroy { get; }
-        int BuildPriority { get; }
-        bool CanShowOnTitle { get; }
-        bool IsQuantumState { get; }
-        BaseModule Base { get; }
-        AtmosphereModule Atmosphere { get; }
-        OrbitModule Orbit { get; }
-        RingModule Ring { get; }
-        HeightMapModule HeightMap { get; }
-        ProcGenModule ProcGen { get; }
-        AsteroidBeltModule AsteroidBelt { get; }
-        StarModule Star { get; }
-        FocalPointModule FocalPoint { get; }
-        PropModule Props { get; }
-        ShipLogModule ShipLog { get; }
-        SpawnModule Spawn { get; }
-        SignalModule Signal { get; }
-        SingularityModule Singularity { get; }
-        LavaModule Lava { get; }
-        SandModule Sand { get; }
-        WaterModule Water { get; }
-        FunnelModule Funnel { get; }
-    }
-}

NewHorizons/External/Configs/PlanetConfig.cs

@@ -1,14 +1,13 @@
-using NewHorizons.External.VariableSize;
-using NewHorizons.Utility;
-using System;
+using NewHorizons.External.Modules;
+using NewHorizons.External.Modules.VariableSize;
 using System.Collections.Generic;
-using System.Globalization;
 
 namespace NewHorizons.External.Configs
 {
-    public class PlanetConfig : Config, IPlanetConfig
+    public class PlanetConfig : Config
     {
         public string Name { get; set; }
+        public string Version { get; set; }
         public string StarSystem { get; set; } = "SolarSystem";
         public bool Destroy { get; set; }
         public string[] ChildrenToDestroy { get; set; }
@@ -41,5 +40,35 @@ namespace NewHorizons.External.Configs
             if (Orbit == null) Orbit = new OrbitModule();
             if (ShipLog == null) ShipLog = new ShipLogModule();
         }
+
+        public void Validate()
+        {
+            if (Base.CenterOfSolarSystem) Orbit.IsStatic = true;
+
+            if (Base.WaterSize != 0)
+            {
+                Water = new WaterModule();
+                Water.Size = Base.WaterSize;
+                Water.Tint = Base.WaterTint;
+            }
+
+            if (Base.LavaSize != 0)
+            {
+                Lava = new LavaModule();
+                Lava.Size = Base.LavaSize;
+            }
+
+            if(Base.BlackHoleSize != 0)
+            {
+                Singularity = new SingularityModule();
+                Singularity.Type = "BlackHole";
+                Singularity.Size = Base.BlackHoleSize;
+            }
+
+            if(Base.IsSatellite)
+            {
+                Base.ShowMinimap = false;
+            }
+        }
     }
 }

NewHorizons/External/Configs/StarSystemConfig.cs

@@ -1,10 +1,4 @@
-using NewHorizons.Utility;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
+using System.Collections.Generic;
 namespace NewHorizons.External.Configs
 {
     public class StarSystemConfig : Config

NewHorizons/External/Configs/TranslationConfig.cs

@@ -1,12 +1,6 @@
 using Newtonsoft.Json.Linq;
-using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Logger = NewHorizons.Utility.Logger;
-
 namespace NewHorizons.External.Configs
 {
     public class TranslationConfig

NewHorizons/External/FocalPointModule.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NewHorizons.External
-{
-    public class FocalPointModule
-    {
-        public string Primary { get; set; }
-        public string Secondary { get; set; }
-    }
-}

NewHorizons/External/Modules/AsteroidBeltModule.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NewHorizons.External
+namespace NewHorizons.External.Modules
 {
     public class AsteroidBeltModule : Module
     {

NewHorizons/External/Modules/AtmosphereModule.cs

@@ -1,11 +1,5 @@
 using NewHorizons.Utility;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NewHorizons.External
+namespace NewHorizons.External.Modules
 {
     public class AtmosphereModule : Module
     {

NewHorizons/External/Modules/BaseModule.cs

@@ -1,11 +1,5 @@
 using NewHorizons.Utility;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NewHorizons.External
+namespace NewHorizons.External.Modules
 {
     public class BaseModule : Module
     {
@@ -20,11 +14,13 @@ namespace NewHorizons.External
         public MVector3 CometTailRotation { get; set; }
         public bool HasReferenceFrame { get; set; } = true;
         public bool CenterOfSolarSystem { get; set; } = false;
-        public bool IsSatellite { get; set; }
         public float CloakRadius { get; set; } = 0f;
         public bool InvulnerableToSun { get; set; }
+        public bool ShowMinimap { get; set; } = true;
 
-        // Old, see SingularityModule instead
+
+        // Obsolete
+        public bool IsSatellite { get; set; }
         public float BlackHoleSize { get; set; } 
         public float LavaSize { get; set; } 
         public float WaterSize { get; set; } 

NewHorizons/External/Modules/FocalPointModule.cs

@@ -0,0 +1,8 @@
+namespace NewHorizons.External.Modules
+{
+    public class FocalPointModule
+    {
+        public string Primary { get; set; }
+        public string Secondary { get; set; }
+    }
+}

NewHorizons/External/Modules/HeightMapModule.cs

@@ -1,7 +1,5 @@
 using NewHorizons.Utility;
-using UnityEngine;
-
-namespace NewHorizons.External
+namespace NewHorizons.External.Modules
 {
     public class HeightMapModule : Module
     {

NewHorizons/External/Modules/Module.cs

@@ -1,11 +1,6 @@
-using NewHorizons.Utility;
-using System;
+using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NewHorizons.External
+namespace NewHorizons.External.Modules
 {
     public abstract class Module
     {

NewHorizons/External/Modules/NewHorizonsData.cs

@@ -1,12 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using NewHorizons.Handlers;
 using Logger = NewHorizons.Utility.Logger;
-
-namespace NewHorizons.External
+namespace NewHorizons.External.Modules
 {
     public static class NewHorizonsData
     {

NewHorizons/External/Modules/OrbitModule.cs

@@ -1,12 +1,6 @@
 using NewHorizons.Components.Orbital;
 using NewHorizons.Utility;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NewHorizons.External
+namespace NewHorizons.External.Modules
 {
     public class OrbitModule : Module, IOrbitalParameters
     {

NewHorizons/External/Modules/ProcGenModule.cs

@@ -1,11 +1,5 @@
 using NewHorizons.Utility;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NewHorizons.External
+namespace NewHorizons.External.Modules
 {
     public class ProcGenModule : Module
     {

NewHorizons/External/Modules/PropModule.cs

@@ -1,11 +1,5 @@
 using NewHorizons.Utility;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NewHorizons.External
+namespace NewHorizons.External.Modules
 {
     public class PropModule : Module
     {

NewHorizons/External/Modules/ShipLogModule.cs

@@ -1,6 +1,5 @@
 using NewHorizons.Utility;
-
-namespace NewHorizons.External
+namespace NewHorizons.External.Modules
 {
     public class ShipLogModule : Module
     {

NewHorizons/External/Modules/SignalModule.cs

@@ -1,11 +1,5 @@
 using NewHorizons.Utility;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NewHorizons.External
+namespace NewHorizons.External.Modules
 {
     public class SignalModule : Module
     {

NewHorizons/External/Modules/SpawnModule.cs

@@ -1,11 +1,5 @@
 using NewHorizons.Utility;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NewHorizons.External
+namespace NewHorizons.External.Modules
 {
     public class SpawnModule : Module
     {

NewHorizons/External/Modules/VariableSize/FunnelModule.cs

@@ -1,11 +1,5 @@
 using NewHorizons.Utility;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NewHorizons.External.VariableSize
+namespace NewHorizons.External.Modules.VariableSize
 {
     public class FunnelModule : VariableSizeModule
     {