diff --git a/modules/commands/admin-only-auth.lua b/config/command_auth_admin.lua
similarity index 100%
rename from modules/commands/admin-only-auth.lua
rename to config/command_auth_admin.lua
diff --git a/expcore/common_parse.lua b/config/command_parse_general.lua
similarity index 100%
rename from expcore/common_parse.lua
rename to config/command_parse_general.lua
diff --git a/modules/commands/admin-chat.lua b/modules/commands/admin-chat.lua
index a178349c..00ae2d5d 100644
--- a/modules/commands/admin-chat.lua
+++ b/modules/commands/admin-chat.lua
@@ -1,6 +1,6 @@
 local Commands = require 'expcore.commands'
-require 'expcore.common_parse'
-require 'modules.commands.admin-only-auth'
+require 'config.command_parse_general'
+require 'config.command_auth_admin'
 
 Commands.new_command('admin-chat','Sends a message in chat that only admins can see.')
 :add_param('message',false) -- the message to send in the admin chat
diff --git a/modules/commands/cheat-mode.lua b/modules/commands/cheat-mode.lua
index c2a1b206..71ea9d15 100644
--- a/modules/commands/cheat-mode.lua
+++ b/modules/commands/cheat-mode.lua
@@ -1,6 +1,6 @@
 local Commands = require 'expcore.commands'
-require 'expcore.common_parse'
-require 'modules.commands.admin-only-auth'
+require 'config.command_parse_general'
+require 'config.command_auth_admin'
 
 Commands.new_command('toggle-cheat-mode','Toggles cheat mode for your player, or another player.')
 :add_param('player',true,'player') -- player to toggle chest mode of, can be nil for self
diff --git a/modules/commands/help.lua b/modules/commands/help.lua
index 432560f6..07e1c572 100644
--- a/modules/commands/help.lua
+++ b/modules/commands/help.lua
@@ -1,6 +1,6 @@
 local Commands = require 'expcore.commands'
 local Global = require 'utils.global'
-require 'expcore.common_parse'
+require 'config.command_parse_general'
 
 local results_per_page = 5
 
diff --git a/modules/commands/interface.lua b/modules/commands/interface.lua
index 43306a41..b04e35e4 100644
--- a/modules/commands/interface.lua
+++ b/modules/commands/interface.lua
@@ -1,7 +1,7 @@
 local Commands = require 'expcore.commands'
 local Global = require 'utils.global'
 local Common = require 'expcore.common'
-require 'modules.commands.admin-only-auth'
+require 'config.command_auth_admin'
 
 -- modules that are loaded into the interface env to be accessed
 local interface_modules = {
diff --git a/modules/commands/kill.lua b/modules/commands/kill.lua
index a5c990c3..7ecb5c90 100644
--- a/modules/commands/kill.lua
+++ b/modules/commands/kill.lua
@@ -1,6 +1,6 @@
 local Commands = require 'expcore.commands'
-require 'expcore.common_parse'
-require 'modules.commands.admin-only-auth'
+require 'config.command_parse_general'
+require 'config.command_auth_admin'
 
 Commands.new_command('kill','Kills yourself or another player.')
 :add_param('player',true,'player-alive') -- the player to kill, must be alive to be valid
diff --git a/modules/commands/tag.lua b/modules/commands/tag.lua
index f8f8d1d9..97ae6c21 100644
--- a/modules/commands/tag.lua
+++ b/modules/commands/tag.lua
@@ -1,5 +1,5 @@
 local Commands = require 'expcore.commands'
-require 'expcore.common_parse'
+require 'config.command_parse_general'
 
 Commands.new_command('tag','Sets your player tag.')
 :add_param('tag',false,'string-max-length',20) -- new tag for your player max 20 char
diff --git a/modules/commands/teleport.lua b/modules/commands/teleport.lua
index bcb64ee8..05f33a76 100644
--- a/modules/commands/teleport.lua
+++ b/modules/commands/teleport.lua
@@ -1,6 +1,6 @@
 local Commands = require 'expcore.commands'
-require 'expcore.common_parse'
-require 'modules.commands.admin-only-auth'
+require 'config.command_parse_general'
+require 'config.command_auth_admin'
 
 local function teleport(from_player,to_player)
     local surface = to_player.surface