diff --git a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm b/code/ATMOSPHERICS/components/binary_devices/binary_devices.dm
similarity index 100%
rename from code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
rename to code/ATMOSPHERICS/components/binary_devices/binary_devices.dm
diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm
index 5fef39731aa..d55c77d62a2 100644
--- a/code/ATMOSPHERICS/components/binary_devices/pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm
@@ -98,12 +98,6 @@ Thus, the two variables affect pump operation are set in New():
 
 	return 1
 
-/obj/machinery/atmospherics/components/binary/pump/attack_hand(mob/user)
-	if(!src.allowed(usr))
-		usr << "<span class='danger'>Access denied.</span>"
-		return
-	..()
-
 /obj/machinery/atmospherics/components/binary/pump/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \
 																datum/tgui/master_ui = null, datum/ui_state/state = default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
index 504d86cd165..c0b81a6a540 100644
--- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
@@ -94,12 +94,6 @@ Thus, the two variables affect pump operation are set in New():
 
 	return 1
 
-/obj/machinery/atmospherics/components/binary/volume_pump/attack_hand(mob/user)
-	if(!src.allowed(usr))
-		usr << "<span class='danger'>Access denied.</span>"
-		return
-	..()
-
 /obj/machinery/atmospherics/components/binary/volume_pump/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \
 																		datum/tgui/master_ui = null, datum/ui_state/state = default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
diff --git a/code/ATMOSPHERICS/components/components_base.dm b/code/ATMOSPHERICS/components/components.dm
similarity index 96%
rename from code/ATMOSPHERICS/components/components_base.dm
rename to code/ATMOSPHERICS/components/components.dm
index 3e17bd09fcd..edad3afefef 100644
--- a/code/ATMOSPHERICS/components/components_base.dm
+++ b/code/ATMOSPHERICS/components/components.dm
@@ -163,3 +163,13 @@ Helpers
 /obj/machinery/atmospherics/components/dealWithShuttleStuff(I)
 	..()
 	nullifyPipenet(PARENT_I)
+
+/*
+UI Stuff
+*/
+
+/obj/machinery/atmospherics/components/ui_status(mob/user)
+	if(allowed(user))
+		return ..()
+	user << "<span class='danger'>Access denied.</span>"
+	return UI_CLOSE
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm
index 895cdc9f2ac..f498be3ca63 100644
--- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm
+++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm
@@ -105,12 +105,6 @@
 	set_frequency(frequency)
 	return ..()
 
-/obj/machinery/atmospherics/components/trinary/filter/attack_hand(mob/user)
-	if(!src.allowed(usr))
-		usr << "<span class='danger'>Access denied.</span>"
-		return
-	..()
-
 /obj/machinery/atmospherics/components/trinary/filter/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \
 																	datum/tgui/master_ui = null, datum/ui_state/state = default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm
index 910cb8e2836..5dcbcd1b1ab 100644
--- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm
+++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm
@@ -116,12 +116,6 @@
 
 	return 1
 
-/obj/machinery/atmospherics/components/trinary/mixer/attack_hand(mob/user)
-	if(!src.allowed(usr))
-		usr << "<span class='danger'>Access denied.</span>"
-		return
-	..()
-
 /obj/machinery/atmospherics/components/trinary/mixer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \
 																	datum/tgui/master_ui = null, datum/ui_state/state = default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
diff --git a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm b/code/ATMOSPHERICS/components/trinary_devices/trinary_devices.dm
similarity index 100%
rename from code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
rename to code/ATMOSPHERICS/components/trinary_devices/trinary_devices.dm
diff --git a/code/ATMOSPHERICS/components/unary_devices/thermomachine.dm b/code/ATMOSPHERICS/components/unary_devices/thermomachine.dm
index 9c36f595820..dc3fb84a2d6 100644
--- a/code/ATMOSPHERICS/components/unary_devices/thermomachine.dm
+++ b/code/ATMOSPHERICS/components/unary_devices/thermomachine.dm
@@ -86,6 +86,24 @@
 	if(default_deconstruction_crowbar(I))
 		return
 
+/obj/machinery/atmospherics/components/unary/thermomachine/default_change_direction_wrench(mob/user, obj/item/weapon/wrench/W)
+	if(!..())
+		return 0
+	SetInitDirections()
+	var/obj/machinery/atmospherics/node = NODE1
+	if(node)
+		node.disconnect(src)
+		NODE1 = null
+	nullifyPipenet(PARENT1)
+
+	atmosinit()
+	node = NODE1
+	if(node)
+		node.atmosinit()
+		node.addMember(src)
+	build_network()
+	return 1
+
 /obj/machinery/atmospherics/components/unary/thermomachine/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \
 																	datum/tgui/master_ui = null, datum/ui_state/state = default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
diff --git a/code/ATMOSPHERICS/components/unary_devices/unary_base.dm b/code/ATMOSPHERICS/components/unary_devices/unary_devices.dm
similarity index 51%
rename from code/ATMOSPHERICS/components/unary_devices/unary_base.dm
rename to code/ATMOSPHERICS/components/unary_devices/unary_devices.dm
index f35652172e2..f2dfa858d17 100644
--- a/code/ATMOSPHERICS/components/unary_devices/unary_base.dm
+++ b/code/ATMOSPHERICS/components/unary_devices/unary_devices.dm
@@ -16,21 +16,3 @@ Iconnery
 	update_icon()
 
 	..(intact)
-
-/obj/machinery/atmospherics/components/unary/default_change_direction_wrench(mob/user, obj/item/weapon/wrench/W)
-	if(!..())
-		return
-	SetInitDirections()
-	var/obj/machinery/atmospherics/node = NODE1
-	if(node)
-		node.disconnect(src)
-		NODE1 = null
-	nullifyPipenet(PARENT1)
-
-	atmosinit()
-	node = NODE1
-	if(node)
-		node.atmosinit()
-		node.addMember(src)
-	build_network()
-	. = 1
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/datum_pipeline.dm b/code/ATMOSPHERICS/pipeline.dm
similarity index 100%
rename from code/ATMOSPHERICS/datum_pipeline.dm
rename to code/ATMOSPHERICS/pipeline.dm
diff --git a/tgstation.dme b/tgstation.dme
index 242e2b93b06..beed8a7ef9d 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -110,10 +110,8 @@
 #include "code\_onclick\hud\robot.dm"
 #include "code\_onclick\hud\screen_objects.dm"
 #include "code\ATMOSPHERICS\atmospherics.dm"
-#include "code\ATMOSPHERICS\datum_pipeline.dm"
 #include "code\ATMOSPHERICS\gas_types.dm"
-#include "code\ATMOSPHERICS\components\components_base.dm"
-#include "code\ATMOSPHERICS\components\binary_devices\binary_atmos_base.dm"
+#include "code\ATMOSPHERICS\pipeline.dm"
 #include "code\ATMOSPHERICS\components\binary_devices\circulator.dm"
 #include "code\ATMOSPHERICS\components\binary_devices\dp_vent_pump.dm"
 #include "code\ATMOSPHERICS\components\binary_devices\passive_gate.dm"
@@ -122,7 +120,6 @@
 #include "code\ATMOSPHERICS\components\binary_devices\volume_pump.dm"
 #include "code\ATMOSPHERICS\components\trinary_devices\filter.dm"
 #include "code\ATMOSPHERICS\components\trinary_devices\mixer.dm"
-#include "code\ATMOSPHERICS\components\trinary_devices\trinary_base.dm"
 #include "code\ATMOSPHERICS\components\unary_devices\cryo.dm"
 #include "code\ATMOSPHERICS\components\unary_devices\generator_input.dm"
 #include "code\ATMOSPHERICS\components\unary_devices\heat_exchanger.dm"
@@ -131,7 +128,6 @@
 #include "code\ATMOSPHERICS\components\unary_devices\portables_connector.dm"
 #include "code\ATMOSPHERICS\components\unary_devices\tank.dm"
 #include "code\ATMOSPHERICS\components\unary_devices\thermomachine.dm"
-#include "code\ATMOSPHERICS\components\unary_devices\unary_base.dm"
 #include "code\ATMOSPHERICS\components\unary_devices\vent_pump.dm"
 #include "code\ATMOSPHERICS\components\unary_devices\vent_scrubber.dm"
 #include "code\ATMOSPHERICS\pipes\manifold.dm"