diff --git a/OpenSim/Common/Communications/GridInfoService.cs b/OpenSim/Framework/Communications/GridInfoService.cs
similarity index 99%
rename from OpenSim/Common/Communications/GridInfoService.cs
rename to OpenSim/Framework/Communications/GridInfoService.cs
index adaaa950e1..d51bc594e1 100644
--- a/OpenSim/Common/Communications/GridInfoService.cs
+++ b/OpenSim/Framework/Communications/GridInfoService.cs
@@ -36,7 +36,7 @@ using Nwc.XmlRpc;
using OpenSim.Framework.Servers;
using OpenSim.Framework;
-namespace OpenSim.Common.Communications
+namespace OpenSim.Framework.Communications
{
public class GridInfoService
{
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 516efe47fb..9b74dbc946 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -39,7 +39,6 @@ using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Console;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Statistics;
-using OpenSim.Common.Communications;
using OpenSim.Grid.Communications.OGS1;
namespace OpenSim.Grid.UserServer
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index ce5b3350e8..0ac8cd79ce 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -36,11 +36,11 @@ using libsecondlife;
using log4net;
using Nini.Config;
using OpenSim.Framework;
+using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Console;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Statistics;
-using OpenSim.Common.Communications;
using OpenSim.Region.ClientStack;
using OpenSim.Region.Communications.Local;
using OpenSim.Region.Communications.OGS1;
diff --git a/prebuild.xml b/prebuild.xml
index f6acc42c5a..fdf00d5906 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -466,31 +466,6 @@
-
-
-
- ../../../bin/
-
-
-
-
- ../../../bin/
-
-
-
- ../../../bin/
-
-
-
-
-
-
-
-
-
-
-
-