diff --git a/NovetusLauncher/NovetusCMD/Program.cs b/NovetusLauncher/NovetusCMD/Program.cs
index 33098d1..9c20341 100644
--- a/NovetusLauncher/NovetusCMD/Program.cs
+++ b/NovetusLauncher/NovetusCMD/Program.cs
@@ -104,7 +104,7 @@ namespace NovetusCMD
 			{
 				try
       			{
-     				GlobalVars.WebServer = new SimpleHTTPServer(GlobalVars.DataPath, GlobalVars.WebServer_Port);
+     				GlobalVars.WebServer = new SimpleHTTPServer(GlobalVars.ServerDir, GlobalVars.WebServer_Port);
         			ConsolePrint("WebServer: Server is running on port: " + GlobalVars.WebServer.Port.ToString(), 3);
       			}
       			catch (Exception ex) when (!Env.Debugging)
diff --git a/NovetusLauncher/NovetusFuncs/GlobalVars.cs b/NovetusLauncher/NovetusFuncs/GlobalVars.cs
index f127253..aae52e5 100644
--- a/NovetusLauncher/NovetusFuncs/GlobalVars.cs
+++ b/NovetusLauncher/NovetusFuncs/GlobalVars.cs
@@ -30,7 +30,8 @@ public static class GlobalVars
     public static readonly string RootPath = Directory.GetParent(RootPathLauncher).ToString();
 	public static readonly string BasePath = RootPath.Replace(@"\", @"\\");
     public static readonly string DataPath = BasePath + @"\\shareddata";
-	public static readonly string ConfigDir = BasePath + @"\\config";
+    public static readonly string ServerDir = DataPath + "\\server";
+    public static readonly string ConfigDir = BasePath + @"\\config";
     public static readonly string ConfigDirData = BasePathLauncher + @"\\data";
     public static readonly string ClientDir = BasePath + @"\\clients";
 	public static readonly string MapsDir = BasePath + @"\\maps";
diff --git a/NovetusLauncher/NovetusLauncher/MainForm/MainForm.cs b/NovetusLauncher/NovetusLauncher/MainForm/MainForm.cs
index 4325ebd..a576cd5 100644
--- a/NovetusLauncher/NovetusLauncher/MainForm/MainForm.cs
+++ b/NovetusLauncher/NovetusLauncher/MainForm/MainForm.cs
@@ -174,7 +174,7 @@ namespace NovetusLauncher
 			{
 				try
       			{
-     				GlobalVars.WebServer = new SimpleHTTPServer(GlobalVars.DataPath, GlobalVars.WebServer_Port);
+     				GlobalVars.WebServer = new SimpleHTTPServer(GlobalVars.ServerDir, GlobalVars.WebServer_Port);
         			ConsolePrint("WebServer: Server is running on port: " + GlobalVars.WebServer.Port.ToString(), 3);
       			}
       			catch (Exception ex) when (!Env.Debugging)
diff --git a/NovetusLauncher/NovetusLauncher/MainForm/MainForm_legacy.cs b/NovetusLauncher/NovetusLauncher/MainForm/MainForm_legacy.cs
index afefd21..106bccb 100644
--- a/NovetusLauncher/NovetusLauncher/MainForm/MainForm_legacy.cs
+++ b/NovetusLauncher/NovetusLauncher/MainForm/MainForm_legacy.cs
@@ -172,7 +172,7 @@ namespace NovetusLauncher
 			{
 				try
       			{
-     				GlobalVars.WebServer = new SimpleHTTPServer(GlobalVars.DataPath, GlobalVars.WebServer_Port);
+     				GlobalVars.WebServer = new SimpleHTTPServer(GlobalVars.ServerDir, GlobalVars.WebServer_Port);
         			ConsolePrint("WebServer: Server is running on port: " + GlobalVars.WebServer.Port.ToString(), 3);
       			}
       			catch (Exception ex) when (!Env.Debugging)