diff --git a/GUI/MCGalaxyGUI.csproj b/GUI/MCGalaxyGUI.csproj
index 58e099f65..69e323b70 100644
--- a/GUI/MCGalaxyGUI.csproj
+++ b/GUI/MCGalaxyGUI.csproj
@@ -48,6 +48,7 @@
+
@@ -119,6 +120,7 @@
EconomyWindow.cs
+
Form
diff --git a/MCGalaxy/Server/Extra/UPnP.cs b/GUI/UPnP.cs
similarity index 100%
rename from MCGalaxy/Server/Extra/UPnP.cs
rename to GUI/UPnP.cs
diff --git a/MCGalaxy/MCGalaxy_.csproj b/MCGalaxy/MCGalaxy_.csproj
index d94fafc26..9170ab238 100644
--- a/MCGalaxy/MCGalaxy_.csproj
+++ b/MCGalaxy/MCGalaxy_.csproj
@@ -620,7 +620,6 @@
-