diff --git a/application/core/Configurators/Configurator.php b/application/core/Configurator/Configurator.php
similarity index 99%
rename from application/core/Configurators/Configurator.php
rename to application/core/Configurator/Configurator.php
index d11bbd42..866a09ef 100644
--- a/application/core/Configurators/Configurator.php
+++ b/application/core/Configurator/Configurator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ManiaControl\Configurators;
+namespace ManiaControl\Configurator;
 
 use FML\Controls\Frame;
 use FML\Controls\Labels\Label_Text;
diff --git a/application/core/Configurators/ConfiguratorMenu.php b/application/core/Configurator/ConfiguratorMenu.php
similarity index 95%
rename from application/core/Configurators/ConfiguratorMenu.php
rename to application/core/Configurator/ConfiguratorMenu.php
index 525bfa7b..ff2fc0be 100644
--- a/application/core/Configurators/ConfiguratorMenu.php
+++ b/application/core/Configurator/ConfiguratorMenu.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ManiaControl\Configurators;
+namespace ManiaControl\Configurator;
 
 use FML\Script\Script;
 use ManiaControl\Players\Player;
diff --git a/application/core/Configurators/ManiaControlSettings.php b/application/core/Configurator/ManiaControlSettings.php
similarity index 99%
rename from application/core/Configurators/ManiaControlSettings.php
rename to application/core/Configurator/ManiaControlSettings.php
index 80b443ce..92e74dac 100644
--- a/application/core/Configurators/ManiaControlSettings.php
+++ b/application/core/Configurator/ManiaControlSettings.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ManiaControl\Configurators;
+namespace ManiaControl\Configurator;
 
 use FML\Components\CheckBox;
 use FML\Components\ValuePicker;
diff --git a/application/core/Configurators/ScriptSettings.php b/application/core/Configurator/ScriptSettings.php
similarity index 99%
rename from application/core/Configurators/ScriptSettings.php
rename to application/core/Configurator/ScriptSettings.php
index 98c17bee..87f4f301 100644
--- a/application/core/Configurators/ScriptSettings.php
+++ b/application/core/Configurator/ScriptSettings.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ManiaControl\Configurators;
+namespace ManiaControl\Configurator;
 
 use FML\Components\CheckBox;
 use FML\Controls\Entry;
diff --git a/application/core/ManiaControl.php b/application/core/ManiaControl.php
index dc79caff..95445ef0 100644
--- a/application/core/ManiaControl.php
+++ b/application/core/ManiaControl.php
@@ -12,7 +12,7 @@ use ManiaControl\Callbacks\TimerListener;
 use ManiaControl\Callbacks\TimerManager;
 use ManiaControl\Commands\CommandListener;
 use ManiaControl\Commands\CommandManager;
-use ManiaControl\Configurators\Configurator;
+use ManiaControl\Configurator\Configurator;
 use ManiaControl\Database\Database;
 use ManiaControl\Files\AsynchronousFileReader;
 use ManiaControl\Files\FileUtil;
diff --git a/application/core/Plugins/InstallMenu.php b/application/core/Plugins/InstallMenu.php
index 41e4660d..1cdb87ee 100644
--- a/application/core/Plugins/InstallMenu.php
+++ b/application/core/Plugins/InstallMenu.php
@@ -10,7 +10,7 @@ use FML\Controls\Quads\Quad_Icons64x64_1;
 use FML\Script\Features\Paging;
 use FML\Script\Script;
 use ManiaControl\Admin\AuthenticationManager;
-use ManiaControl\Configurators\ConfiguratorMenu;
+use ManiaControl\Configurator\ConfiguratorMenu;
 use ManiaControl\ManiaControl;
 use ManiaControl\Manialinks\ManialinkPageAnswerListener;
 use ManiaControl\Players\Player;
diff --git a/application/core/Plugins/PluginMenu.php b/application/core/Plugins/PluginMenu.php
index 31d3ea6f..cdf19dcb 100644
--- a/application/core/Plugins/PluginMenu.php
+++ b/application/core/Plugins/PluginMenu.php
@@ -18,7 +18,7 @@ use FML\Script\Script;
 use ManiaControl\Admin\AuthenticationManager;
 use ManiaControl\Callbacks\CallbackListener;
 use ManiaControl\Callbacks\CallbackManager;
-use ManiaControl\Configurators\ConfiguratorMenu;
+use ManiaControl\Configurator\ConfiguratorMenu;
 use ManiaControl\ManiaControl;
 use ManiaControl\Manialinks\ManialinkPageAnswerListener;
 use ManiaControl\Players\Player;
diff --git a/application/core/Server/ServerOptionsMenu.php b/application/core/Server/ServerOptionsMenu.php
index 461a4448..8ccce609 100644
--- a/application/core/Server/ServerOptionsMenu.php
+++ b/application/core/Server/ServerOptionsMenu.php
@@ -13,7 +13,7 @@ use FML\Script\Script;
 use ManiaControl\Admin\AuthenticationManager;
 use ManiaControl\Callbacks\CallbackListener;
 use ManiaControl\Callbacks\Callbacks;
-use ManiaControl\Configurators\ConfiguratorMenu;
+use ManiaControl\Configurator\ConfiguratorMenu;
 use ManiaControl\ManiaControl;
 use ManiaControl\Players\Player;
 use Maniaplanet\DedicatedServer\Structures\ServerOptions;