diff --git a/MechJeb2/GLUtils.cs b/MechJeb2/GLUtils.cs
index 59e0e81d..8c94f074 100644
--- a/MechJeb2/GLUtils.cs
+++ b/MechJeb2/GLUtils.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using UnityEngine;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MuMech
 {
diff --git a/MechJeb2/Maneuver/OperationAdvancedTransfer.cs b/MechJeb2/Maneuver/OperationAdvancedTransfer.cs
index 221df744..4429efe0 100644
--- a/MechJeb2/Maneuver/OperationAdvancedTransfer.cs
+++ b/MechJeb2/Maneuver/OperationAdvancedTransfer.cs
@@ -3,7 +3,7 @@
 using JetBrains.Annotations;
 using KSP.Localization;
 using UnityEngine;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using Object = UnityEngine.Object;
 
 namespace MuMech
diff --git a/MechJeb2/Maneuver/OperationEllipticize.cs b/MechJeb2/Maneuver/OperationEllipticize.cs
index 2972bd12..c56fec6f 100644
--- a/MechJeb2/Maneuver/OperationEllipticize.cs
+++ b/MechJeb2/Maneuver/OperationEllipticize.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using KSP.Localization;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MuMech
 {
diff --git a/MechJeb2/Maneuver/OperationPeriapsis.cs b/MechJeb2/Maneuver/OperationPeriapsis.cs
index 6ff397be..38edbfe4 100644
--- a/MechJeb2/Maneuver/OperationPeriapsis.cs
+++ b/MechJeb2/Maneuver/OperationPeriapsis.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using KSP.Localization;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MuMech
 {
diff --git a/MechJeb2/Maneuver/OperationSemiMajor.cs b/MechJeb2/Maneuver/OperationSemiMajor.cs
index 13aa2b01..55c06417 100644
--- a/MechJeb2/Maneuver/OperationSemiMajor.cs
+++ b/MechJeb2/Maneuver/OperationSemiMajor.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using KSP.Localization;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MuMech
 {
diff --git a/MechJeb2/MechJeb2.csproj b/MechJeb2/MechJeb2.csproj
index e789b428..c1925cea 100644
--- a/MechJeb2/MechJeb2.csproj
+++ b/MechJeb2/MechJeb2.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"/>
+    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
     <PropertyGroup>
         <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
         <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,7 +12,7 @@
         <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
         <NoStdLib>true</NoStdLib>
         <FileAlignment>512</FileAlignment>
-        <TargetFrameworkProfile/>
+        <TargetFrameworkProfile />
         <NuGetPackageImportStamp>
         </NuGetPackageImportStamp>
         <LangVersion>8</LangVersion>
@@ -40,248 +40,248 @@
         <CodeAnalysisRuleSet>MechJeb2.ruleset</CodeAnalysisRuleSet>
     </PropertyGroup>
     <ItemGroup>
-        <Compile Include="AttitudeControllers\BaseAttitudeController.cs"/>
-        <Compile Include="AttitudeControllers\BetterController.cs"/>
-        <Compile Include="AttitudeControllers\HybridController.cs"/>
-        <Compile Include="AttitudeControllers\KosAttitudeController.cs"/>
-        <Compile Include="AttitudeControllers\MJAttitudeController.cs"/>
-        <Compile Include="AttitudeControllers\KosPIDLoop.cs"/>
-        <Compile Include="AttitudeControllers\TorquePI.cs"/>
-        <Compile Include="AutopilotModule.cs"/>
-        <Compile Include="CachedLocalizer.cs"/>
-        <Compile Include="CelestialBodyExtensions.cs"/>
-        <Compile Include="CompatibilityChecker.cs"/>
-        <Compile Include="ComputerModule.cs"/>
-        <Compile Include="DisplayModule.cs"/>
-        <Compile Include="FlyingSim\SimulatedParachute.cs"/>
-        <Compile Include="FlyingSim\SimulatedPart.cs"/>
-        <Compile Include="FlyingSim\SimulatedVessel.cs"/>
-        <Compile Include="FuelFlowSimulation.cs"/>
-        <Compile Include="FuelNode.cs"/>
-        <Compile Include="FuelStats.cs"/>
-        <Compile Include="GlobalSuppressions.cs"/>
-        <Compile Include="GLUtils.cs"/>
-        <Compile Include="GuiUtils.cs"/>
-        <Compile Include="InstallChecker.cs"/>
-        <Compile Include="LandingAutopilot\CoastToDeceleration.cs"/>
-        <Compile Include="LandingAutopilot\CourseCorrection.cs"/>
-        <Compile Include="LandingAutopilot\DecelerationBurn.cs"/>
-        <Compile Include="LandingAutopilot\DeorbitBurn.cs"/>
-        <Compile Include="LandingAutopilot\FinalDescent.cs"/>
-        <Compile Include="LandingAutopilot\KillHorizontalVelocity.cs"/>
-        <Compile Include="LandingAutopilot\LowDeorbitBurn.cs"/>
-        <Compile Include="LandingAutopilot\PlaneChange.cs"/>
-        <Compile Include="LandingAutopilot\UntargetedDeorbit.cs"/>
-        <Compile Include="Maneuver\Operation.cs"/>
-        <Compile Include="Maneuver\OperationAdvancedTransfer.cs"/>
-        <Compile Include="Maneuver\OperationApoapsis.cs"/>
-        <Compile Include="Maneuver\OperationCircularize.cs"/>
-        <Compile Include="Maneuver\OperationCourseCorrection.cs"/>
-        <Compile Include="Maneuver\OperationEccentricity.cs"/>
-        <Compile Include="Maneuver\OperationEllipticize.cs"/>
-        <Compile Include="Maneuver\OperationInclination.cs"/>
-        <Compile Include="Maneuver\OperationInterplanetaryTransfer.cs"/>
-        <Compile Include="Maneuver\OperationKillRelVel.cs"/>
-        <Compile Include="Maneuver\OperationLambert.cs"/>
-        <Compile Include="Maneuver\OperationLan.cs"/>
-        <Compile Include="Maneuver\OperationLongitude.cs"/>
-        <Compile Include="Maneuver\OperationMoonReturn.cs"/>
-        <Compile Include="Maneuver\OperationPeriapsis.cs"/>
-        <Compile Include="Maneuver\OperationPlane.cs"/>
-        <Compile Include="Maneuver\OperationResonantOrbit.cs"/>
-        <Compile Include="Maneuver\OperationSemiMajor.cs"/>
-        <Compile Include="Maneuver\OperationTransfer.cs"/>
-        <Compile Include="Maneuver\PlotArea.cs"/>
-        <Compile Include="Maneuver\Porkchop.cs"/>
-        <Compile Include="Maneuver\TimeSelector.cs"/>
-        <Compile Include="Maneuver\TransferCalculator.cs"/>
-        <Compile Include="MathExtensions.cs"/>
-        <Compile Include="MechJebAR202.cs"/>
-        <Compile Include="MechJebCore.cs"/>
-        <Compile Include="MechJebLib\Control\PIDLoop.cs"/>
-        <Compile Include="MechJebLib\Core\Bisection.cs"/>
-        <Compile Include="MechJebLib\Core\BrentMin.cs"/>
-        <Compile Include="MechJebLib\Core\BrentRoot.cs"/>
-        <Compile Include="MechJebLib\Core\FunctionImpls\RealDeltaVToChangeApoapsisPrograde.cs"/>
-        <Compile Include="MechJebLib\Core\FunctionImpls\RealSingleImpulseHyperbolicBurn.cs"/>
-        <Compile Include="MechJebLib\Core\Functions\Interpolants.cs"/>
-        <Compile Include="MechJebLib\Core\Functions\Maneuvers.cs"/>
-        <Compile Include="MechJebLib\Core\Maths.cs"/>
-        <Compile Include="MechJebLib\Core\Functions\Angles.cs"/>
-        <Compile Include="MechJebLib\Core\Gooding.cs"/>
-        <Compile Include="MechJebLib\Core\ODE\BS3.cs"/>
-        <Compile Include="MechJebLib\Core\ODE\DP5.cs"/>
-        <Compile Include="MechJebLib\Core\ODE\AbstractIVP.cs"/>
-        <Compile Include="MechJebLib\Core\ODE\AbstractRungeKutta.cs"/>
-        <Compile Include="MechJebLib\Core\ODE\Event.cs"/>
-        <Compile Include="MechJebLib\Core\TwoBody\Shepperd.cs"/>
-        <Compile Include="MechJebLib\Core\TwoBody\Farnocchia.cs"/>
-        <Compile Include="MechJebLib\Maneuvers\ChangeOrbitalElement.cs"/>
-        <Compile Include="MechJebLib\Maneuvers\ReturnFromMoon.cs"/>
-        <Compile Include="MechJebLib\Maneuvers\Simple.cs"/>
-        <Compile Include="MechJebLib\Primitives\Dual.cs"/>
-        <Compile Include="MechJebLib\Primitives\DualV3.cs"/>
-        <Compile Include="MechJebLib\Primitives\Vn.cs"/>
-        <Compile Include="MechJebLib\Primitives\Scale.cs"/>
-        <Compile Include="MechJebLib\PVG\ContinuityLayout.cs"/>
-        <Compile Include="MechJebLib\PVG\InputLayout.cs"/>
-        <Compile Include="MechJebLib\PVG\OutputLayout.cs"/>
-        <Compile Include="MechJebLib\PVG\AscentBuilder.cs"/>
-        <Compile Include="MechJebLib\PVG\Integrators\IPVGIntegrator.cs"/>
-        <Compile Include="MechJebLib\PVG\Integrators\VacuumCoastAnalytic.cs"/>
-        <Compile Include="MechJebLib\PVG\Integrators\VacuumThrustAnalytic.cs"/>
-        <Compile Include="MechJebLib\PVG\Integrators\VacuumThrustIntegrator.cs"/>
-        <Compile Include="MechJebLib\PVG\Ascent.cs"/>
-        <Compile Include="MechJebLib\PVG\Phase.cs"/>
-        <Compile Include="MechJebLib\PVG\Problem.cs"/>
-        <Compile Include="MechJebLib\PVG\OptimizerBuilder.cs"/>
-        <Compile Include="MechJebLib\PVG\ResidualLayout.cs"/>
-        <Compile Include="MechJebLib\PVG\Solution.cs"/>
-        <Compile Include="MechJebLib\PVG\Optimizer.cs"/>
-        <Compile Include="MechJebLib\PVG\Terminal\FlightPathAngle3Energy.cs"/>
-        <Compile Include="MechJebLib\PVG\Terminal\FlightPathAngle4Energy.cs"/>
-        <Compile Include="MechJebLib\PVG\Terminal\FlightPathAngle4Reduced.cs"/>
-        <Compile Include="MechJebLib\PVG\Terminal\FlightPathAngle4Propellant.cs"/>
-        <Compile Include="MechJebLib\PVG\Terminal\FlightPathAngle5Reduced.cs"/>
-        <Compile Include="MechJebLib\PVG\Terminal\Intercept6Cartesian.cs"/>
-        <Compile Include="MechJebLib\PVG\Terminal\IPVGTerminal.cs"/>
-        <Compile Include="MechJebLib\Primitives\H1.cs"/>
-        <Compile Include="MechJebLib\Primitives\H3.cs"/>
-        <Compile Include="MechJebLib\Primitives\HBase.cs"/>
-        <Compile Include="MechJebLib\Primitives\Hn.cs"/>
-        <Compile Include="MechJebLib\Primitives\M3.cs"/>
-        <Compile Include="MechJebLib\Primitives\Q3.cs"/>
-        <Compile Include="MechJebLib\Primitives\V3.cs"/>
-        <Compile Include="MechJebLib\PVG\Terminal\Kepler3Reduced.cs"/>
-        <Compile Include="MechJebLib\PVG\Terminal\Kepler4Reduced.cs"/>
-        <Compile Include="MechJebLib\PVG\Terminal\Kepler5Reduced.cs"/>
-        <Compile Include="MechJebLib\Simulations\SimVesselManager.cs"/>
-        <Compile Include="MechJebLib\Simulations\SimVesselUpdater.cs"/>
-        <Compile Include="MechJebLib\Suicide.cs"/>
-        <Compile Include="MechJebLib\SuicideBuilder.cs"/>
-        <Compile Include="MechJebLib\Utils\BackgroundJob.cs"/>
-        <Compile Include="MechJebLib\Simulations\SimVesselBuilder.cs"/>
-        <Compile Include="MechJebLib\Simulations\DecouplingAnalyzer.cs"/>
-        <Compile Include="MechJebLib\Simulations\FuelFlowSimulation.cs"/>
-        <Compile Include="MechJebLib\Simulations\FuelStats.cs"/>
-        <Compile Include="MechJebLib\Simulations\PartModules\SimModuleRCS.cs"/>
-        <Compile Include="MechJebLib\Simulations\SimPart.cs"/>
-        <Compile Include="MechJebLib\Simulations\SimPartModule.cs"/>
-        <Compile Include="MechJebLib\Simulations\PartModules\SimLaunchClamp.cs"/>
-        <Compile Include="MechJebLib\Simulations\PartModules\SimModuleDecouple.cs"/>
-        <Compile Include="MechJebLib\Simulations\PartModules\SimModuleDockingNode.cs"/>
-        <Compile Include="MechJebLib\Simulations\PartModules\SimModuleEngines.cs"/>
-        <Compile Include="MechJebLib\Simulations\PartModules\SimProceduralFairingDecoupler.cs"/>
-        <Compile Include="MechJebLib\Simulations\SimPropellant.cs"/>
-        <Compile Include="MechJebLib\Simulations\SimResource.cs"/>
-        <Compile Include="MechJebLib\Simulations\SimVessel.cs"/>
-        <Compile Include="MechJebLib\Utils\Check.cs"/>
-        <Compile Include="MechJebLib\Utils\Logger.cs"/>
-        <Compile Include="MechJebLib\Utils\ObjectPool.cs"/>
-        <Compile Include="MechJebLib\Utils\Statics.cs"/>
-        <Compile Include="MechJebLib\Utils\DictOfLists.cs"/>
-        <Compile Include="MechJebModuleAirplaneAutopilot.cs"/>
-        <Compile Include="MechJebModuleAirplaneGuidance.cs"/>
-        <Compile Include="MechJebModuleAscentBaseAutopilot.cs"/>
-        <Compile Include="MechJebModuleAscentClassicAutopilot.cs"/>
-        <Compile Include="MechJebModuleAscentClassicPathMenu.cs"/>
-        <Compile Include="MechJebModuleAscentGTAutopilot.cs"/>
-        <Compile Include="MechJebModuleAscentMenu.cs"/>
-        <Compile Include="MechJebModuleAscentPVGAutopilot.cs"/>
-        <Compile Include="MechJebModuleAscentPVGSettingsMenu.cs"/>
-        <Compile Include="MechJebModuleAscentSettings.cs"/>
-        <Compile Include="MechJebModuleAscentSettingsMenu.cs"/>
-        <Compile Include="MechJebModuleAttitudeAdjustment.cs"/>
-        <Compile Include="MechJebModuleAttitudeController.cs"/>
-        <Compile Include="MechJebModuleCustomInfoWindow.cs"/>
-        <Compile Include="MechJebModuleDebugArrows.cs"/>
-        <Compile Include="MechJebModuleDeployableAntennaController.cs"/>
-        <Compile Include="MechJebModuleDeployableController.cs"/>
-        <Compile Include="MechJebModuleDockingAutopilot.cs"/>
-        <Compile Include="MechJebModuleDockingGuidance.cs"/>
-        <Compile Include="MechJebModuleFlightRecorder.cs"/>
-        <Compile Include="MechJebModuleFlightRecorderGraph.cs"/>
-        <Compile Include="MechJebModuleInfoItems.cs"/>
-        <Compile Include="MechJebModuleLandingAutopilot.cs"/>
-        <Compile Include="MechJebModuleLandingGuidance.cs"/>
-        <Compile Include="MechJebModuleLandingPredictions.cs"/>
-        <Compile Include="MechJebModuleManeuverPlanner.cs"/>
-        <Compile Include="MechJebModuleMenu.cs"/>
-        <Compile Include="MechJebModuleStageStats.cs"/>
-        <Compile Include="MechJebModuleNodeEditor.cs"/>
-        <Compile Include="MechJebModuleNodeExecutor.cs"/>
-        <Compile Include="MechJebModuleGuidanceController.cs"/>
-        <Compile Include="MechJebModuleRCSBalancer.cs"/>
-        <Compile Include="MechJebModuleRCSBalancerWindow.cs"/>
-        <Compile Include="MechJebModuleRCSController.cs"/>
-        <Compile Include="MechJebModuleRendezvousAutopilot.cs"/>
-        <Compile Include="MechJebModuleRendezvousAutopilotWindow.cs"/>
-        <Compile Include="MechJebModuleRendezvousGuidance.cs"/>
-        <Compile Include="MechJebModuleRoverController.cs"/>
-        <Compile Include="MechJebModuleRoverWindow.cs"/>
-        <Compile Include="MechJebModuleSettings.cs"/>
-        <Compile Include="MechJebModuleSmartASS.cs"/>
-        <Compile Include="MechJebModuleSmartRcs.cs"/>
-        <Compile Include="MechJebModuleSolarPanelController.cs"/>
-        <Compile Include="MechJebModuleSpaceplaneAutopilot.cs"/>
-        <Compile Include="MechJebModuleSpaceplaneGuidance.cs"/>
-        <Compile Include="MechJebModuleSpinupController.cs"/>
-        <Compile Include="MechJebModuleStageStatsOld.cs"/>
-        <Compile Include="MechJebModuleStagingController.cs"/>
-        <Compile Include="MechJebModuleSuicideTimer.cs"/>
-        <Compile Include="MechJebModuleTargetController.cs"/>
-        <Compile Include="MechJebModuleThrustController.cs"/>
-        <Compile Include="MechJebModuleThrustWindow.cs"/>
-        <Compile Include="MechJebModuleTranslatron.cs"/>
-        <Compile Include="MechJebModuleWarpController.cs"/>
-        <Compile Include="MechJebModuleWarpHelper.cs"/>
-        <Compile Include="MechJebModuleWaypointWindow.cs"/>
-        <Compile Include="MechjebBundlesManager.cs"/>
-        <Compile Include="MechJebStageStatsHelper.cs"/>
-        <Compile Include="ModExtensionDemo.cs"/>
-        <Compile Include="MuUtils.cs"/>
-        <Compile Include="OrbitExtensions.cs"/>
-        <Compile Include="OrbitalManeuverCalculator.cs"/>
-        <Compile Include="PIDController.cs"/>
-        <Compile Include="PartExtensions.cs"/>
-        <Compile Include="Properties\AssemblyInfo.cs"/>
-        <Compile Include="Properties\Resources.Designer.cs"/>
-        <Compile Include="MechJebModulePVGGlueBall.cs"/>
-        <Compile Include="RCSSolver.cs"/>
-        <Compile Include="ReentrySimulation.cs"/>
-        <Compile Include="ReentrySimulation\SimCurves.cs"/>
-        <Compile Include="ReflectionUtils.cs"/>
-        <Compile Include="ToolbarWrapper.cs"/>
-        <Compile Include="UnityToolbag\Dispatcher\Dispatcher.cs"/>
-        <Compile Include="UnityToolbag\Future\Future.cs"/>
-        <Compile Include="Vector6.cs"/>
-        <Compile Include="VesselExtensions.cs"/>
-        <Compile Include="VesselState.cs"/>
-        <Compile Include="alglib\alglibinternal.cs"/>
-        <Compile Include="alglib\alglibmisc.cs"/>
-        <Compile Include="alglib\ap.cs"/>
-        <Compile Include="alglib\dataanalysis.cs"/>
-        <Compile Include="alglib\diffequations.cs"/>
-        <Compile Include="alglib\fasttransforms.cs"/>
-        <Compile Include="alglib\integration.cs"/>
-        <Compile Include="alglib\interpolation.cs"/>
-        <Compile Include="alglib\linalg.cs"/>
-        <Compile Include="alglib\optimization.cs"/>
-        <Compile Include="alglib\solvers.cs"/>
-        <Compile Include="alglib\specialfunctions.cs"/>
-        <Compile Include="alglib\statistics.cs"/>
+        <Compile Include="AttitudeControllers\BaseAttitudeController.cs" />
+        <Compile Include="AttitudeControllers\BetterController.cs" />
+        <Compile Include="AttitudeControllers\HybridController.cs" />
+        <Compile Include="AttitudeControllers\KosAttitudeController.cs" />
+        <Compile Include="AttitudeControllers\MJAttitudeController.cs" />
+        <Compile Include="AttitudeControllers\KosPIDLoop.cs" />
+        <Compile Include="AttitudeControllers\TorquePI.cs" />
+        <Compile Include="AutopilotModule.cs" />
+        <Compile Include="CachedLocalizer.cs" />
+        <Compile Include="CelestialBodyExtensions.cs" />
+        <Compile Include="CompatibilityChecker.cs" />
+        <Compile Include="ComputerModule.cs" />
+        <Compile Include="DisplayModule.cs" />
+        <Compile Include="FlyingSim\SimulatedParachute.cs" />
+        <Compile Include="FlyingSim\SimulatedPart.cs" />
+        <Compile Include="FlyingSim\SimulatedVessel.cs" />
+        <Compile Include="FuelFlowSimulation.cs" />
+        <Compile Include="FuelNode.cs" />
+        <Compile Include="FuelStats.cs" />
+        <Compile Include="GlobalSuppressions.cs" />
+        <Compile Include="GLUtils.cs" />
+        <Compile Include="GuiUtils.cs" />
+        <Compile Include="InstallChecker.cs" />
+        <Compile Include="LandingAutopilot\CoastToDeceleration.cs" />
+        <Compile Include="LandingAutopilot\CourseCorrection.cs" />
+        <Compile Include="LandingAutopilot\DecelerationBurn.cs" />
+        <Compile Include="LandingAutopilot\DeorbitBurn.cs" />
+        <Compile Include="LandingAutopilot\FinalDescent.cs" />
+        <Compile Include="LandingAutopilot\KillHorizontalVelocity.cs" />
+        <Compile Include="LandingAutopilot\LowDeorbitBurn.cs" />
+        <Compile Include="LandingAutopilot\PlaneChange.cs" />
+        <Compile Include="LandingAutopilot\UntargetedDeorbit.cs" />
+        <Compile Include="Maneuver\Operation.cs" />
+        <Compile Include="Maneuver\OperationAdvancedTransfer.cs" />
+        <Compile Include="Maneuver\OperationApoapsis.cs" />
+        <Compile Include="Maneuver\OperationCircularize.cs" />
+        <Compile Include="Maneuver\OperationCourseCorrection.cs" />
+        <Compile Include="Maneuver\OperationEccentricity.cs" />
+        <Compile Include="Maneuver\OperationEllipticize.cs" />
+        <Compile Include="Maneuver\OperationInclination.cs" />
+        <Compile Include="Maneuver\OperationInterplanetaryTransfer.cs" />
+        <Compile Include="Maneuver\OperationKillRelVel.cs" />
+        <Compile Include="Maneuver\OperationLambert.cs" />
+        <Compile Include="Maneuver\OperationLan.cs" />
+        <Compile Include="Maneuver\OperationLongitude.cs" />
+        <Compile Include="Maneuver\OperationMoonReturn.cs" />
+        <Compile Include="Maneuver\OperationPeriapsis.cs" />
+        <Compile Include="Maneuver\OperationPlane.cs" />
+        <Compile Include="Maneuver\OperationResonantOrbit.cs" />
+        <Compile Include="Maneuver\OperationSemiMajor.cs" />
+        <Compile Include="Maneuver\OperationTransfer.cs" />
+        <Compile Include="Maneuver\PlotArea.cs" />
+        <Compile Include="Maneuver\Porkchop.cs" />
+        <Compile Include="Maneuver\TimeSelector.cs" />
+        <Compile Include="Maneuver\TransferCalculator.cs" />
+        <Compile Include="MathExtensions.cs" />
+        <Compile Include="MechJebAR202.cs" />
+        <Compile Include="MechJebCore.cs" />
+        <Compile Include="MechJebLib\Control\PIDLoop.cs" />
+        <Compile Include="MechJebLib\Core\Bisection.cs" />
+        <Compile Include="MechJebLib\Core\BrentMin.cs" />
+        <Compile Include="MechJebLib\Core\BrentRoot.cs" />
+        <Compile Include="MechJebLib\Core\FunctionImpls\RealDeltaVToChangeApoapsisPrograde.cs" />
+        <Compile Include="MechJebLib\Core\FunctionImpls\RealSingleImpulseHyperbolicBurn.cs" />
+        <Compile Include="MechJebLib\Core\Functions\Interpolants.cs" />
+        <Compile Include="MechJebLib\Core\Functions\Maneuvers.cs" />
+        <Compile Include="MechJebLib\Core\Maths.cs" />
+        <Compile Include="MechJebLib\Core\Functions\Angles.cs" />
+        <Compile Include="MechJebLib\Core\Gooding.cs" />
+        <Compile Include="MechJebLib\Core\ODE\BS3.cs" />
+        <Compile Include="MechJebLib\Core\ODE\DP5.cs" />
+        <Compile Include="MechJebLib\Core\ODE\AbstractIVP.cs" />
+        <Compile Include="MechJebLib\Core\ODE\AbstractRungeKutta.cs" />
+        <Compile Include="MechJebLib\Core\ODE\Event.cs" />
+        <Compile Include="MechJebLib\Core\TwoBody\Shepperd.cs" />
+        <Compile Include="MechJebLib\Core\TwoBody\Farnocchia.cs" />
+        <Compile Include="MechJebLib\Maneuvers\ChangeOrbitalElement.cs" />
+        <Compile Include="MechJebLib\Maneuvers\ReturnFromMoon.cs" />
+        <Compile Include="MechJebLib\Maneuvers\Simple.cs" />
+        <Compile Include="MechJebLib\Primitives\Dual.cs" />
+        <Compile Include="MechJebLib\Primitives\DualV3.cs" />
+        <Compile Include="MechJebLib\Primitives\Vn.cs" />
+        <Compile Include="MechJebLib\Primitives\Scale.cs" />
+        <Compile Include="MechJebLib\PVG\ContinuityLayout.cs" />
+        <Compile Include="MechJebLib\PVG\InputLayout.cs" />
+        <Compile Include="MechJebLib\PVG\OutputLayout.cs" />
+        <Compile Include="MechJebLib\PVG\AscentBuilder.cs" />
+        <Compile Include="MechJebLib\PVG\Integrators\IPVGIntegrator.cs" />
+        <Compile Include="MechJebLib\PVG\Integrators\VacuumCoastAnalytic.cs" />
+        <Compile Include="MechJebLib\PVG\Integrators\VacuumThrustAnalytic.cs" />
+        <Compile Include="MechJebLib\PVG\Integrators\VacuumThrustIntegrator.cs" />
+        <Compile Include="MechJebLib\PVG\Ascent.cs" />
+        <Compile Include="MechJebLib\PVG\Phase.cs" />
+        <Compile Include="MechJebLib\PVG\Problem.cs" />
+        <Compile Include="MechJebLib\PVG\OptimizerBuilder.cs" />
+        <Compile Include="MechJebLib\PVG\ResidualLayout.cs" />
+        <Compile Include="MechJebLib\PVG\Solution.cs" />
+        <Compile Include="MechJebLib\PVG\Optimizer.cs" />
+        <Compile Include="MechJebLib\PVG\Terminal\FlightPathAngle3Energy.cs" />
+        <Compile Include="MechJebLib\PVG\Terminal\FlightPathAngle4Energy.cs" />
+        <Compile Include="MechJebLib\PVG\Terminal\FlightPathAngle4Reduced.cs" />
+        <Compile Include="MechJebLib\PVG\Terminal\FlightPathAngle4Propellant.cs" />
+        <Compile Include="MechJebLib\PVG\Terminal\FlightPathAngle5Reduced.cs" />
+        <Compile Include="MechJebLib\PVG\Terminal\Intercept6Cartesian.cs" />
+        <Compile Include="MechJebLib\PVG\Terminal\IPVGTerminal.cs" />
+        <Compile Include="MechJebLib\Primitives\H1.cs" />
+        <Compile Include="MechJebLib\Primitives\H3.cs" />
+        <Compile Include="MechJebLib\Primitives\HBase.cs" />
+        <Compile Include="MechJebLib\Primitives\Hn.cs" />
+        <Compile Include="MechJebLib\Primitives\M3.cs" />
+        <Compile Include="MechJebLib\Primitives\Q3.cs" />
+        <Compile Include="MechJebLib\Primitives\V3.cs" />
+        <Compile Include="MechJebLib\PVG\Terminal\Kepler3Reduced.cs" />
+        <Compile Include="MechJebLib\PVG\Terminal\Kepler4Reduced.cs" />
+        <Compile Include="MechJebLib\PVG\Terminal\Kepler5Reduced.cs" />
+        <Compile Include="MechJebLib\Simulations\SimVesselManager.cs" />
+        <Compile Include="MechJebLib\Simulations\SimVesselUpdater.cs" />
+        <Compile Include="MechJebLib\Statics.cs" />
+        <Compile Include="MechJebLib\Suicide.cs" />
+        <Compile Include="MechJebLib\SuicideBuilder.cs" />
+        <Compile Include="MechJebLib\Utils\BackgroundJob.cs" />
+        <Compile Include="MechJebLib\Simulations\SimVesselBuilder.cs" />
+        <Compile Include="MechJebLib\Simulations\DecouplingAnalyzer.cs" />
+        <Compile Include="MechJebLib\Simulations\FuelFlowSimulation.cs" />
+        <Compile Include="MechJebLib\Simulations\FuelStats.cs" />
+        <Compile Include="MechJebLib\Simulations\PartModules\SimModuleRCS.cs" />
+        <Compile Include="MechJebLib\Simulations\SimPart.cs" />
+        <Compile Include="MechJebLib\Simulations\SimPartModule.cs" />
+        <Compile Include="MechJebLib\Simulations\PartModules\SimLaunchClamp.cs" />
+        <Compile Include="MechJebLib\Simulations\PartModules\SimModuleDecouple.cs" />
+        <Compile Include="MechJebLib\Simulations\PartModules\SimModuleDockingNode.cs" />
+        <Compile Include="MechJebLib\Simulations\PartModules\SimModuleEngines.cs" />
+        <Compile Include="MechJebLib\Simulations\PartModules\SimProceduralFairingDecoupler.cs" />
+        <Compile Include="MechJebLib\Simulations\SimPropellant.cs" />
+        <Compile Include="MechJebLib\Simulations\SimResource.cs" />
+        <Compile Include="MechJebLib\Simulations\SimVessel.cs" />
+        <Compile Include="MechJebLib\Utils\Check.cs" />
+        <Compile Include="MechJebLib\Utils\Logger.cs" />
+        <Compile Include="MechJebLib\Utils\ObjectPool.cs" />
+        <Compile Include="MechJebLib\Utils\DictOfLists.cs" />
+        <Compile Include="MechJebModuleAirplaneAutopilot.cs" />
+        <Compile Include="MechJebModuleAirplaneGuidance.cs" />
+        <Compile Include="MechJebModuleAscentBaseAutopilot.cs" />
+        <Compile Include="MechJebModuleAscentClassicAutopilot.cs" />
+        <Compile Include="MechJebModuleAscentClassicPathMenu.cs" />
+        <Compile Include="MechJebModuleAscentGTAutopilot.cs" />
+        <Compile Include="MechJebModuleAscentMenu.cs" />
+        <Compile Include="MechJebModuleAscentPVGAutopilot.cs" />
+        <Compile Include="MechJebModuleAscentPVGSettingsMenu.cs" />
+        <Compile Include="MechJebModuleAscentSettings.cs" />
+        <Compile Include="MechJebModuleAscentSettingsMenu.cs" />
+        <Compile Include="MechJebModuleAttitudeAdjustment.cs" />
+        <Compile Include="MechJebModuleAttitudeController.cs" />
+        <Compile Include="MechJebModuleCustomInfoWindow.cs" />
+        <Compile Include="MechJebModuleDebugArrows.cs" />
+        <Compile Include="MechJebModuleDeployableAntennaController.cs" />
+        <Compile Include="MechJebModuleDeployableController.cs" />
+        <Compile Include="MechJebModuleDockingAutopilot.cs" />
+        <Compile Include="MechJebModuleDockingGuidance.cs" />
+        <Compile Include="MechJebModuleFlightRecorder.cs" />
+        <Compile Include="MechJebModuleFlightRecorderGraph.cs" />
+        <Compile Include="MechJebModuleInfoItems.cs" />
+        <Compile Include="MechJebModuleLandingAutopilot.cs" />
+        <Compile Include="MechJebModuleLandingGuidance.cs" />
+        <Compile Include="MechJebModuleLandingPredictions.cs" />
+        <Compile Include="MechJebModuleManeuverPlanner.cs" />
+        <Compile Include="MechJebModuleMenu.cs" />
+        <Compile Include="MechJebModuleStageStats.cs" />
+        <Compile Include="MechJebModuleNodeEditor.cs" />
+        <Compile Include="MechJebModuleNodeExecutor.cs" />
+        <Compile Include="MechJebModuleGuidanceController.cs" />
+        <Compile Include="MechJebModuleRCSBalancer.cs" />
+        <Compile Include="MechJebModuleRCSBalancerWindow.cs" />
+        <Compile Include="MechJebModuleRCSController.cs" />
+        <Compile Include="MechJebModuleRendezvousAutopilot.cs" />
+        <Compile Include="MechJebModuleRendezvousAutopilotWindow.cs" />
+        <Compile Include="MechJebModuleRendezvousGuidance.cs" />
+        <Compile Include="MechJebModuleRoverController.cs" />
+        <Compile Include="MechJebModuleRoverWindow.cs" />
+        <Compile Include="MechJebModuleSettings.cs" />
+        <Compile Include="MechJebModuleSmartASS.cs" />
+        <Compile Include="MechJebModuleSmartRcs.cs" />
+        <Compile Include="MechJebModuleSolarPanelController.cs" />
+        <Compile Include="MechJebModuleSpaceplaneAutopilot.cs" />
+        <Compile Include="MechJebModuleSpaceplaneGuidance.cs" />
+        <Compile Include="MechJebModuleSpinupController.cs" />
+        <Compile Include="MechJebModuleStageStatsOld.cs" />
+        <Compile Include="MechJebModuleStagingController.cs" />
+        <Compile Include="MechJebModuleSuicideTimer.cs" />
+        <Compile Include="MechJebModuleTargetController.cs" />
+        <Compile Include="MechJebModuleThrustController.cs" />
+        <Compile Include="MechJebModuleThrustWindow.cs" />
+        <Compile Include="MechJebModuleTranslatron.cs" />
+        <Compile Include="MechJebModuleWarpController.cs" />
+        <Compile Include="MechJebModuleWarpHelper.cs" />
+        <Compile Include="MechJebModuleWaypointWindow.cs" />
+        <Compile Include="MechjebBundlesManager.cs" />
+        <Compile Include="MechJebStageStatsHelper.cs" />
+        <Compile Include="ModExtensionDemo.cs" />
+        <Compile Include="MuUtils.cs" />
+        <Compile Include="OrbitExtensions.cs" />
+        <Compile Include="OrbitalManeuverCalculator.cs" />
+        <Compile Include="PIDController.cs" />
+        <Compile Include="PartExtensions.cs" />
+        <Compile Include="Properties\AssemblyInfo.cs" />
+        <Compile Include="Properties\Resources.Designer.cs" />
+        <Compile Include="MechJebModulePVGGlueBall.cs" />
+        <Compile Include="RCSSolver.cs" />
+        <Compile Include="ReentrySimulation.cs" />
+        <Compile Include="ReentrySimulation\SimCurves.cs" />
+        <Compile Include="ReflectionUtils.cs" />
+        <Compile Include="ToolbarWrapper.cs" />
+        <Compile Include="UnityToolbag\Dispatcher\Dispatcher.cs" />
+        <Compile Include="UnityToolbag\Future\Future.cs" />
+        <Compile Include="Vector6.cs" />
+        <Compile Include="VesselExtensions.cs" />
+        <Compile Include="VesselState.cs" />
+        <Compile Include="alglib\alglibinternal.cs" />
+        <Compile Include="alglib\alglibmisc.cs" />
+        <Compile Include="alglib\ap.cs" />
+        <Compile Include="alglib\dataanalysis.cs" />
+        <Compile Include="alglib\diffequations.cs" />
+        <Compile Include="alglib\fasttransforms.cs" />
+        <Compile Include="alglib\integration.cs" />
+        <Compile Include="alglib\interpolation.cs" />
+        <Compile Include="alglib\linalg.cs" />
+        <Compile Include="alglib\optimization.cs" />
+        <Compile Include="alglib\solvers.cs" />
+        <Compile Include="alglib\specialfunctions.cs" />
+        <Compile Include="alglib\statistics.cs" />
     </ItemGroup>
     <ItemGroup>
-        <EmbeddedResource Include="Properties\Resources.resx"/>
+        <EmbeddedResource Include="Properties\Resources.resx" />
     </ItemGroup>
     <ItemGroup>
-        <None Include="copy_build.bat"/>
-        <None Include="copy_build.sh"/>
-        <None Include="Properties\shader"/>
-        <None Include="Properties\shader2"/>
-        <None Include="Properties\shader3"/>
-        <None Include="UnityToolbag\Dispatcher\README.md"/>
-        <None Include="UnityToolbag\Future\README.md"/>
+        <None Include="copy_build.bat" />
+        <None Include="copy_build.sh" />
+        <None Include="Properties\shader" />
+        <None Include="Properties\shader2" />
+        <None Include="Properties\shader3" />
+        <None Include="UnityToolbag\Dispatcher\README.md" />
+        <None Include="UnityToolbag\Future\README.md" />
     </ItemGroup>
     <ItemGroup>
         <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -343,12 +343,12 @@
             <Private>False</Private>
         </Reference>
     </ItemGroup>
-    <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
+    <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
     <Target Name="AfterBuild" Condition=" '$(OS)' == 'Windows_NT' ">
-        <Exec Command="call &quot;$(ProjectDir)copy_build.bat&quot; &quot;$(TargetPath)&quot; &quot;$(TargetDir)&quot; &quot;$(TargetName)&quot; &quot;$(ProjectDir)&quot;"/>
+        <Exec Command="call &quot;$(ProjectDir)copy_build.bat&quot; &quot;$(TargetPath)&quot; &quot;$(TargetDir)&quot; &quot;$(TargetName)&quot; &quot;$(ProjectDir)&quot;" />
     </Target>
     <Target Name="AfterBuild" Condition=" '$(OS)' != 'Windows_NT' ">
-        <Exec Command="'$(ProjectDir)/copy_build.sh' '$(TargetPath)' '$(TargetDir)' '$(TargetName)' '$(ProjectDir)' '$(ReferencePath)'"/>
+        <Exec Command="'$(ProjectDir)/copy_build.sh' '$(TargetPath)' '$(TargetDir)' '$(TargetName)' '$(ProjectDir)' '$(ReferencePath)'" />
     </Target>
     <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
          Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/MechJeb2/MechJebLib/Control/PIDLoop.cs b/MechJeb2/MechJebLib/Control/PIDLoop.cs
index 98b01e88..e7b33d05 100644
--- a/MechJeb2/MechJebLib/Control/PIDLoop.cs
+++ b/MechJeb2/MechJebLib/Control/PIDLoop.cs
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+
  */
 
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 #nullable enable
diff --git a/MechJeb2/MechJebLib/Core/BrentMin.cs b/MechJeb2/MechJebLib/Core/BrentMin.cs
index debb2074..4ee479d6 100644
--- a/MechJeb2/MechJebLib/Core/BrentMin.cs
+++ b/MechJeb2/MechJebLib/Core/BrentMin.cs
@@ -4,7 +4,7 @@
  */
 
 using System;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 #nullable enable
diff --git a/MechJeb2/MechJebLib/Core/BrentRoot.cs b/MechJeb2/MechJebLib/Core/BrentRoot.cs
index 118c57d0..0bfb17b4 100644
--- a/MechJeb2/MechJebLib/Core/BrentRoot.cs
+++ b/MechJeb2/MechJebLib/Core/BrentRoot.cs
@@ -7,7 +7,7 @@
 
 using System;
 using MechJebLib.Utils;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 // ReSharper disable CompareOfFloatsByEqualityOperator
diff --git a/MechJeb2/MechJebLib/Core/FunctionImpls/RealSingleImpulseHyperbolicBurn.cs b/MechJeb2/MechJebLib/Core/FunctionImpls/RealSingleImpulseHyperbolicBurn.cs
index 5ef8953b..b6d3cd8b 100644
--- a/MechJeb2/MechJebLib/Core/FunctionImpls/RealSingleImpulseHyperbolicBurn.cs
+++ b/MechJeb2/MechJebLib/Core/FunctionImpls/RealSingleImpulseHyperbolicBurn.cs
@@ -5,7 +5,7 @@
 
 using System;
 using MechJebLib.Primitives;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 #nullable enable
 
diff --git a/MechJeb2/MechJebLib/Core/Functions/Angles.cs b/MechJeb2/MechJebLib/Core/Functions/Angles.cs
index 8ff649ed..f0cbbf5e 100644
--- a/MechJeb2/MechJebLib/Core/Functions/Angles.cs
+++ b/MechJeb2/MechJebLib/Core/Functions/Angles.cs
@@ -7,7 +7,7 @@
 using System.Runtime.CompilerServices;
 using JetBrains.Annotations;
 using MechJebLib.Utils;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 #nullable enable
diff --git a/MechJeb2/MechJebLib/Core/Gooding.cs b/MechJeb2/MechJebLib/Core/Gooding.cs
index 9e62deb2..a90b2e9d 100644
--- a/MechJeb2/MechJebLib/Core/Gooding.cs
+++ b/MechJeb2/MechJebLib/Core/Gooding.cs
@@ -6,7 +6,7 @@
 using System;
 using MechJebLib.Primitives;
 using MechJebLib.Utils;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 // ReSharper disable InconsistentNaming
diff --git a/MechJeb2/MechJebLib/Core/Maths.cs b/MechJeb2/MechJebLib/Core/Maths.cs
index dafd3854..b34ed118 100644
--- a/MechJeb2/MechJebLib/Core/Maths.cs
+++ b/MechJeb2/MechJebLib/Core/Maths.cs
@@ -7,7 +7,7 @@
 using MechJebLib.Core.FunctionImpls;
 using MechJebLib.Core.Functions;
 using MechJebLib.Primitives;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 #nullable enable
diff --git a/MechJeb2/MechJebLib/Core/ODE/AbstractIVP.cs b/MechJeb2/MechJebLib/Core/ODE/AbstractIVP.cs
index 7be4d3d4..f4671f5a 100644
--- a/MechJeb2/MechJebLib/Core/ODE/AbstractIVP.cs
+++ b/MechJeb2/MechJebLib/Core/ODE/AbstractIVP.cs
@@ -7,7 +7,7 @@
 using System.Collections.Generic;
 using System.Threading;
 using MechJebLib.Primitives;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 #nullable enable
 
diff --git a/MechJeb2/MechJebLib/Core/ODE/AbstractRungeKutta.cs b/MechJeb2/MechJebLib/Core/ODE/AbstractRungeKutta.cs
index 6c636bea..10c91919 100644
--- a/MechJeb2/MechJebLib/Core/ODE/AbstractRungeKutta.cs
+++ b/MechJeb2/MechJebLib/Core/ODE/AbstractRungeKutta.cs
@@ -9,7 +9,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using MechJebLib.Primitives;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 namespace MechJebLib.Core.ODE
diff --git a/MechJeb2/MechJebLib/Core/TwoBody/Farnocchia.cs b/MechJeb2/MechJebLib/Core/TwoBody/Farnocchia.cs
index 33c17749..000a1710 100644
--- a/MechJeb2/MechJebLib/Core/TwoBody/Farnocchia.cs
+++ b/MechJeb2/MechJebLib/Core/TwoBody/Farnocchia.cs
@@ -9,7 +9,7 @@
 using MechJebLib.Core.Functions;
 using MechJebLib.Primitives;
 using MechJebLib.Utils;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MechJebLib.Core.TwoBody
 {
diff --git a/MechJeb2/MechJebLib/Maneuvers/ChangeOrbitalElement.cs b/MechJeb2/MechJebLib/Maneuvers/ChangeOrbitalElement.cs
index 3365c104..4b932cc0 100644
--- a/MechJeb2/MechJebLib/Maneuvers/ChangeOrbitalElement.cs
+++ b/MechJeb2/MechJebLib/Maneuvers/ChangeOrbitalElement.cs
@@ -6,7 +6,7 @@
 using System;
 using MechJebLib.Core;
 using MechJebLib.Primitives;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 #nullable enable
diff --git a/MechJeb2/MechJebLib/Maneuvers/ReturnFromMoon.cs b/MechJeb2/MechJebLib/Maneuvers/ReturnFromMoon.cs
index d113e760..18435bc4 100644
--- a/MechJeb2/MechJebLib/Maneuvers/ReturnFromMoon.cs
+++ b/MechJeb2/MechJebLib/Maneuvers/ReturnFromMoon.cs
@@ -10,7 +10,7 @@
 using MechJebLib.Core;
 using MechJebLib.Core.TwoBody;
 using MechJebLib.Primitives;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 namespace MechJebLib.Maneuvers
diff --git a/MechJeb2/MechJebLib/Maneuvers/Simple.cs b/MechJeb2/MechJebLib/Maneuvers/Simple.cs
index 8423432f..f079535b 100644
--- a/MechJeb2/MechJebLib/Maneuvers/Simple.cs
+++ b/MechJeb2/MechJebLib/Maneuvers/Simple.cs
@@ -3,7 +3,7 @@
 using MechJebLib.Primitives;
 using MechJebLib.Utils;
 using static System.Math;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MechJebLib.Maneuvers
 {
diff --git a/MechJeb2/MechJebLib/PVG/Ascent.cs b/MechJeb2/MechJebLib/PVG/Ascent.cs
index 9d7d21ed..9679d2f2 100644
--- a/MechJeb2/MechJebLib/PVG/Ascent.cs
+++ b/MechJeb2/MechJebLib/PVG/Ascent.cs
@@ -9,7 +9,7 @@
 using System.Collections.Generic;
 using MechJebLib.Core;
 using MechJebLib.Primitives;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 namespace MechJebLib.PVG
diff --git a/MechJeb2/MechJebLib/PVG/AscentBuilder.cs b/MechJeb2/MechJebLib/PVG/AscentBuilder.cs
index 8c153a62..8ecc1759 100644
--- a/MechJeb2/MechJebLib/PVG/AscentBuilder.cs
+++ b/MechJeb2/MechJebLib/PVG/AscentBuilder.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using MechJebLib.Primitives;
 using MechJebLib.Utils;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 #nullable enable
 
diff --git a/MechJeb2/MechJebLib/PVG/Optimizer.cs b/MechJeb2/MechJebLib/PVG/Optimizer.cs
index 60f7364f..ce097fe0 100644
--- a/MechJeb2/MechJebLib/PVG/Optimizer.cs
+++ b/MechJeb2/MechJebLib/PVG/Optimizer.cs
@@ -9,7 +9,7 @@
 using System.Collections.Generic;
 using System.Threading;
 using MechJebLib.Primitives;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 namespace MechJebLib.PVG
diff --git a/MechJeb2/MechJebLib/PVG/Phase.cs b/MechJeb2/MechJebLib/PVG/Phase.cs
index 26a8ac20..72cf60bc 100644
--- a/MechJeb2/MechJebLib/PVG/Phase.cs
+++ b/MechJeb2/MechJebLib/PVG/Phase.cs
@@ -7,7 +7,7 @@
 using MechJebLib.Primitives;
 using MechJebLib.PVG.Integrators;
 using MechJebLib.Utils;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 #nullable enable
diff --git a/MechJeb2/MechJebLib/PVG/Solution.cs b/MechJeb2/MechJebLib/PVG/Solution.cs
index 4bf81396..4b047126 100644
--- a/MechJeb2/MechJebLib/PVG/Solution.cs
+++ b/MechJeb2/MechJebLib/PVG/Solution.cs
@@ -10,7 +10,7 @@
 using System.Text;
 using MechJebLib.Core;
 using MechJebLib.Primitives;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 namespace MechJebLib.PVG
diff --git a/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle3Energy.cs b/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle3Energy.cs
index 3b433273..e73d83be 100644
--- a/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle3Energy.cs
+++ b/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle3Energy.cs
@@ -5,7 +5,7 @@
 
 using System;
 using MechJebLib.Primitives;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 #nullable enable
 
diff --git a/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle4Energy.cs b/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle4Energy.cs
index 377caf38..68cab28a 100644
--- a/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle4Energy.cs
+++ b/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle4Energy.cs
@@ -6,7 +6,7 @@
 using System;
 using MechJebLib.Core;
 using MechJebLib.Primitives;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 #nullable enable
 
diff --git a/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle4Propellant.cs b/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle4Propellant.cs
index 2f5bf9d0..7c6dbefe 100644
--- a/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle4Propellant.cs
+++ b/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle4Propellant.cs
@@ -6,7 +6,7 @@
 using System;
 using MechJebLib.Primitives;
 using MechJebLib.Utils;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 #nullable enable
 
diff --git a/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle4Reduced.cs b/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle4Reduced.cs
index bb2de2f3..3f975414 100644
--- a/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle4Reduced.cs
+++ b/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle4Reduced.cs
@@ -6,7 +6,7 @@
 using System;
 using MechJebLib.Primitives;
 using MechJebLib.Utils;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 #nullable enable
 
diff --git a/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle5Reduced.cs b/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle5Reduced.cs
index 2df23bd0..0c5d0e6a 100644
--- a/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle5Reduced.cs
+++ b/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle5Reduced.cs
@@ -6,7 +6,7 @@
 using System;
 using MechJebLib.Core;
 using MechJebLib.Primitives;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 #nullable enable
 
diff --git a/MechJeb2/MechJebLib/PVG/Terminal/Kepler3Reduced.cs b/MechJeb2/MechJebLib/PVG/Terminal/Kepler3Reduced.cs
index 94bb6958..12f25ec4 100644
--- a/MechJeb2/MechJebLib/PVG/Terminal/Kepler3Reduced.cs
+++ b/MechJeb2/MechJebLib/PVG/Terminal/Kepler3Reduced.cs
@@ -6,7 +6,7 @@
 using System;
 using MechJebLib.Core;
 using MechJebLib.Primitives;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 #nullable enable
 
diff --git a/MechJeb2/MechJebLib/PVG/Terminal/Kepler4Reduced.cs b/MechJeb2/MechJebLib/PVG/Terminal/Kepler4Reduced.cs
index 68333a6d..219b6411 100644
--- a/MechJeb2/MechJebLib/PVG/Terminal/Kepler4Reduced.cs
+++ b/MechJeb2/MechJebLib/PVG/Terminal/Kepler4Reduced.cs
@@ -6,7 +6,7 @@
 using System;
 using MechJebLib.Core;
 using MechJebLib.Primitives;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 #nullable enable
 
diff --git a/MechJeb2/MechJebLib/PVG/Terminal/Kepler5Reduced.cs b/MechJeb2/MechJebLib/PVG/Terminal/Kepler5Reduced.cs
index a4b8f813..a4866b81 100644
--- a/MechJeb2/MechJebLib/PVG/Terminal/Kepler5Reduced.cs
+++ b/MechJeb2/MechJebLib/PVG/Terminal/Kepler5Reduced.cs
@@ -6,7 +6,7 @@
 using System;
 using MechJebLib.Core;
 using MechJebLib.Primitives;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 #nullable enable
 
diff --git a/MechJeb2/MechJebLib/Primitives/Q3.cs b/MechJeb2/MechJebLib/Primitives/Q3.cs
index 49652dd2..2c0928d1 100644
--- a/MechJeb2/MechJebLib/Primitives/Q3.cs
+++ b/MechJeb2/MechJebLib/Primitives/Q3.cs
@@ -5,7 +5,7 @@
 
 using System;
 using System.Globalization;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 #nullable enable
diff --git a/MechJeb2/MechJebLib/Primitives/V3.cs b/MechJeb2/MechJebLib/Primitives/V3.cs
index 96831ef3..8a184a4b 100644
--- a/MechJeb2/MechJebLib/Primitives/V3.cs
+++ b/MechJeb2/MechJebLib/Primitives/V3.cs
@@ -7,7 +7,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 #nullable enable
diff --git a/MechJeb2/MechJebLib/Primitives/Vn.cs b/MechJeb2/MechJebLib/Primitives/Vn.cs
index 6a95abce..80478eb1 100644
--- a/MechJeb2/MechJebLib/Primitives/Vn.cs
+++ b/MechJeb2/MechJebLib/Primitives/Vn.cs
@@ -9,7 +9,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using MechJebLib.Utils;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 // ReSharper disable InconsistentNaming
diff --git a/MechJeb2/MechJebLib/Simulations/DecouplingAnalyzer.cs b/MechJeb2/MechJebLib/Simulations/DecouplingAnalyzer.cs
index 03b8b1f3..224a839b 100644
--- a/MechJeb2/MechJebLib/Simulations/DecouplingAnalyzer.cs
+++ b/MechJeb2/MechJebLib/Simulations/DecouplingAnalyzer.cs
@@ -2,7 +2,7 @@
 
 using System.Collections.Generic;
 using MechJebLib.Simulations.PartModules;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MechJebLib.Simulations
 {
diff --git a/MechJeb2/MechJebLib/Simulations/FuelFlowSimulation.cs b/MechJeb2/MechJebLib/Simulations/FuelFlowSimulation.cs
index 25d53c3a..609195aa 100644
--- a/MechJeb2/MechJebLib/Simulations/FuelFlowSimulation.cs
+++ b/MechJeb2/MechJebLib/Simulations/FuelFlowSimulation.cs
@@ -5,7 +5,7 @@
 using System.Runtime.CompilerServices;
 using MechJebLib.Simulations.PartModules;
 using MechJebLib.Utils;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 namespace MechJebLib.Simulations
diff --git a/MechJeb2/MechJebLib/Simulations/PartModules/SimModuleEngines.cs b/MechJeb2/MechJebLib/Simulations/PartModules/SimModuleEngines.cs
index 0bc70cc2..d9c182b1 100644
--- a/MechJeb2/MechJebLib/Simulations/PartModules/SimModuleEngines.cs
+++ b/MechJeb2/MechJebLib/Simulations/PartModules/SimModuleEngines.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using MechJebLib.Primitives;
 using MechJebLib.Utils;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 #nullable enable
 
diff --git a/MechJeb2/MechJebLib/Simulations/PartModules/SimModuleRCS.cs b/MechJeb2/MechJebLib/Simulations/PartModules/SimModuleRCS.cs
index a424fba5..35d0f559 100644
--- a/MechJeb2/MechJebLib/Simulations/PartModules/SimModuleRCS.cs
+++ b/MechJeb2/MechJebLib/Simulations/PartModules/SimModuleRCS.cs
@@ -4,7 +4,7 @@
 using System.Runtime.CompilerServices;
 using MechJebLib.Primitives;
 using MechJebLib.Utils;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MechJebLib.Simulations.PartModules
 {
diff --git a/MechJeb2/MechJebLib/Simulations/SimResource.cs b/MechJeb2/MechJebLib/Simulations/SimResource.cs
index 0588cf67..27bc9003 100644
--- a/MechJeb2/MechJebLib/Simulations/SimResource.cs
+++ b/MechJeb2/MechJebLib/Simulations/SimResource.cs
@@ -1,4 +1,4 @@
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 #nullable enable
 
diff --git a/MechJeb2/MechJebLib/Simulations/SimVesselBuilder.cs b/MechJeb2/MechJebLib/Simulations/SimVesselBuilder.cs
index 754f6007..d3ded2bf 100644
--- a/MechJeb2/MechJebLib/Simulations/SimVesselBuilder.cs
+++ b/MechJeb2/MechJebLib/Simulations/SimVesselBuilder.cs
@@ -8,7 +8,7 @@
 using MechJebLib.Simulations.PartModules;
 using MuMech;
 using UnityEngine;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MechJebLib.Simulations
 {
diff --git a/MechJeb2/MechJebLib/Simulations/SimVesselUpdater.cs b/MechJeb2/MechJebLib/Simulations/SimVesselUpdater.cs
index d4809286..8e5a8301 100644
--- a/MechJeb2/MechJebLib/Simulations/SimVesselUpdater.cs
+++ b/MechJeb2/MechJebLib/Simulations/SimVesselUpdater.cs
@@ -7,7 +7,7 @@
 using MechJebLib.Simulations.PartModules;
 using MuMech;
 using UnityEngine;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 namespace MechJebLib.Simulations
diff --git a/MechJeb2/MechJebLib/Utils/Statics.cs b/MechJeb2/MechJebLib/Statics.cs
similarity index 99%
rename from MechJeb2/MechJebLib/Utils/Statics.cs
rename to MechJeb2/MechJebLib/Statics.cs
index aae4ce13..8fbff49b 100644
--- a/MechJeb2/MechJebLib/Utils/Statics.cs
+++ b/MechJeb2/MechJebLib/Statics.cs
@@ -11,9 +11,10 @@
 using System.Runtime.CompilerServices;
 using System.Text;
 using MechJebLib.Primitives;
+using MechJebLib.Utils;
 using static System.Math;
 
-namespace MechJebLib.Utils
+namespace MechJebLib
 {
     /// <summary>
     ///     Static class for helpers which are common enough that they're used as syntactic sugar.
diff --git a/MechJeb2/MechJebLib/Utils/BackgroundJob.cs b/MechJeb2/MechJebLib/Utils/BackgroundJob.cs
index 1f9a9a28..0422abc5 100644
--- a/MechJeb2/MechJebLib/Utils/BackgroundJob.cs
+++ b/MechJeb2/MechJebLib/Utils/BackgroundJob.cs
@@ -3,7 +3,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MechJebLib.Utils
 {
diff --git a/MechJeb2/MechJebLib/Utils/Check.cs b/MechJeb2/MechJebLib/Utils/Check.cs
index 69cb57eb..15dcca4b 100644
--- a/MechJeb2/MechJebLib/Utils/Check.cs
+++ b/MechJeb2/MechJebLib/Utils/Check.cs
@@ -7,7 +7,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using MechJebLib.Primitives;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 #nullable enable
 
diff --git a/MechJeb2/MechJebModuleAscentClassicPathMenu.cs b/MechJeb2/MechJebModuleAscentClassicPathMenu.cs
index 78c179ff..3543f20c 100644
--- a/MechJeb2/MechJebModuleAscentClassicPathMenu.cs
+++ b/MechJeb2/MechJebModuleAscentClassicPathMenu.cs
@@ -2,7 +2,7 @@
 using JetBrains.Annotations;
 using KSP.Localization;
 using UnityEngine;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MuMech
 {
diff --git a/MechJeb2/MechJebModuleAscentPVGSettingsMenu.cs b/MechJeb2/MechJebModuleAscentPVGSettingsMenu.cs
index 6aaafea1..8407fb11 100644
--- a/MechJeb2/MechJebModuleAscentPVGSettingsMenu.cs
+++ b/MechJeb2/MechJebModuleAscentPVGSettingsMenu.cs
@@ -2,7 +2,7 @@
 using JetBrains.Annotations;
 using MechJebLib.Simulations;
 using UnityEngine;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MuMech
 {
diff --git a/MechJeb2/MechJebModuleAscentSettings.cs b/MechJeb2/MechJebModuleAscentSettings.cs
index ec60466e..27c503fd 100644
--- a/MechJeb2/MechJebModuleAscentSettings.cs
+++ b/MechJeb2/MechJebModuleAscentSettings.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MuMech
 {
diff --git a/MechJeb2/MechJebModuleCustomInfoWindow.cs b/MechJeb2/MechJebModuleCustomInfoWindow.cs
index d14ef3bd..bdd6723a 100644
--- a/MechJeb2/MechJebModuleCustomInfoWindow.cs
+++ b/MechJeb2/MechJebModuleCustomInfoWindow.cs
@@ -5,7 +5,7 @@
 using System.Reflection;
 using KSP.Localization;
 using UnityEngine;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using Object = UnityEngine.Object;
 
 namespace MuMech
diff --git a/MechJeb2/MechJebModuleFlightRecorderGraph.cs b/MechJeb2/MechJebModuleFlightRecorderGraph.cs
index 22e554a6..03be0651 100644
--- a/MechJeb2/MechJebModuleFlightRecorderGraph.cs
+++ b/MechJeb2/MechJebModuleFlightRecorderGraph.cs
@@ -2,7 +2,7 @@
 using JetBrains.Annotations;
 using KSP.Localization;
 using UnityEngine;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using Object = UnityEngine.Object;
 
 namespace MuMech
diff --git a/MechJeb2/MechJebModuleGuidanceController.cs b/MechJeb2/MechJebModuleGuidanceController.cs
index bd3966fd..6158f718 100644
--- a/MechJeb2/MechJebModuleGuidanceController.cs
+++ b/MechJeb2/MechJebModuleGuidanceController.cs
@@ -8,7 +8,7 @@
 using JetBrains.Annotations;
 using MechJebLib.PVG;
 using UnityEngine;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 #nullable enable
 
diff --git a/MechJeb2/MechJebModuleInfoItems.cs b/MechJeb2/MechJebModuleInfoItems.cs
index b6a4ebee..65c09592 100644
--- a/MechJeb2/MechJebModuleInfoItems.cs
+++ b/MechJeb2/MechJebModuleInfoItems.cs
@@ -8,7 +8,7 @@
 using Smooth.Pools;
 using UniLinq;
 using UnityEngine;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MuMech
 {
diff --git a/MechJeb2/MechJebModuleLandingGuidance.cs b/MechJeb2/MechJebModuleLandingGuidance.cs
index 267a681d..69e57ea2 100644
--- a/MechJeb2/MechJebModuleLandingGuidance.cs
+++ b/MechJeb2/MechJebModuleLandingGuidance.cs
@@ -4,7 +4,7 @@
 using JetBrains.Annotations;
 using KSP.Localization;
 using UnityEngine;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MuMech
 {
diff --git a/MechJeb2/MechJebModulePVGGlueBall.cs b/MechJeb2/MechJebModulePVGGlueBall.cs
index db35fd4d..f794fdd1 100644
--- a/MechJeb2/MechJebModulePVGGlueBall.cs
+++ b/MechJeb2/MechJebModulePVGGlueBall.cs
@@ -11,7 +11,7 @@
 using MechJebLib.PVG;
 using MechJebLib.Simulations;
 using UnityEngine;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 #nullable enable
 
diff --git a/MechJeb2/MechJebModuleRCSBalancer.cs b/MechJeb2/MechJebModuleRCSBalancer.cs
index a680bc64..f449887d 100644
--- a/MechJeb2/MechJebModuleRCSBalancer.cs
+++ b/MechJeb2/MechJebModuleRCSBalancer.cs
@@ -3,7 +3,7 @@
 using JetBrains.Annotations;
 using KSP.Localization;
 using UnityEngine;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MuMech
 {
diff --git a/MechJeb2/MechJebModuleRendezvousAutopilot.cs b/MechJeb2/MechJebModuleRendezvousAutopilot.cs
index 379c6de6..46c93d2f 100644
--- a/MechJeb2/MechJebModuleRendezvousAutopilot.cs
+++ b/MechJeb2/MechJebModuleRendezvousAutopilot.cs
@@ -1,7 +1,7 @@
 using System;
 using JetBrains.Annotations;
 using KSP.Localization;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MuMech
 {
diff --git a/MechJeb2/MechJebModuleRendezvousGuidance.cs b/MechJeb2/MechJebModuleRendezvousGuidance.cs
index 35f26fe4..14c7ca3e 100644
--- a/MechJeb2/MechJebModuleRendezvousGuidance.cs
+++ b/MechJeb2/MechJebModuleRendezvousGuidance.cs
@@ -2,7 +2,7 @@
 using JetBrains.Annotations;
 using KSP.Localization;
 using UnityEngine;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MuMech
 {
diff --git a/MechJeb2/MechJebModuleSpaceplaneGuidance.cs b/MechJeb2/MechJebModuleSpaceplaneGuidance.cs
index 8d3cd2df..fa2a9e71 100644
--- a/MechJeb2/MechJebModuleSpaceplaneGuidance.cs
+++ b/MechJeb2/MechJebModuleSpaceplaneGuidance.cs
@@ -3,7 +3,7 @@
 using JetBrains.Annotations;
 using KSP.Localization;
 using UnityEngine;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MuMech
 {
diff --git a/MechJeb2/MechJebModuleTranslatron.cs b/MechJeb2/MechJebModuleTranslatron.cs
index a6fc4da8..09cf3099 100644
--- a/MechJeb2/MechJebModuleTranslatron.cs
+++ b/MechJeb2/MechJebModuleTranslatron.cs
@@ -4,7 +4,7 @@
 using KSP.Localization;
 using KSP.UI.Screens;
 using UnityEngine;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MuMech
 {
diff --git a/MechJeb2/MechJebModuleWaypointWindow.cs b/MechJeb2/MechJebModuleWaypointWindow.cs
index b763200a..ac72ba4f 100644
--- a/MechJeb2/MechJebModuleWaypointWindow.cs
+++ b/MechJeb2/MechJebModuleWaypointWindow.cs
@@ -6,7 +6,7 @@
 using KSP.IO;
 using KSP.Localization;
 using UnityEngine;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MuMech
 {
diff --git a/MechJeb2/MechJebStageStatsHelper.cs b/MechJeb2/MechJebStageStatsHelper.cs
index 032c7eda..6a60f0a2 100644
--- a/MechJeb2/MechJebStageStatsHelper.cs
+++ b/MechJeb2/MechJebStageStatsHelper.cs
@@ -3,7 +3,7 @@
 using KSP.Localization;
 using UnityEngine;
 using UnityEngine.Profiling;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MuMech
 {
diff --git a/MechJeb2/OrbitExtensions.cs b/MechJeb2/OrbitExtensions.cs
index fc3df94c..9276e8cf 100644
--- a/MechJeb2/OrbitExtensions.cs
+++ b/MechJeb2/OrbitExtensions.cs
@@ -3,7 +3,7 @@
 using MechJebLib.Core;
 using MechJebLib.Primitives;
 using UnityEngine;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 namespace MuMech
diff --git a/MechJeb2/OrbitalManeuverCalculator.cs b/MechJeb2/OrbitalManeuverCalculator.cs
index d813884b..df6470f3 100644
--- a/MechJeb2/OrbitalManeuverCalculator.cs
+++ b/MechJeb2/OrbitalManeuverCalculator.cs
@@ -8,7 +8,7 @@
 using UnityEngine;
 using Debug = UnityEngine.Debug;
 using Random = System.Random;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MuMech
 {
diff --git a/MechJebLibTest/AssertionExtensions.cs b/MechJebLibTest/AssertionExtensions.cs
index 32d602b7..d8224f97 100644
--- a/MechJebLibTest/AssertionExtensions.cs
+++ b/MechJebLibTest/AssertionExtensions.cs
@@ -8,7 +8,7 @@
 using System.Globalization;
 using MechJebLib.Primitives;
 using Xunit.Sdk;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 namespace AssertExtensions
diff --git a/MechJebLibTest/ManeuversTests/Simple.cs b/MechJebLibTest/ManeuversTests/Simple.cs
index c53b4c41..6189ec4b 100644
--- a/MechJebLibTest/ManeuversTests/Simple.cs
+++ b/MechJebLibTest/ManeuversTests/Simple.cs
@@ -4,7 +4,7 @@
 using MechJebLib.Primitives;
 using Xunit;
 using static System.Math;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MechJebLibTest.ManeuversTests
 {
diff --git a/MechJebLibTest/MathsTests/BrentRootTests.cs b/MechJebLibTest/MathsTests/BrentRootTests.cs
index 42388831..5b193880 100644
--- a/MechJebLibTest/MathsTests/BrentRootTests.cs
+++ b/MechJebLibTest/MathsTests/BrentRootTests.cs
@@ -8,7 +8,7 @@
 using MechJebLib.Core;
 using MechJebLib.Utils;
 using Xunit;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 namespace MechJebLibTest.MathsTests
diff --git a/MechJebLibTest/MathsTests/DP5Tests.cs b/MechJebLibTest/MathsTests/DP5Tests.cs
index b0f67b96..77d6a161 100644
--- a/MechJebLibTest/MathsTests/DP5Tests.cs
+++ b/MechJebLibTest/MathsTests/DP5Tests.cs
@@ -10,7 +10,7 @@
 using MechJebLib.Core.ODE;
 using MechJebLib.Primitives;
 using Xunit;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 namespace MechJebLibTest.MathsTests
diff --git a/MechJebLibTest/MathsTests/FunctionsTests.cs b/MechJebLibTest/MathsTests/FunctionsTests.cs
index 27bd5576..45efd634 100644
--- a/MechJebLibTest/MathsTests/FunctionsTests.cs
+++ b/MechJebLibTest/MathsTests/FunctionsTests.cs
@@ -11,7 +11,7 @@
 using MechJebLib.Primitives;
 using Xunit;
 using Xunit.Abstractions;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 namespace MechJebLibTest.MathsTests
diff --git a/MechJebLibTest/MathsTests/GoodingTests.cs b/MechJebLibTest/MathsTests/GoodingTests.cs
index 18177d25..d95d4ed2 100644
--- a/MechJebLibTest/MathsTests/GoodingTests.cs
+++ b/MechJebLibTest/MathsTests/GoodingTests.cs
@@ -3,7 +3,7 @@
 using MechJebLib.Core;
 using Xunit;
 using Xunit.Abstractions;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 namespace MechJebLibTest.MathsTests
diff --git a/MechJebLibTest/MathsTests/TwoBody/FarnocchiaTests.cs b/MechJebLibTest/MathsTests/TwoBody/FarnocchiaTests.cs
index 25a61e0d..3037fb49 100644
--- a/MechJebLibTest/MathsTests/TwoBody/FarnocchiaTests.cs
+++ b/MechJebLibTest/MathsTests/TwoBody/FarnocchiaTests.cs
@@ -11,7 +11,7 @@
 using MechJebLib.Primitives;
 using Xunit;
 using Xunit.Abstractions;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 namespace MechJebLibTest.MathsTests
diff --git a/MechJebLibTest/MathsTests/TwoBody/ShepperdTests.cs b/MechJebLibTest/MathsTests/TwoBody/ShepperdTests.cs
index 4a349e88..f44a2a5f 100644
--- a/MechJebLibTest/MathsTests/TwoBody/ShepperdTests.cs
+++ b/MechJebLibTest/MathsTests/TwoBody/ShepperdTests.cs
@@ -12,7 +12,7 @@
 using MechJebLib.Primitives;
 using Xunit;
 using Xunit.Abstractions;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 namespace MechJebLibTest.MathsTests
diff --git a/MechJebLibTest/MechJebLibTest.csproj b/MechJebLibTest/MechJebLibTest.csproj
index bd646d6c..483c40a3 100644
--- a/MechJebLibTest/MechJebLibTest.csproj
+++ b/MechJebLibTest/MechJebLibTest.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"/>
+    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
     <PropertyGroup>
         <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
         <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -38,10 +38,10 @@
         <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
             <HintPath>..\..\..\..\..\Library\Application Support\Steam\steamapps\common\Kerbal Space Program\KSP.app\Contents\Resources\Data\Managed\Assembly-CSharp.dll</HintPath>
         </Reference>
-        <Reference Include="System"/>
-        <Reference Include="System.Core"/>
-        <Reference Include="System.Data"/>
-        <Reference Include="System.Xml"/>
+        <Reference Include="System" />
+        <Reference Include="System.Core" />
+        <Reference Include="System.Data" />
+        <Reference Include="System.Xml" />
         <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
             <HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
         </Reference>
@@ -56,31 +56,31 @@
         </Reference>
     </ItemGroup>
     <ItemGroup>
-        <Compile Include="AssertionExtensions.cs"/>
-        <Compile Include="ControlTests\PIDLoopTests.cs"/>
-        <Compile Include="ManeuversTests\ChangeOrbitalElementTests.cs"/>
-        <Compile Include="ManeuversTests\ReturnFromMoonTests.cs"/>
-        <Compile Include="ManeuversTests\Simple.cs"/>
-        <Compile Include="MathsTests\BisectionTests.cs"/>
-        <Compile Include="MathsTests\BS3Tests.c.cs"/>
-        <Compile Include="MathsTests\DP5Tests.cs"/>
-        <Compile Include="MathsTests\FunctionsTests.cs"/>
-        <Compile Include="MathsTests\BrentRootTests.cs"/>
-        <Compile Include="MathsTests\GoodingTests.cs"/>
-        <Compile Include="MathsTests\TwoBody\FarnocchiaTests.cs"/>
-        <Compile Include="MathsTests\TwoBody\ShepperdTests.cs"/>
-        <Compile Include="Properties\AssemblyInfo.cs"/>
-        <Compile Include="PVGTests\AscentTests\BuggyTests.cs"/>
-        <Compile Include="PVGTests\AscentTests\TheStandardTests.cs"/>
-        <Compile Include="PVGTests\AscentTests\Titan2Tests.cs"/>
-        <Compile Include="PVGTests\Integrators\VacuumCoastAnalyticTests.cs"/>
-        <Compile Include="PVGTests\Integrators\VacuumThrustIntegratorTests.cs"/>
-        <Compile Include="Structs\HTests.cs"/>
-        <Compile Include="Structs\M3Tests.cs"/>
-        <Compile Include="Structs\Q3Tests.cs"/>
-        <Compile Include="Structs\V3Tests.cs"/>
-        <Compile Include="TestInitialization.cs"/>
-        <Compile Include="Utils\StaticTests.cs"/>
+        <Compile Include="AssertionExtensions.cs" />
+        <Compile Include="ControlTests\PIDLoopTests.cs" />
+        <Compile Include="ManeuversTests\ChangeOrbitalElementTests.cs" />
+        <Compile Include="ManeuversTests\ReturnFromMoonTests.cs" />
+        <Compile Include="ManeuversTests\Simple.cs" />
+        <Compile Include="MathsTests\BisectionTests.cs" />
+        <Compile Include="MathsTests\BS3Tests.c.cs" />
+        <Compile Include="MathsTests\DP5Tests.cs" />
+        <Compile Include="MathsTests\FunctionsTests.cs" />
+        <Compile Include="MathsTests\BrentRootTests.cs" />
+        <Compile Include="MathsTests\GoodingTests.cs" />
+        <Compile Include="MathsTests\TwoBody\FarnocchiaTests.cs" />
+        <Compile Include="MathsTests\TwoBody\ShepperdTests.cs" />
+        <Compile Include="Properties\AssemblyInfo.cs" />
+        <Compile Include="PVGTests\AscentTests\BuggyTests.cs" />
+        <Compile Include="PVGTests\AscentTests\TheStandardTests.cs" />
+        <Compile Include="PVGTests\AscentTests\Titan2Tests.cs" />
+        <Compile Include="PVGTests\Integrators\VacuumCoastAnalyticTests.cs" />
+        <Compile Include="PVGTests\Integrators\VacuumThrustIntegratorTests.cs" />
+        <Compile Include="StaticTests.cs" />
+        <Compile Include="Structs\HTests.cs" />
+        <Compile Include="Structs\M3Tests.cs" />
+        <Compile Include="Structs\Q3Tests.cs" />
+        <Compile Include="Structs\V3Tests.cs" />
+        <Compile Include="TestInitialization.cs" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\MechJeb2\MechJeb2.csproj">
@@ -88,7 +88,10 @@
             <Name>MechJeb2</Name>
         </ProjectReference>
     </ItemGroup>
-    <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
+    <ItemGroup>
+      <Folder Include="Utils\" />
+    </ItemGroup>
+    <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
     <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
          Other similar extension points exist, see Microsoft.Common.targets.
     <Target Name="BeforeBuild">
diff --git a/MechJebLibTest/PVGTests/AscentTests/BuggyTests.cs b/MechJebLibTest/PVGTests/AscentTests/BuggyTests.cs
index 845351c7..d7fb29e6 100644
--- a/MechJebLibTest/PVGTests/AscentTests/BuggyTests.cs
+++ b/MechJebLibTest/PVGTests/AscentTests/BuggyTests.cs
@@ -4,7 +4,7 @@
 using MechJebLib.Primitives;
 using MechJebLib.PVG;
 using Xunit;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MechJebLibTest.PVGTests
 {
diff --git a/MechJebLibTest/PVGTests/AscentTests/TheStandardTests.cs b/MechJebLibTest/PVGTests/AscentTests/TheStandardTests.cs
index 7acfda96..f9dd0592 100644
--- a/MechJebLibTest/PVGTests/AscentTests/TheStandardTests.cs
+++ b/MechJebLibTest/PVGTests/AscentTests/TheStandardTests.cs
@@ -4,7 +4,7 @@
 using MechJebLib.Primitives;
 using MechJebLib.PVG;
 using Xunit;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MechJebLibTest.PVGTests
 {
diff --git a/MechJebLibTest/PVGTests/AscentTests/Titan2Tests.cs b/MechJebLibTest/PVGTests/AscentTests/Titan2Tests.cs
index 6a9d0cb9..82c66f84 100644
--- a/MechJebLibTest/PVGTests/AscentTests/Titan2Tests.cs
+++ b/MechJebLibTest/PVGTests/AscentTests/Titan2Tests.cs
@@ -10,7 +10,7 @@
 using MechJebLib.Primitives;
 using MechJebLib.PVG;
 using Xunit;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MechJebLibTest.PVGTests
 {
diff --git a/MechJebLibTest/PVGTests/Integrators/VacuumCoastAnalyticTests.cs b/MechJebLibTest/PVGTests/Integrators/VacuumCoastAnalyticTests.cs
index 63b94554..8903040a 100644
--- a/MechJebLibTest/PVGTests/Integrators/VacuumCoastAnalyticTests.cs
+++ b/MechJebLibTest/PVGTests/Integrators/VacuumCoastAnalyticTests.cs
@@ -4,7 +4,7 @@
 using MechJebLib.PVG.Integrators;
 using Xunit;
 using Xunit.Abstractions;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 
 namespace MechJebLibTest.PVGTests
 {
diff --git a/MechJebLibTest/Utils/StaticTests.cs b/MechJebLibTest/StaticTests.cs
similarity index 99%
rename from MechJebLibTest/Utils/StaticTests.cs
rename to MechJebLibTest/StaticTests.cs
index 1508f6e1..47ada861 100644
--- a/MechJebLibTest/Utils/StaticTests.cs
+++ b/MechJebLibTest/StaticTests.cs
@@ -6,10 +6,10 @@
 
 using AssertExtensions;
 using Xunit;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
-namespace MechJebLibTest.UtilsTests
+namespace MechJebLibTest
 {
     public class StaticTests
     {
diff --git a/MechJebLibTest/Structs/M3Tests.cs b/MechJebLibTest/Structs/M3Tests.cs
index ac1d8306..f33ebf81 100644
--- a/MechJebLibTest/Structs/M3Tests.cs
+++ b/MechJebLibTest/Structs/M3Tests.cs
@@ -1,7 +1,7 @@
 using AssertExtensions;
 using MechJebLib.Primitives;
 using Xunit;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 namespace MechJebLibTest.StructsTest
diff --git a/MechJebLibTest/Structs/Q3Tests.cs b/MechJebLibTest/Structs/Q3Tests.cs
index c2049356..30690099 100644
--- a/MechJebLibTest/Structs/Q3Tests.cs
+++ b/MechJebLibTest/Structs/Q3Tests.cs
@@ -1,7 +1,7 @@
 using AssertExtensions;
 using MechJebLib.Primitives;
 using Xunit;
-using static MechJebLib.Utils.Statics;
+using static MechJebLib.Statics;
 using static System.Math;
 
 namespace MechJebLibTest.StructsTest