diff --git a/YAMDCC.GUI/App.config b/YAMDCC.ConfigEditor/App.config
similarity index 100%
rename from YAMDCC.GUI/App.config
rename to YAMDCC.ConfigEditor/App.config
diff --git a/YAMDCC.GUI/Dialogs/CrashDialog.Designer.cs b/YAMDCC.ConfigEditor/Dialogs/CrashDialog.Designer.cs
similarity index 99%
rename from YAMDCC.GUI/Dialogs/CrashDialog.Designer.cs
rename to YAMDCC.ConfigEditor/Dialogs/CrashDialog.Designer.cs
index 174edd7..767384f 100644
--- a/YAMDCC.GUI/Dialogs/CrashDialog.Designer.cs
+++ b/YAMDCC.ConfigEditor/Dialogs/CrashDialog.Designer.cs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License along with
 // YAMDCC. If not, see <https://www.gnu.org/licenses/>.
 
-namespace YAMDCC.GUI.Dialogs
+namespace YAMDCC.ConfigEditor.Dialogs
 {
     partial class CrashDialog
     {
diff --git a/YAMDCC.GUI/Dialogs/CrashDialog.cs b/YAMDCC.ConfigEditor/Dialogs/CrashDialog.cs
similarity index 97%
rename from YAMDCC.GUI/Dialogs/CrashDialog.cs
rename to YAMDCC.ConfigEditor/Dialogs/CrashDialog.cs
index c7334c5..78f4a7a 100644
--- a/YAMDCC.GUI/Dialogs/CrashDialog.cs
+++ b/YAMDCC.ConfigEditor/Dialogs/CrashDialog.cs
@@ -18,7 +18,7 @@
 using System.Diagnostics;
 using System.Windows.Forms;
 
-namespace YAMDCC.GUI.Dialogs
+namespace YAMDCC.ConfigEditor.Dialogs
 {
     internal sealed partial class CrashDialog : Form
     {
diff --git a/YAMDCC.GUI/Dialogs/CrashDialog.resx b/YAMDCC.ConfigEditor/Dialogs/CrashDialog.resx
similarity index 100%
rename from YAMDCC.GUI/Dialogs/CrashDialog.resx
rename to YAMDCC.ConfigEditor/Dialogs/CrashDialog.resx
diff --git a/YAMDCC.GUI/Dialogs/TextInputDialog.Designer.cs b/YAMDCC.ConfigEditor/Dialogs/TextInputDialog.Designer.cs
similarity index 99%
rename from YAMDCC.GUI/Dialogs/TextInputDialog.Designer.cs
rename to YAMDCC.ConfigEditor/Dialogs/TextInputDialog.Designer.cs
index 3106a8a..51c1065 100644
--- a/YAMDCC.GUI/Dialogs/TextInputDialog.Designer.cs
+++ b/YAMDCC.ConfigEditor/Dialogs/TextInputDialog.Designer.cs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License along with
 // YAMDCC. If not, see <https://www.gnu.org/licenses/>.
 
-namespace YAMDCC.GUI.Dialogs
+namespace YAMDCC.ConfigEditor.Dialogs
 {
     partial class TextInputDialog
     {
diff --git a/YAMDCC.GUI/Dialogs/TextInputDialog.cs b/YAMDCC.ConfigEditor/Dialogs/TextInputDialog.cs
similarity index 97%
rename from YAMDCC.GUI/Dialogs/TextInputDialog.cs
rename to YAMDCC.ConfigEditor/Dialogs/TextInputDialog.cs
index ab2c80d..0cfb017 100644
--- a/YAMDCC.GUI/Dialogs/TextInputDialog.cs
+++ b/YAMDCC.ConfigEditor/Dialogs/TextInputDialog.cs
@@ -17,7 +17,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace YAMDCC.GUI.Dialogs
+namespace YAMDCC.ConfigEditor.Dialogs
 {
     internal sealed partial class TextInputDialog : Form
     {
diff --git a/YAMDCC.GUI/Dialogs/TextInputDialog.resx b/YAMDCC.ConfigEditor/Dialogs/TextInputDialog.resx
similarity index 100%
rename from YAMDCC.GUI/Dialogs/TextInputDialog.resx
rename to YAMDCC.ConfigEditor/Dialogs/TextInputDialog.resx
diff --git a/YAMDCC.GUI/MainWindow.Designer.cs b/YAMDCC.ConfigEditor/MainWindow.Designer.cs
similarity index 99%
rename from YAMDCC.GUI/MainWindow.Designer.cs
rename to YAMDCC.ConfigEditor/MainWindow.Designer.cs
index 5faf096..09a6078 100644
--- a/YAMDCC.GUI/MainWindow.Designer.cs
+++ b/YAMDCC.ConfigEditor/MainWindow.Designer.cs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License along with
 // YAMDCC. If not, see <https://www.gnu.org/licenses/>.
 
-namespace YAMDCC.GUI
+namespace YAMDCC.ConfigEditor
 {
     partial class MainWindow
     {
diff --git a/YAMDCC.GUI/MainWindow.cs b/YAMDCC.ConfigEditor/MainWindow.cs
similarity index 99%
rename from YAMDCC.GUI/MainWindow.cs
rename to YAMDCC.ConfigEditor/MainWindow.cs
index a26d641..035ba0b 100644
--- a/YAMDCC.GUI/MainWindow.cs
+++ b/YAMDCC.ConfigEditor/MainWindow.cs
@@ -23,10 +23,10 @@
 using System.Text;
 using System.Windows.Forms;
 using YAMDCC.Config;
-using YAMDCC.GUI.Dialogs;
+using YAMDCC.ConfigEditor.Dialogs;
 using YAMDCC.IPC;
 
-namespace YAMDCC.GUI
+namespace YAMDCC.ConfigEditor
 {
     internal sealed partial class MainWindow : Form
     {
diff --git a/YAMDCC.GUI/MainWindow.resx b/YAMDCC.ConfigEditor/MainWindow.resx
similarity index 100%
rename from YAMDCC.GUI/MainWindow.resx
rename to YAMDCC.ConfigEditor/MainWindow.resx
diff --git a/YAMDCC.GUI/Paths.cs b/YAMDCC.ConfigEditor/Paths.cs
similarity index 98%
rename from YAMDCC.GUI/Paths.cs
rename to YAMDCC.ConfigEditor/Paths.cs
index cc980bc..87e3300 100644
--- a/YAMDCC.GUI/Paths.cs
+++ b/YAMDCC.ConfigEditor/Paths.cs
@@ -17,7 +17,7 @@
 using System;
 using System.IO;
 
-namespace YAMDCC.GUI
+namespace YAMDCC.ConfigEditor
 {
     internal static class Paths
     {
diff --git a/YAMDCC.GUI/Program.cs b/YAMDCC.ConfigEditor/Program.cs
similarity index 99%
rename from YAMDCC.GUI/Program.cs
rename to YAMDCC.ConfigEditor/Program.cs
index 5ef47c3..ea705d3 100644
--- a/YAMDCC.GUI/Program.cs
+++ b/YAMDCC.ConfigEditor/Program.cs
@@ -20,9 +20,9 @@
 using System.Security.Principal;
 using System.ServiceProcess;
 using System.Windows.Forms;
-using YAMDCC.GUI.Dialogs;
+using YAMDCC.ConfigEditor.Dialogs;
 
-namespace YAMDCC.GUI
+namespace YAMDCC.ConfigEditor
 {
     internal static class Program
     {
diff --git a/YAMDCC.GUI/Program.resx b/YAMDCC.ConfigEditor/Program.resx
similarity index 100%
rename from YAMDCC.GUI/Program.resx
rename to YAMDCC.ConfigEditor/Program.resx
diff --git a/YAMDCC.GUI/Status.cs b/YAMDCC.ConfigEditor/Status.cs
similarity index 97%
rename from YAMDCC.GUI/Status.cs
rename to YAMDCC.ConfigEditor/Status.cs
index d738209..bcdfb06 100644
--- a/YAMDCC.GUI/Status.cs
+++ b/YAMDCC.ConfigEditor/Status.cs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License along with
 // YAMDCC. If not, see <https://www.gnu.org/licenses/>.
 
-namespace YAMDCC.GUI
+namespace YAMDCC.ConfigEditor
 {
     internal sealed class Status
     {
diff --git a/YAMDCC.GUI/Strings.cs b/YAMDCC.ConfigEditor/Strings.cs
similarity index 99%
rename from YAMDCC.GUI/Strings.cs
rename to YAMDCC.ConfigEditor/Strings.cs
index 477805d..60ca727 100644
--- a/YAMDCC.GUI/Strings.cs
+++ b/YAMDCC.ConfigEditor/Strings.cs
@@ -17,7 +17,7 @@
 using System.Globalization;
 using System.Resources;
 
-namespace YAMDCC.GUI
+namespace YAMDCC.ConfigEditor
 {
     /// <summary>
     /// A resource class for retrieving strings.
diff --git a/YAMDCC.GUI/Strings.resx b/YAMDCC.ConfigEditor/Strings.resx
similarity index 100%
rename from YAMDCC.GUI/Strings.resx
rename to YAMDCC.ConfigEditor/Strings.resx
diff --git a/YAMDCC.GUI/Utils.cs b/YAMDCC.ConfigEditor/Utils.cs
similarity index 99%
rename from YAMDCC.GUI/Utils.cs
rename to YAMDCC.ConfigEditor/Utils.cs
index f0cbeb0..a5f0e37 100644
--- a/YAMDCC.GUI/Utils.cs
+++ b/YAMDCC.ConfigEditor/Utils.cs
@@ -21,7 +21,7 @@
 using System.ServiceProcess;
 using System.Windows.Forms;
 
-namespace YAMDCC.GUI
+namespace YAMDCC.ConfigEditor
 {
     /// <summary>
     /// A collection of miscellaneous useful utilities
diff --git a/YAMDCC.GUI/YAMDCC.GUI.csproj b/YAMDCC.ConfigEditor/YAMDCC.ConfigEditor.csproj
similarity index 100%
rename from YAMDCC.GUI/YAMDCC.GUI.csproj
rename to YAMDCC.ConfigEditor/YAMDCC.ConfigEditor.csproj
diff --git a/YAMDCC.GUI/app.manifest b/YAMDCC.ConfigEditor/app.manifest
similarity index 100%
rename from YAMDCC.GUI/app.manifest
rename to YAMDCC.ConfigEditor/app.manifest
diff --git a/YAMDCC.GUI/fan.ico b/YAMDCC.ConfigEditor/fan.ico
similarity index 100%
rename from YAMDCC.GUI/fan.ico
rename to YAMDCC.ConfigEditor/fan.ico
diff --git a/YAMDCC.GUI/packages.lock.json b/YAMDCC.ConfigEditor/packages.lock.json
similarity index 100%
rename from YAMDCC.GUI/packages.lock.json
rename to YAMDCC.ConfigEditor/packages.lock.json
diff --git a/YAMDCC.sln b/YAMDCC.sln
index 011f1b9..9ee314a 100644
--- a/YAMDCC.sln
+++ b/YAMDCC.sln
@@ -12,7 +12,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YAMDCC.Config", "YAMDCC.Con
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YAMDCC.ECAccess", "YAMDCC.ECAccess\YAMDCC.ECAccess.csproj", "{EDCEB6F6-B97C-4343-969E-AA58F887A0FE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YAMDCC.GUI", "YAMDCC.GUI\YAMDCC.GUI.csproj", "{5025D7BC-1BE1-4B72-B30A-893B25F73596}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YAMDCC.ConfigEditor", "YAMDCC.ConfigEditor\YAMDCC.ConfigEditor.csproj", "{5025D7BC-1BE1-4B72-B30A-893B25F73596}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YAMDCC.IPC", "YAMDCC.IPC\YAMDCC.IPC.csproj", "{73152691-3CDE-46DF-8D04-7117747DFFE7}"
 EndProject