diff --git a/fs_edit_options_dialog.lua b/fs/fs_edit_options_dialog.lua
similarity index 100%
rename from fs_edit_options_dialog.lua
rename to fs/fs_edit_options_dialog.lua
diff --git a/fs_initial_config.lua b/fs/fs_initial_config.lua
similarity index 100%
rename from fs_initial_config.lua
rename to fs/fs_initial_config.lua
diff --git a/fs_save_or_discard_or_back.lua b/fs/fs_save_or_discard_or_back.lua
similarity index 100%
rename from fs_save_or_discard_or_back.lua
rename to fs/fs_save_or_discard_or_back.lua
diff --git a/init.lua b/init.lua
index 4a6e291..7805feb 100644
--- a/init.lua
+++ b/init.lua
@@ -157,7 +157,7 @@ yl_speak_up.reload = function(modpath, log_entry)
 	-- the formspec and input handling for the main dialog
 	dofile(modpath .. "fs_talkdialog.lua")
 	-- ask if the player wants to save, discard or go back in edit mode
-	dofile(modpath .. "fs_save_or_discard_or_back.lua")
+	dofile(modpath .. "fs/fs_save_or_discard_or_back.lua")
 	-- the player wants to change something regarding the dialog
 	dofile(modpath .. "edit_mode_apply_changes.lua")
 
@@ -198,9 +198,9 @@ yl_speak_up.reload = function(modpath, log_entry)
 	-- edit effects (can be reached through edit options dialog)
 	dofile(modpath .. "fs/fs_edit_effects.lua")
 	-- edit options dialog (detailed configuration of options in edit mode)
-	dofile(modpath .. "fs_edit_options_dialog.lua")
+	dofile(modpath .. "fs/fs_edit_options_dialog.lua")
 	-- set name, description and owner (owner only with npc_talk_master priv)
-	dofile(modpath .. "fs_initial_config.lua")
+	dofile(modpath .. "fs/fs_initial_config.lua")
 	-- inspect and accept items the player gave to the NPC
 	dofile(modpath .. "fs_player_offers_item.lua")
 	-- inventory management, trading and handling of quest items: