diff --git a/Content.Shared/GameObjects/Components/Atmos/SharedPipeComponent.cs b/Content.Shared/GameObjects/Components/Atmos/SharedPipeComponent.cs
index 0ffdebb454..17adc306bd 100644
--- a/Content.Shared/GameObjects/Components/Atmos/SharedPipeComponent.cs
+++ b/Content.Shared/GameObjects/Components/Atmos/SharedPipeComponent.cs
@@ -77,10 +77,10 @@ namespace Content.Shared.GameObjects.Components.Atmos
         {
             return shape switch
             {
-                PipeShape.Half => PipeDirection.East,
-                PipeShape.Straight => PipeDirection.Lateral,
-                PipeShape.Bend => PipeDirection.SEBend,
-                PipeShape.TJunction => PipeDirection.TEast,
+                PipeShape.Half => PipeDirection.South,
+                PipeShape.Straight => PipeDirection.Longitudinal,
+                PipeShape.Bend => PipeDirection.SWBend,
+                PipeShape.TJunction => PipeDirection.TSouth,
                 PipeShape.Fourway => PipeDirection.Fourway,
                 _ => throw new ArgumentOutOfRangeException(nameof(shape), $"{shape} does not have an associated {nameof(PipeDirection)}."),
             };
@@ -98,14 +98,7 @@ namespace Content.Shared.GameObjects.Components.Atmos
 
         public static Angle ToAngle(this PipeDirection pipeDirection)
         {
-            return pipeDirection switch
-            {
-                PipeDirection.East  => Angle.FromDegrees(0),
-                PipeDirection.North => Angle.FromDegrees(90),
-                PipeDirection.West  => Angle.FromDegrees(180),
-                PipeDirection.South => Angle.FromDegrees(270),
-                _ => throw new ArgumentOutOfRangeException(nameof(pipeDirection), $"{pipeDirection} does not have an associated angle."),
-            };
+            return pipeDirection.ToDirection().ToAngle();
         }
 
         public static PipeDirection ToPipeDirection(this Direction direction)
diff --git a/Resources/Prototypes/Entities/Constructible/Ground/gascanisterports.yml b/Resources/Prototypes/Entities/Constructible/Piping/gascanisterports.yml
similarity index 97%
rename from Resources/Prototypes/Entities/Constructible/Ground/gascanisterports.yml
rename to Resources/Prototypes/Entities/Constructible/Piping/gascanisterports.yml
index dee9563f98..7ddc8b1042 100644
--- a/Resources/Prototypes/Entities/Constructible/Ground/gascanisterports.yml
+++ b/Resources/Prototypes/Entities/Constructible/Piping/gascanisterports.yml
@@ -40,4 +40,4 @@
     nodes:
     - !type:PipeNode
       nodeGroupID: Pipe
-      pipeDirection: East
+      pipeDirection: South
diff --git a/Resources/Prototypes/Entities/Constructible/Ground/gascanisters.yml b/Resources/Prototypes/Entities/Constructible/Piping/gascanisters.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Constructible/Ground/gascanisters.yml
rename to Resources/Prototypes/Entities/Constructible/Piping/gascanisters.yml
diff --git a/Resources/Prototypes/Entities/Constructible/Ground/gasfilters.yml b/Resources/Prototypes/Entities/Constructible/Piping/gasfilters.yml
similarity index 90%
rename from Resources/Prototypes/Entities/Constructible/Ground/gasfilters.yml
rename to Resources/Prototypes/Entities/Constructible/Piping/gasfilters.yml
index 2c2e20c5ab..626486ca08 100644
--- a/Resources/Prototypes/Entities/Constructible/Ground/gasfilters.yml
+++ b/Resources/Prototypes/Entities/Constructible/Piping/gasfilters.yml
@@ -39,16 +39,16 @@
   components:
   - type: NodeContainer
     nodes:
+    - !type:PipeNode
+      nodeGroupID: Pipe
+      pipeDirection: West
     - !type:PipeNode
       nodeGroupID: Pipe
       pipeDirection: South
     - !type:PipeNode
       nodeGroupID: Pipe
       pipeDirection: East
-    - !type:PipeNode
-      nodeGroupID: Pipe
-      pipeDirection: North
   - type: GasFilter
-    inletDirection: South
-    filterOutletDirection: East
-    outletDirection: North
+    inletDirection: West
+    filterOutletDirection: South
+    outletDirection: East
diff --git a/Resources/Prototypes/Entities/Constructible/Ground/gasgenerator.yml b/Resources/Prototypes/Entities/Constructible/Piping/gasgenerator.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Constructible/Ground/gasgenerator.yml
rename to Resources/Prototypes/Entities/Constructible/Piping/gasgenerator.yml
diff --git a/Resources/Prototypes/Entities/Constructible/Ground/pipes.yml b/Resources/Prototypes/Entities/Constructible/Piping/pipes.yml
similarity index 93%
rename from Resources/Prototypes/Entities/Constructible/Ground/pipes.yml
rename to Resources/Prototypes/Entities/Constructible/Piping/pipes.yml
index 6499f2467e..afef2d7d43 100644
--- a/Resources/Prototypes/Entities/Constructible/Ground/pipes.yml
+++ b/Resources/Prototypes/Entities/Constructible/Piping/pipes.yml
@@ -40,7 +40,7 @@
     nodes:
     - !type:PipeNode
       nodeGroupID: Pipe
-      pipeDirection: East
+      pipeDirection: South
   - type: Icon
     state: pipeHalf
 
@@ -53,7 +53,7 @@
     nodes:
     - !type:PipeNode
       nodeGroupID: Pipe
-      pipeDirection: Lateral
+      pipeDirection: Longitudinal
   - type: Icon
     state: pipeStraight
     
@@ -66,7 +66,7 @@
     nodes:
     - !type:PipeNode
       nodeGroupID: Pipe
-      pipeDirection: SEBend
+      pipeDirection: SWBend
   - type: Icon
     state: pipeBend
     
@@ -79,7 +79,7 @@
     nodes:
     - !type:PipeNode
       nodeGroupID: Pipe
-      pipeDirection: TEast
+      pipeDirection: TSouth
   - type: Icon
     state: pipeTJunction
     
diff --git a/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml b/Resources/Prototypes/Entities/Constructible/Piping/pumps.yml
similarity index 90%
rename from Resources/Prototypes/Entities/Constructible/Ground/pumps.yml
rename to Resources/Prototypes/Entities/Constructible/Piping/pumps.yml
index 52ce92b8cb..2be027d606 100644
--- a/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml
+++ b/Resources/Prototypes/Entities/Constructible/Piping/pumps.yml
@@ -40,10 +40,10 @@
     nodes:
     - !type:PipeNode
       nodeGroupID: Pipe
-      pipeDirection: West
+      pipeDirection: North
     - !type:PipeNode
       nodeGroupID: Pipe
-      pipeDirection: East
+      pipeDirection: South
   - type: PressurePump
-    inletDirection: West
-    outletDirection: East
+    inletDirection: North
+    outletDirection: South
diff --git a/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml b/Resources/Prototypes/Entities/Constructible/Piping/scrubbers.yml
similarity index 94%
rename from Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml
rename to Resources/Prototypes/Entities/Constructible/Piping/scrubbers.yml
index 389c02727f..ed77fa53f8 100644
--- a/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml
+++ b/Resources/Prototypes/Entities/Constructible/Piping/scrubbers.yml
@@ -41,6 +41,6 @@
     nodes:
     - !type:PipeNode
       nodeGroupID: Pipe
-      pipeDirection: East
+      pipeDirection: South
   - type: PressureSiphon
-    scrubberOutletDirection: East
+    scrubberOutletDirection: South
diff --git a/Resources/Prototypes/Entities/Constructible/Ground/vents.yml b/Resources/Prototypes/Entities/Constructible/Piping/vents.yml
similarity index 94%
rename from Resources/Prototypes/Entities/Constructible/Ground/vents.yml
rename to Resources/Prototypes/Entities/Constructible/Piping/vents.yml
index 87bb311852..6081dd470d 100644
--- a/Resources/Prototypes/Entities/Constructible/Ground/vents.yml
+++ b/Resources/Prototypes/Entities/Constructible/Piping/vents.yml
@@ -41,6 +41,6 @@
     nodes:
     - !type:PipeNode
       nodeGroupID: Pipe
-      pipeDirection: East
+      pipeDirection: South
   - type: PressureVent
-    ventInletDirection: East
+    ventInletDirection: South