diff --git a/polymer/eduke32/source/lunatic/bittest.lua b/polymer/eduke32/source/lunatic/test/test_bitar.lua
similarity index 100%
rename from polymer/eduke32/source/lunatic/bittest.lua
rename to polymer/eduke32/source/lunatic/test/test_bitar.lua
diff --git a/polymer/eduke32/source/lunatic/bigytiles.lua b/polymer/eduke32/source/lunatic/util/bigytiles.lua
similarity index 100%
rename from polymer/eduke32/source/lunatic/bigytiles.lua
rename to polymer/eduke32/source/lunatic/util/bigytiles.lua
diff --git a/polymer/eduke32/source/lunatic/build.lua b/polymer/eduke32/source/lunatic/util/build.lua
similarity index 100%
rename from polymer/eduke32/source/lunatic/build.lua
rename to polymer/eduke32/source/lunatic/util/build.lua
diff --git a/polymer/eduke32/source/lunatic/findmaps.sh b/polymer/eduke32/source/lunatic/util/findmaps.sh
similarity index 100%
rename from polymer/eduke32/source/lunatic/findmaps.sh
rename to polymer/eduke32/source/lunatic/util/findmaps.sh
diff --git a/polymer/eduke32/source/lunatic/foreachmap.lua b/polymer/eduke32/source/lunatic/util/foreachmap.lua
similarity index 100%
rename from polymer/eduke32/source/lunatic/foreachmap.lua
rename to polymer/eduke32/source/lunatic/util/foreachmap.lua
diff --git a/polymer/eduke32/source/lunatic/map2text.lua b/polymer/eduke32/source/lunatic/util/map2text.lua
similarity index 100%
rename from polymer/eduke32/source/lunatic/map2text.lua
rename to polymer/eduke32/source/lunatic/util/map2text.lua
diff --git a/polymer/eduke32/source/lunatic/mapastats.lua b/polymer/eduke32/source/lunatic/util/mapastats.lua
similarity index 100%
rename from polymer/eduke32/source/lunatic/mapastats.lua
rename to polymer/eduke32/source/lunatic/util/mapastats.lua
diff --git a/polymer/eduke32/source/lunatic/mapdiff.sh b/polymer/eduke32/source/lunatic/util/mapdiff.sh
similarity index 100%
rename from polymer/eduke32/source/lunatic/mapdiff.sh
rename to polymer/eduke32/source/lunatic/util/mapdiff.sh
diff --git a/polymer/eduke32/source/lunatic/mapstats.lua b/polymer/eduke32/source/lunatic/util/mapstats.lua
similarity index 100%
rename from polymer/eduke32/source/lunatic/mapstats.lua
rename to polymer/eduke32/source/lunatic/util/mapstats.lua
diff --git a/polymer/eduke32/source/lunatic/mapypan.lua b/polymer/eduke32/source/lunatic/util/mapypan.lua
similarity index 100%
rename from polymer/eduke32/source/lunatic/mapypan.lua
rename to polymer/eduke32/source/lunatic/util/mapypan.lua