diff --git a/init.lua b/init.lua
index d70e4f4..a081759 100644
--- a/init.lua
+++ b/init.lua
@@ -115,17 +115,18 @@ dofile(pipeworks.modpath.."/filter-injector.lua")
 dofile(pipeworks.modpath.."/trashcan.lua")
 dofile(pipeworks.modpath.."/wielder.lua")
 
+local logicdir = "/new_flow_logic/"
 -- note that pipes still don't appear until registered in the files below this one, so can still be turned off
-dofile(pipeworks.modpath.."/flowable_node_registry.lua")
+dofile(pipeworks.modpath..logicdir.."flowable_node_registry.lua")
 
 if pipeworks.enable_pipes then dofile(pipeworks.modpath.."/pipes.lua") end
 if pipeworks.enable_teleport_tube then dofile(pipeworks.modpath.."/teleport_tube.lua") end
 if pipeworks.enable_pipe_devices then dofile(pipeworks.modpath.."/devices.lua") end
--- individual enable flags also checked in flowable_nodes_add_pipes.lua
+-- individual enable flags also checked in register_local_pipes.lua
 if pipeworks.enable_new_flow_logic then
-	dofile(pipeworks.modpath.."/new_flow_logic.lua")
-	dofile(pipeworks.modpath.."/register_flow_logic.lua")
-	dofile(pipeworks.modpath.."/flowable_nodes_add_pipes.lua")
+	dofile(pipeworks.modpath..logicdir.."abms.lua")
+	dofile(pipeworks.modpath..logicdir.."abm_register.lua")
+	dofile(pipeworks.modpath..logicdir.."register_local_pipes.lua")
 end
 
 if pipeworks.enable_redefines then
diff --git a/register_flow_logic.lua b/new_flow_logic/abm_register.lua
similarity index 100%
rename from register_flow_logic.lua
rename to new_flow_logic/abm_register.lua
diff --git a/new_flow_logic.lua b/new_flow_logic/abms.lua
similarity index 100%
rename from new_flow_logic.lua
rename to new_flow_logic/abms.lua
diff --git a/flowable_node_registry.lua b/new_flow_logic/flowable_node_registry.lua
similarity index 100%
rename from flowable_node_registry.lua
rename to new_flow_logic/flowable_node_registry.lua
diff --git a/flowable_nodes_add_pipes.lua b/new_flow_logic/register_local_pipes.lua
similarity index 100%
rename from flowable_nodes_add_pipes.lua
rename to new_flow_logic/register_local_pipes.lua