diff --git a/init.lua b/init.lua
index a923a3e..9ca28ea 100644
--- a/init.lua
+++ b/init.lua
@@ -1,6 +1,7 @@
 local modpath = minetest.get_modpath('mtimer')..DIR_DELIM
 local syspath = modpath..'system'..DIR_DELIM
-
+local fspath = syspath..'formspecs'..DIR_DELIM
+local get_dir_list = minetest.get_dir_list
 
 -- Set initial global `mtimer` table
 --
@@ -17,18 +18,19 @@ mtimer = {
 dofile(syspath..'load_configuration.lua')
 
 
--- Load formspec functionality
-dofile(syspath..'formspec'..DIR_DELIM..'formspec_helpers.lua')
-dofile(syspath..'formspec'..DIR_DELIM..'main_menu.lua')
-dofile(syspath..'formspec'..DIR_DELIM..'real_time_universal.lua')
-dofile(syspath..'formspec'..DIR_DELIM..'formspec_creation.lua')
-
-
--- Load system
-dofile(syspath..'chat_command.lua')
-dofile(syspath..'update_timer.lua')
+-- Load formspec-related files
+dofile(syspath..'formspec_helpers.lua')
 dofile(syspath..'on_receive_fields.lua')
-dofile(syspath..'on_joinplayer.lua')
+for _,f in pairs(get_dir_list(fspath, false)) do dofile(fspath..f) end
+
+
+-- Load timer actions
 dofile(syspath..'get_times.lua')
 dofile(syspath..'get_timer_data.lua')
+dofile(syspath..'update_timer.lua')
+
+
+-- Load player-related functionality
+dofile(syspath..'chat_command.lua')
+dofile(syspath..'on_joinplayer.lua')
 dofile(syspath..'register_globalstep.lua')
diff --git a/system/formspec/formspec_helpers.lua b/system/formspec_helpers.lua
similarity index 100%
rename from system/formspec/formspec_helpers.lua
rename to system/formspec_helpers.lua
diff --git a/system/formspec/formspec_creation.lua b/system/formspecs/formspec_creation.lua
similarity index 100%
rename from system/formspec/formspec_creation.lua
rename to system/formspecs/formspec_creation.lua
diff --git a/system/formspec/main_menu.lua b/system/formspecs/main_menu.lua
similarity index 100%
rename from system/formspec/main_menu.lua
rename to system/formspecs/main_menu.lua
diff --git a/system/formspec/real_time_universal.lua b/system/formspecs/real_time_universal.lua
similarity index 100%
rename from system/formspec/real_time_universal.lua
rename to system/formspecs/real_time_universal.lua