diff --git a/Plugin/Kethane.csproj b/Plugin/Kethane.csproj
index aeaccec..09c69b8 100644
--- a/Plugin/Kethane.csproj
+++ b/Plugin/Kethane.csproj
@@ -64,34 +64,34 @@
     <Compile Include="GeodesicGrid\TriangleHit.cs" />
     <Compile Include="InstallCleanup.cs" />
     <Compile Include="LegacyResourceGenerator.cs" />
-    <Compile Include="HeatSinkAnimator.cs" />
+    <Compile Include="PartModules\HeatSinkAnimator.cs" />
     <Compile Include="IResourceGenerator.cs" />
-    <Compile Include="IDetectorAnimator.cs" />
-    <Compile Include="IExtractorAnimator.cs" />
+    <Compile Include="PartModules\IDetectorAnimator.cs" />
+    <Compile Include="PartModules\IExtractorAnimator.cs" />
     <Compile Include="InstallChecker.cs" />
     <Compile Include="KethaneData.cs" />
-    <Compile Include="KethaneDetectorAnimator.cs" />
-    <Compile Include="KethaneDetectorAnimatorUnity.cs" />
-    <Compile Include="KethaneDrillAnimator.cs" />
-    <Compile Include="KethaneDrillAnimatorLegacy.cs" />
-    <Compile Include="KethaneGenerator.cs" />
-    <Compile Include="KethaneKerbalBlender.cs" />
+    <Compile Include="PartModules\KethaneDetectorAnimator.cs" />
+    <Compile Include="PartModules\KethaneDetectorAnimatorUnity.cs" />
+    <Compile Include="PartModules\KethaneDrillAnimator.cs" />
+    <Compile Include="PartModules\KethaneDrillAnimatorLegacy.cs" />
+    <Compile Include="PartModules\KethaneGenerator.cs" />
+    <Compile Include="PartModules\KethaneKerbalBlender.cs" />
     <Compile Include="KethaneController.cs" />
-    <Compile Include="KethaneConverter.cs" />
-    <Compile Include="KethaneDetector.cs" />
-    <Compile Include="KethaneExtractor.cs" />
-    <Compile Include="KethaneParticleEmitter.cs" />
-    <Compile Include="KethaneParticleDynamics.cs" />
+    <Compile Include="PartModules\KethaneExtractor.cs" />
+    <Compile Include="PartModules\KethaneConverter.cs" />
+    <Compile Include="PartModules\KethaneDetector.cs" />
+    <Compile Include="PartModules\KethaneParticleEmitter.cs" />
+    <Compile Include="PartModules\KethaneParticleDynamics.cs" />
     <Compile Include="KethaneScanningTutorial.cs" />
-    <Compile Include="KethaneWetMassIndicator.cs" />
+    <Compile Include="PartModules\KethaneWetMassIndicator.cs" />
     <Compile Include="MapOverlay.cs" />
     <Compile Include="Misc.cs" />
-    <Compile Include="OrthogonalIntake.cs" />
+    <Compile Include="PartModules\OrthogonalIntake.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ResourceDefinition.cs" />
     <Compile Include="SettingsManager.cs" />
     <Compile Include="TerrainData.cs" />
-    <Compile Include="TimedMovingAverage.cs" />
+    <Compile Include="PartModules\TimedMovingAverage.cs" />
     <Compile Include="WindowToggle.cs" />
     <Compile Include="Toolbar\ToolbarWrapper.cs" />
     <Compile Include="TutorialInstaller.cs" />
@@ -102,6 +102,7 @@
   <ItemGroup>
     <EmbeddedResource Include="Resources\GridIndices.txt" />
   </ItemGroup>
+  <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.
diff --git a/Plugin/KethaneScanningTutorial.cs b/Plugin/KethaneScanningTutorial.cs
index d84ef4c..9f06c26 100644
--- a/Plugin/KethaneScanningTutorial.cs
+++ b/Plugin/KethaneScanningTutorial.cs
@@ -1,4 +1,5 @@
 using Kethane.GeodesicGrid;
+using Kethane.PartModules;
 using System;
 using System.Linq;
 using UnityEngine;
diff --git a/Plugin/HeatSinkAnimator.cs b/Plugin/PartModules/HeatSinkAnimator.cs
similarity index 99%
rename from Plugin/HeatSinkAnimator.cs
rename to Plugin/PartModules/HeatSinkAnimator.cs
index 56e13ec..2504256 100644
--- a/Plugin/HeatSinkAnimator.cs
+++ b/Plugin/PartModules/HeatSinkAnimator.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using UnityEngine;
 
-namespace Kethane
+namespace Kethane.PartModules
 {
     public class HeatSinkAnimator : PartModule
     {
diff --git a/Plugin/IDetectorAnimator.cs b/Plugin/PartModules/IDetectorAnimator.cs
similarity index 80%
rename from Plugin/IDetectorAnimator.cs
rename to Plugin/PartModules/IDetectorAnimator.cs
index c988875..310cd43 100644
--- a/Plugin/IDetectorAnimator.cs
+++ b/Plugin/PartModules/IDetectorAnimator.cs
@@ -1,5 +1,5 @@
 
-namespace Kethane
+namespace Kethane.PartModules
 {
     public interface IDetectorAnimator
     {
diff --git a/Plugin/IExtractorAnimator.cs b/Plugin/PartModules/IExtractorAnimator.cs
similarity index 90%
rename from Plugin/IExtractorAnimator.cs
rename to Plugin/PartModules/IExtractorAnimator.cs
index 576b4af..8494bb9 100644
--- a/Plugin/IExtractorAnimator.cs
+++ b/Plugin/PartModules/IExtractorAnimator.cs
@@ -1,5 +1,5 @@
 
-namespace Kethane
+namespace Kethane.PartModules
 {
     public enum ExtractorState
     {
diff --git a/Plugin/KethaneConverter.cs b/Plugin/PartModules/KethaneConverter.cs
similarity index 99%
rename from Plugin/KethaneConverter.cs
rename to Plugin/PartModules/KethaneConverter.cs
index ddffd02..94e5df2 100644
--- a/Plugin/KethaneConverter.cs
+++ b/Plugin/PartModules/KethaneConverter.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Text;
 
-namespace Kethane
+namespace Kethane.PartModules
 {
     public class KethaneConverter : PartModule
     {
diff --git a/Plugin/KethaneDetector.cs b/Plugin/PartModules/KethaneDetector.cs
similarity index 99%
rename from Plugin/KethaneDetector.cs
rename to Plugin/PartModules/KethaneDetector.cs
index dbfee7d..629bfa9 100644
--- a/Plugin/KethaneDetector.cs
+++ b/Plugin/PartModules/KethaneDetector.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using UnityEngine;
 
-namespace Kethane
+namespace Kethane.PartModules
 {
     public class KethaneDetector : PartModule
     {
diff --git a/Plugin/KethaneDetectorAnimator.cs b/Plugin/PartModules/KethaneDetectorAnimator.cs
similarity index 98%
rename from Plugin/KethaneDetectorAnimator.cs
rename to Plugin/PartModules/KethaneDetectorAnimator.cs
index 8265c20..94955cd 100644
--- a/Plugin/KethaneDetectorAnimator.cs
+++ b/Plugin/PartModules/KethaneDetectorAnimator.cs
@@ -1,7 +1,7 @@
 using System;
 using UnityEngine;
 
-namespace Kethane
+namespace Kethane.PartModules
 {
     public class KethaneDetectorAnimator : PartModule, IDetectorAnimator
     {
diff --git a/Plugin/KethaneDetectorAnimatorUnity.cs b/Plugin/PartModules/KethaneDetectorAnimatorUnity.cs
similarity index 97%
rename from Plugin/KethaneDetectorAnimatorUnity.cs
rename to Plugin/PartModules/KethaneDetectorAnimatorUnity.cs
index a388c67..5c6fa50 100644
--- a/Plugin/KethaneDetectorAnimatorUnity.cs
+++ b/Plugin/PartModules/KethaneDetectorAnimatorUnity.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace Kethane
+namespace Kethane.PartModules
 {
     public class KethaneDetectorAnimatorUnity : PartModule, IDetectorAnimator
     {
diff --git a/Plugin/KethaneDrillAnimator.cs b/Plugin/PartModules/KethaneDrillAnimator.cs
similarity index 99%
rename from Plugin/KethaneDrillAnimator.cs
rename to Plugin/PartModules/KethaneDrillAnimator.cs
index 53bf2fd..8d3358b 100644
--- a/Plugin/KethaneDrillAnimator.cs
+++ b/Plugin/PartModules/KethaneDrillAnimator.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using UnityEngine;
 
-namespace Kethane
+namespace Kethane.PartModules
 {
     public class KethaneDrillAnimator : PartModule, IExtractorAnimator
     {
diff --git a/Plugin/KethaneDrillAnimatorLegacy.cs b/Plugin/PartModules/KethaneDrillAnimatorLegacy.cs
similarity index 99%
rename from Plugin/KethaneDrillAnimatorLegacy.cs
rename to Plugin/PartModules/KethaneDrillAnimatorLegacy.cs
index 9738495..602be4a 100644
--- a/Plugin/KethaneDrillAnimatorLegacy.cs
+++ b/Plugin/PartModules/KethaneDrillAnimatorLegacy.cs
@@ -1,7 +1,7 @@
 using System;
 using UnityEngine;
 
-namespace Kethane
+namespace Kethane.PartModules
 {
     public class KethaneDrillAnimatorLegacy : PartModule, IExtractorAnimator
     {
diff --git a/Plugin/KethaneExtractor.cs b/Plugin/PartModules/KethaneExtractor.cs
similarity index 96%
rename from Plugin/KethaneExtractor.cs
rename to Plugin/PartModules/KethaneExtractor.cs
index a48ac50..ba30f60 100644
--- a/Plugin/KethaneExtractor.cs
+++ b/Plugin/PartModules/KethaneExtractor.cs
@@ -1,234 +1,234 @@
-using System;
-using System.Linq;
-using UnityEngine;
-using System.Collections.Generic;
-
-namespace Kethane
-{
-    public class KethaneExtractor : PartModule
-    {
-        public class Resource
-        {
-            public string Name { get; private set; }
-            public float Rate { get; private set; }
-
-            public Resource(ConfigNode node)
-            {
-                Name = node.GetValue("Name");
-                Rate = float.Parse(node.GetValue("Rate"));
-            }
-        }
-
-        private class DefaultExtractorAnimator : IExtractorAnimator
-        {
-            public ExtractorState CurrentState { get; private set; }
-            public void Deploy() { CurrentState = ExtractorState.Deployed; }
-            public void Retract() { CurrentState = ExtractorState.Retracted; }
-
-            public DefaultExtractorAnimator()
-            {
-                CurrentState = ExtractorState.Retracted;
-            }
-        }
-
-        private IExtractorAnimator animator;
-
-        private List<Resource> resources;
-
-        [KSPField(isPersistant = false)]
-        public float PowerConsumption;
-
-        [KSPField(isPersistant = false, guiActive = true, guiName = "Status")]
-        public string Status;
-
-        [KSPField(isPersistant = false)]
-        public string HeadTransform;
-
-        [KSPField(isPersistant = false)]
-        public string TailTransform;
-
-        [KSPField(isPersistant = false)]
-        public float HeadOffset;
-
-        [KSPField(isPersistant = false)]
-        public float TailOffset;
-
-        public ConfigNode config;
-
-        private Transform headTransform;
-        private Transform tailTransform;
-
-        private KethaneParticleEmitter[] emitters;
-
-        public override void OnStart(PartModule.StartState state)
-        {
-            this.part.force_activate();
-            animator = part.Modules.OfType<IExtractorAnimator>().SingleOrDefault();
-
-            if (animator == null)
-            {
-                animator = new DefaultExtractorAnimator();
-            }
-            else
-            {
-                Events["DeployDrill"].guiActiveEditor = true;
-                Events["RetractDrill"].guiActiveEditor = true;
-            }
-
-            headTransform = this.part.FindModelTransform(HeadTransform);
-            tailTransform = this.part.FindModelTransform(TailTransform);
-
-            if (state == StartState.Editor) { return; }
-            if (FlightGlobals.fetch == null) { return; }
-
-            emitters = part.Modules.OfType<KethaneParticleEmitter>().ToArray();
-
-            foreach (var emitter in emitters)
-            {
-                emitter.Setup();
-                emitter.EmitterTransform.parent = headTransform;
-                emitter.EmitterTransform.localRotation = Quaternion.identity;
-            }
-        }
-
-        public override void OnLoad(ConfigNode config)
-        {
-            if (this.config == null)
-            {
-                this.config = new ConfigNode();
-                config.CopyTo(this.config);
-            }
-
-            resources = this.config.GetNodes("Resource").Select(n => new Resource(n)).ToList();
-        }
-
-        [KSPEvent(guiActive = true, guiName = "Deploy Drill", active = true, externalToEVAOnly = true, guiActiveUnfocused = true, unfocusedRange = 1.5f)]
-        public void DeployDrill()
-        {
-            animator.Deploy();
-        }
-
-        [KSPEvent(guiActive = true, guiName = "Retract Drill", active = false, externalToEVAOnly = true, guiActiveUnfocused = true, unfocusedRange = 1.5f)]
-        public void RetractDrill()
-        {
-            animator.Retract();
-        }
-
-        [KSPAction("Deploy Drill")]
-        public void DeployDrillAction(KSPActionParam param)
-        {
-            DeployDrill();
-        }
-
-        [KSPAction("Retract Drill")]
-        public void RetractDrillAction(KSPActionParam param)
-        {
-            RetractDrill();
-        }
-
-        [KSPAction("Toggle Drill")]
-        public void ToggleDrillAction(KSPActionParam param)
-        {
-            if (animator.CurrentState == ExtractorState.Deployed || animator.CurrentState == ExtractorState.Deploying)
-            {
-                RetractDrill();
-            }
-            else if (animator.CurrentState == ExtractorState.Retracted || animator.CurrentState == ExtractorState.Retracting)
-            {
-                DeployDrill();
-            }
-        }
-
-        public override string GetInfo()
-        {
-            return String.Concat(resources.Select(r => String.Format("{0} Rate: {1:F2}L/s\n", r.Name, r.Rate)).ToArray()) + String.Format("Power Consumption: {0:F2}/s", PowerConsumption);
-        }
-
-        public void Update()
-        {
-            var retracted = (animator.CurrentState == ExtractorState.Retracted);
-            var deployed = (animator.CurrentState == ExtractorState.Deployed);
-            if (Events["DeployDrill"].active != retracted || Events["RetractDrill"].active != deployed)
-            {
-                Events["DeployDrill"].active = retracted;
-                Events["RetractDrill"].active = deployed;
-                foreach (var window in GameObject.FindObjectsOfType(typeof(UIPartActionWindow)).OfType<UIPartActionWindow>().Where(w => w.part == part))
-                {
-                    window.displayDirty = true;
-                }
-            }
-            Status = animator.CurrentState.ToString();
-
-            if (!HighLogic.LoadedSceneIsFlight) { return; }
-
-            if (animator.CurrentState != ExtractorState.Retracted)
-            {
-                RaycastHit hitInfo;
-                var hit = raycastGround(out hitInfo);
-
-                foreach (var emitter in emitters.Where(e => e.Label != "gas"))
-                {
-                    emitter.Emit = hit;
-                }
-                if (hit)
-                {
-                    foreach (var emitter in emitters)
-                    {
-                        emitter.EmitterPosition = headTransform.InverseTransformPoint(hitInfo.point);
-                    }
-                }
-
-                foreach (var emitter in emitters.Where(e => e.Label == "gas"))
-                {
-                    if (animator.CurrentState == ExtractorState.Deployed)
-                    {
-                        emitter.Emit = hit && KethaneData.Current.GetDepositUnder("Kethane", this.vessel) != null;
-                    }
-                    else
-                    {
-                        emitter.Emit = false;
-                    }
-                }
-            }
-            else
-            {
-                foreach (var emitter in emitters)
-                {
-                    emitter.Emit = false;
-                }
-            }
-        }
-
-        public override void OnFixedUpdate()
-        {
-            if (animator.CurrentState != ExtractorState.Deployed) { return; }
-            if (!raycastGround()) { return; }
-
-            var energyRequest = this.PowerConsumption * TimeWarp.fixedDeltaTime;
-            var energyRatio = this.part.RequestResource("ElectricCharge", energyRequest) / energyRequest;
-
-            foreach (var resource in resources)
-            {
-                var deposit = KethaneData.Current.GetDepositUnder(resource.Name, this.vessel);
-                if (deposit == null) { continue; }
-
-                double amount = TimeWarp.fixedDeltaTime * resource.Rate * energyRatio;
-                amount = Math.Min(amount, deposit.Quantity);
-                deposit.Quantity += this.part.RequestResource(resource.Name, -amount);
-            }
-        }
-
-        private bool raycastGround()
-        {
-            RaycastHit hitInfo;
-            return raycastGround(out hitInfo);
-        }
-
-        private bool raycastGround(out RaycastHit hitInfo)
-        {
-            var mask = 1 << 15;
-            var direction = headTransform.position - tailTransform.position;
-            return Physics.Raycast(tailTransform.position - direction.normalized * TailOffset, direction, out hitInfo, direction.magnitude + HeadOffset + TailOffset, mask);
-        }
-    }
-}
+using System;
+using System.Linq;
+using UnityEngine;
+using System.Collections.Generic;
+
+namespace Kethane.PartModules
+{
+    public class KethaneExtractor : PartModule
+    {
+        public class Resource
+        {
+            public string Name { get; private set; }
+            public float Rate { get; private set; }
+
+            public Resource(ConfigNode node)
+            {
+                Name = node.GetValue("Name");
+                Rate = float.Parse(node.GetValue("Rate"));
+            }
+        }
+
+        private class DefaultExtractorAnimator : IExtractorAnimator
+        {
+            public ExtractorState CurrentState { get; private set; }
+            public void Deploy() { CurrentState = ExtractorState.Deployed; }
+            public void Retract() { CurrentState = ExtractorState.Retracted; }
+
+            public DefaultExtractorAnimator()
+            {
+                CurrentState = ExtractorState.Retracted;
+            }
+        }
+
+        private IExtractorAnimator animator;
+
+        private List<Resource> resources;
+
+        [KSPField(isPersistant = false)]
+        public float PowerConsumption;
+
+        [KSPField(isPersistant = false, guiActive = true, guiName = "Status")]
+        public string Status;
+
+        [KSPField(isPersistant = false)]
+        public string HeadTransform;
+
+        [KSPField(isPersistant = false)]
+        public string TailTransform;
+
+        [KSPField(isPersistant = false)]
+        public float HeadOffset;
+
+        [KSPField(isPersistant = false)]
+        public float TailOffset;
+
+        public ConfigNode config;
+
+        private Transform headTransform;
+        private Transform tailTransform;
+
+        private KethaneParticleEmitter[] emitters;
+
+        public override void OnStart(PartModule.StartState state)
+        {
+            this.part.force_activate();
+            animator = part.Modules.OfType<IExtractorAnimator>().SingleOrDefault();
+
+            if (animator == null)
+            {
+                animator = new DefaultExtractorAnimator();
+            }
+            else
+            {
+                Events["DeployDrill"].guiActiveEditor = true;
+                Events["RetractDrill"].guiActiveEditor = true;
+            }
+
+            headTransform = this.part.FindModelTransform(HeadTransform);
+            tailTransform = this.part.FindModelTransform(TailTransform);
+
+            if (state == StartState.Editor) { return; }
+            if (FlightGlobals.fetch == null) { return; }
+
+            emitters = part.Modules.OfType<KethaneParticleEmitter>().ToArray();
+
+            foreach (var emitter in emitters)
+            {
+                emitter.Setup();
+                emitter.EmitterTransform.parent = headTransform;
+                emitter.EmitterTransform.localRotation = Quaternion.identity;
+            }
+        }
+
+        public override void OnLoad(ConfigNode config)
+        {
+            if (this.config == null)
+            {
+                this.config = new ConfigNode();
+                config.CopyTo(this.config);
+            }
+
+            resources = this.config.GetNodes("Resource").Select(n => new Resource(n)).ToList();
+        }
+
+        [KSPEvent(guiActive = true, guiName = "Deploy Drill", active = true, externalToEVAOnly = true, guiActiveUnfocused = true, unfocusedRange = 1.5f)]
+        public void DeployDrill()
+        {
+            animator.Deploy();
+        }
+
+        [KSPEvent(guiActive = true, guiName = "Retract Drill", active = false, externalToEVAOnly = true, guiActiveUnfocused = true, unfocusedRange = 1.5f)]
+        public void RetractDrill()
+        {
+            animator.Retract();
+        }
+
+        [KSPAction("Deploy Drill")]
+        public void DeployDrillAction(KSPActionParam param)
+        {
+            DeployDrill();
+        }
+
+        [KSPAction("Retract Drill")]
+        public void RetractDrillAction(KSPActionParam param)
+        {
+            RetractDrill();
+        }
+
+        [KSPAction("Toggle Drill")]
+        public void ToggleDrillAction(KSPActionParam param)
+        {
+            if (animator.CurrentState == ExtractorState.Deployed || animator.CurrentState == ExtractorState.Deploying)
+            {
+                RetractDrill();
+            }
+            else if (animator.CurrentState == ExtractorState.Retracted || animator.CurrentState == ExtractorState.Retracting)
+            {
+                DeployDrill();
+            }
+        }
+
+        public override string GetInfo()
+        {
+            return String.Concat(resources.Select(r => String.Format("{0} Rate: {1:F2}L/s\n", r.Name, r.Rate)).ToArray()) + String.Format("Power Consumption: {0:F2}/s", PowerConsumption);
+        }
+
+        public void Update()
+        {
+            var retracted = (animator.CurrentState == ExtractorState.Retracted);
+            var deployed = (animator.CurrentState == ExtractorState.Deployed);
+            if (Events["DeployDrill"].active != retracted || Events["RetractDrill"].active != deployed)
+            {
+                Events["DeployDrill"].active = retracted;
+                Events["RetractDrill"].active = deployed;
+                foreach (var window in GameObject.FindObjectsOfType(typeof(UIPartActionWindow)).OfType<UIPartActionWindow>().Where(w => w.part == part))
+                {
+                    window.displayDirty = true;
+                }
+            }
+            Status = animator.CurrentState.ToString();
+
+            if (!HighLogic.LoadedSceneIsFlight) { return; }
+
+            if (animator.CurrentState != ExtractorState.Retracted)
+            {
+                RaycastHit hitInfo;
+                var hit = raycastGround(out hitInfo);
+
+                foreach (var emitter in emitters.Where(e => e.Label != "gas"))
+                {
+                    emitter.Emit = hit;
+                }
+                if (hit)
+                {
+                    foreach (var emitter in emitters)
+                    {
+                        emitter.EmitterPosition = headTransform.InverseTransformPoint(hitInfo.point);
+                    }
+                }
+
+                foreach (var emitter in emitters.Where(e => e.Label == "gas"))
+                {
+                    if (animator.CurrentState == ExtractorState.Deployed)
+                    {
+                        emitter.Emit = hit && KethaneData.Current.GetDepositUnder("Kethane", this.vessel) != null;
+                    }
+                    else
+                    {
+                        emitter.Emit = false;
+                    }
+                }
+            }
+            else
+            {
+                foreach (var emitter in emitters)
+                {
+                    emitter.Emit = false;
+                }
+            }
+        }
+
+        public override void OnFixedUpdate()
+        {
+            if (animator.CurrentState != ExtractorState.Deployed) { return; }
+            if (!raycastGround()) { return; }
+
+            var energyRequest = this.PowerConsumption * TimeWarp.fixedDeltaTime;
+            var energyRatio = this.part.RequestResource("ElectricCharge", energyRequest) / energyRequest;
+
+            foreach (var resource in resources)
+            {
+                var deposit = KethaneData.Current.GetDepositUnder(resource.Name, this.vessel);
+                if (deposit == null) { continue; }
+
+                double amount = TimeWarp.fixedDeltaTime * resource.Rate * energyRatio;
+                amount = Math.Min(amount, deposit.Quantity);
+                deposit.Quantity += this.part.RequestResource(resource.Name, -amount);
+            }
+        }
+
+        private bool raycastGround()
+        {
+            RaycastHit hitInfo;
+            return raycastGround(out hitInfo);
+        }
+
+        private bool raycastGround(out RaycastHit hitInfo)
+        {
+            var mask = 1 << 15;
+            var direction = headTransform.position - tailTransform.position;
+            return Physics.Raycast(tailTransform.position - direction.normalized * TailOffset, direction, out hitInfo, direction.magnitude + HeadOffset + TailOffset, mask);
+        }
+    }
+}
diff --git a/Plugin/KethaneGenerator.cs b/Plugin/PartModules/KethaneGenerator.cs
similarity index 99%
rename from Plugin/KethaneGenerator.cs
rename to Plugin/PartModules/KethaneGenerator.cs
index 40aca96..0e2d1f1 100644
--- a/Plugin/KethaneGenerator.cs
+++ b/Plugin/PartModules/KethaneGenerator.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using UnityEngine;
 
-namespace Kethane
+namespace Kethane.PartModules
 {
     public class KethaneGenerator : PartModule
     {
diff --git a/Plugin/KethaneKerbalBlender.cs b/Plugin/PartModules/KethaneKerbalBlender.cs
similarity index 96%
rename from Plugin/KethaneKerbalBlender.cs
rename to Plugin/PartModules/KethaneKerbalBlender.cs
index 4df3078..1ed33aa 100644
--- a/Plugin/KethaneKerbalBlender.cs
+++ b/Plugin/PartModules/KethaneKerbalBlender.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 
-namespace Kethane
+namespace Kethane.PartModules
 {
     public class KethaneKerbalBlender : PartModule
     {
diff --git a/Plugin/KethaneParticleDynamics.cs b/Plugin/PartModules/KethaneParticleDynamics.cs
similarity index 98%
rename from Plugin/KethaneParticleDynamics.cs
rename to Plugin/PartModules/KethaneParticleDynamics.cs
index a1dff71..e18a958 100644
--- a/Plugin/KethaneParticleDynamics.cs
+++ b/Plugin/PartModules/KethaneParticleDynamics.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using UnityEngine;
 
-namespace Kethane
+namespace Kethane.PartModules
 {
     public class KethaneParticleDynamics : PartModule
     {
diff --git a/Plugin/KethaneParticleEmitter.cs b/Plugin/PartModules/KethaneParticleEmitter.cs
similarity index 99%
rename from Plugin/KethaneParticleEmitter.cs
rename to Plugin/PartModules/KethaneParticleEmitter.cs
index f053e56..6029552 100644
--- a/Plugin/KethaneParticleEmitter.cs
+++ b/Plugin/PartModules/KethaneParticleEmitter.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using UnityEngine;
 
-namespace Kethane
+namespace Kethane.PartModules
 {
     public class KethaneParticleEmitter : PartModule
     {
diff --git a/Plugin/KethaneWetMassIndicator.cs b/Plugin/PartModules/KethaneWetMassIndicator.cs
similarity index 93%
rename from Plugin/KethaneWetMassIndicator.cs
rename to Plugin/PartModules/KethaneWetMassIndicator.cs
index 705a2a7..acb5ed3 100644
--- a/Plugin/KethaneWetMassIndicator.cs
+++ b/Plugin/PartModules/KethaneWetMassIndicator.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 
-namespace Kethane
+namespace Kethane.PartModules
 {
     public class KethaneWetMassIndicator : PartModule
     {
diff --git a/Plugin/OrthogonalIntake.cs b/Plugin/PartModules/OrthogonalIntake.cs
similarity index 97%
rename from Plugin/OrthogonalIntake.cs
rename to Plugin/PartModules/OrthogonalIntake.cs
index a9c7705..a062767 100644
--- a/Plugin/OrthogonalIntake.cs
+++ b/Plugin/PartModules/OrthogonalIntake.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 
-namespace Kethane
+namespace Kethane.PartModules
 {
     public class OrthogonalIntake : PartModule
     {
diff --git a/Plugin/TimedMovingAverage.cs b/Plugin/PartModules/TimedMovingAverage.cs
similarity index 98%
rename from Plugin/TimedMovingAverage.cs
rename to Plugin/PartModules/TimedMovingAverage.cs
index 8e0dc74..492f4d2 100644
--- a/Plugin/TimedMovingAverage.cs
+++ b/Plugin/PartModules/TimedMovingAverage.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Kethane
+namespace Kethane.PartModules
 {
     internal class TimedMovingAverage
     {