diff --git a/homedecor/expansion.lua b/homedecor/handlers/expansion.lua
similarity index 100%
rename from homedecor/expansion.lua
rename to homedecor/handlers/expansion.lua
diff --git a/homedecor/furnaces.lua b/homedecor/handlers/furnaces.lua
similarity index 100%
rename from homedecor/furnaces.lua
rename to homedecor/handlers/furnaces.lua
diff --git a/homedecor/locked.lua b/homedecor/handlers/locked.lua
similarity index 100%
rename from homedecor/locked.lua
rename to homedecor/handlers/locked.lua
diff --git a/homedecor/nodeboxes.lua b/homedecor/handlers/nodeboxes.lua
similarity index 100%
rename from homedecor/nodeboxes.lua
rename to homedecor/handlers/nodeboxes.lua
diff --git a/homedecor/registration_handler.lua b/homedecor/handlers/registration.lua
similarity index 100%
rename from homedecor/registration_handler.lua
rename to homedecor/handlers/registration.lua
diff --git a/homedecor/init.lua b/homedecor/init.lua
index c93a38c2..231cc6a4 100644
--- a/homedecor/init.lua
+++ b/homedecor/init.lua
@@ -107,13 +107,13 @@ end
 
 -- nodebox arithmetics and helpers
 -- (please keep non-generic nodeboxes with their node definition)
-dofile(homedecor.modpath.."/nodeboxes.lua")
+dofile(homedecor.modpath.."/handlers/nodeboxes.lua")
 -- expand and unexpand decor
-dofile(homedecor.modpath.."/expansion.lua")
+dofile(homedecor.modpath.."/handlers/expansion.lua")
 -- register nodes that cook stuff
-dofile(homedecor.modpath.."/furnaces.lua")
+dofile(homedecor.modpath.."/handlers/furnaces.lua")
 -- glue it all together into a registration function
-dofile(homedecor.modpath.."/registration_handler.lua")
+dofile(homedecor.modpath.."/handlers/registration.lua")
 
 -- load various other components
 dofile(homedecor.modpath.."/misc-nodes.lua")					-- the catch-all for all misc nodes
@@ -154,6 +154,6 @@ dofile(homedecor.modpath.."/climate-control.lua")
 
 dofile(homedecor.modpath.."/cobweb.lua")
 
-dofile(homedecor.modpath.."/locked.lua")
+dofile(homedecor.modpath.."/handlers/locked.lua")
 
 print("[HomeDecor] "..S("Loaded!"))