diff --git a/Common-Source/OpenSim.Framework.Console/AssemblyInfo.cs b/Common/OpenSim.Framework.Console/AssemblyInfo.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework.Console/AssemblyInfo.cs
rename to Common/OpenSim.Framework.Console/AssemblyInfo.cs
diff --git a/Common-Source/OpenSim.Framework.Console/ConsoleBase.cs b/Common/OpenSim.Framework.Console/ConsoleBase.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework.Console/ConsoleBase.cs
rename to Common/OpenSim.Framework.Console/ConsoleBase.cs
diff --git a/Common-Source/OpenSim.Framework.Console/ConsoleCallbacksBase.cs b/Common/OpenSim.Framework.Console/ConsoleCallbacksBase.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework.Console/ConsoleCallbacksBase.cs
rename to Common/OpenSim.Framework.Console/ConsoleCallbacksBase.cs
diff --git a/Common-Source/OpenSim.Framework.Console/MainConsole.cs b/Common/OpenSim.Framework.Console/MainConsole.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework.Console/MainConsole.cs
rename to Common/OpenSim.Framework.Console/MainConsole.cs
diff --git a/Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj b/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
similarity index 100%
rename from Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
rename to Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
diff --git a/Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user b/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user
similarity index 100%
rename from Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user
rename to Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user
diff --git a/Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build b/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
similarity index 100%
rename from Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
rename to Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
diff --git a/Common-Source/OpenSim.Framework/AgentInventory.cs b/Common/OpenSim.Framework/AgentInventory.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/AgentInventory.cs
rename to Common/OpenSim.Framework/AgentInventory.cs
diff --git a/Common-Source/OpenSim.Framework/BlockingQueue.cs b/Common/OpenSim.Framework/BlockingQueue.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/BlockingQueue.cs
rename to Common/OpenSim.Framework/BlockingQueue.cs
diff --git a/Common-Source/OpenSim.Framework/HeightMapGenHills.cs b/Common/OpenSim.Framework/HeightMapGenHills.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/HeightMapGenHills.cs
rename to Common/OpenSim.Framework/HeightMapGenHills.cs
diff --git a/Common-Source/OpenSim.Framework/Interfaces/IAssetServer.cs b/Common/OpenSim.Framework/Interfaces/IAssetServer.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/Interfaces/IAssetServer.cs
rename to Common/OpenSim.Framework/Interfaces/IAssetServer.cs
diff --git a/Common-Source/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/Interfaces/IClientAPI.cs
rename to Common/OpenSim.Framework/Interfaces/IClientAPI.cs
diff --git a/Common-Source/OpenSim.Framework/Interfaces/IConfig.cs b/Common/OpenSim.Framework/Interfaces/IConfig.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/Interfaces/IConfig.cs
rename to Common/OpenSim.Framework/Interfaces/IConfig.cs
diff --git a/Common-Source/OpenSim.Framework/Interfaces/IGenericConfig.cs b/Common/OpenSim.Framework/Interfaces/IGenericConfig.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/Interfaces/IGenericConfig.cs
rename to Common/OpenSim.Framework/Interfaces/IGenericConfig.cs
diff --git a/Common-Source/OpenSim.Framework/Interfaces/IGridConfig.cs b/Common/OpenSim.Framework/Interfaces/IGridConfig.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/Interfaces/IGridConfig.cs
rename to Common/OpenSim.Framework/Interfaces/IGridConfig.cs
diff --git a/Common-Source/OpenSim.Framework/Interfaces/IGridServer.cs b/Common/OpenSim.Framework/Interfaces/IGridServer.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/Interfaces/IGridServer.cs
rename to Common/OpenSim.Framework/Interfaces/IGridServer.cs
diff --git a/Common-Source/OpenSim.Framework/Interfaces/ILocalStorage.cs b/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/Interfaces/ILocalStorage.cs
rename to Common/OpenSim.Framework/Interfaces/ILocalStorage.cs
diff --git a/Common-Source/OpenSim.Framework/Interfaces/IScriptAPI.cs b/Common/OpenSim.Framework/Interfaces/IScriptAPI.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/Interfaces/IScriptAPI.cs
rename to Common/OpenSim.Framework/Interfaces/IScriptAPI.cs
diff --git a/Common-Source/OpenSim.Framework/Interfaces/IScriptEngine.cs b/Common/OpenSim.Framework/Interfaces/IScriptEngine.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/Interfaces/IScriptEngine.cs
rename to Common/OpenSim.Framework/Interfaces/IScriptEngine.cs
diff --git a/Common-Source/OpenSim.Framework/Interfaces/IUserConfig.cs b/Common/OpenSim.Framework/Interfaces/IUserConfig.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/Interfaces/IUserConfig.cs
rename to Common/OpenSim.Framework/Interfaces/IUserConfig.cs
diff --git a/Common-Source/OpenSim.Framework/Interfaces/IUserServer.cs b/Common/OpenSim.Framework/Interfaces/IUserServer.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/Interfaces/IUserServer.cs
rename to Common/OpenSim.Framework/Interfaces/IUserServer.cs
diff --git a/Common-Source/OpenSim.Framework/Interfaces/LocalGridBase.cs b/Common/OpenSim.Framework/Interfaces/LocalGridBase.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/Interfaces/LocalGridBase.cs
rename to Common/OpenSim.Framework/Interfaces/LocalGridBase.cs
diff --git a/Common-Source/OpenSim.Framework/Interfaces/RemoteGridBase.cs b/Common/OpenSim.Framework/Interfaces/RemoteGridBase.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/Interfaces/RemoteGridBase.cs
rename to Common/OpenSim.Framework/Interfaces/RemoteGridBase.cs
diff --git a/Common-Source/OpenSim.Framework/LoginService.cs b/Common/OpenSim.Framework/LoginService.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/LoginService.cs
rename to Common/OpenSim.Framework/LoginService.cs
diff --git a/Common-Source/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
similarity index 100%
rename from Common-Source/OpenSim.Framework/OpenSim.Framework.csproj
rename to Common/OpenSim.Framework/OpenSim.Framework.csproj
diff --git a/Common-Source/OpenSim.Framework/OpenSim.Framework.csproj.user b/Common/OpenSim.Framework/OpenSim.Framework.csproj.user
similarity index 100%
rename from Common-Source/OpenSim.Framework/OpenSim.Framework.csproj.user
rename to Common/OpenSim.Framework/OpenSim.Framework.csproj.user
diff --git a/Common-Source/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
similarity index 100%
rename from Common-Source/OpenSim.Framework/OpenSim.Framework.dll.build
rename to Common/OpenSim.Framework/OpenSim.Framework.dll.build
diff --git a/Common-Source/OpenSim.Framework/Properties/AssemblyInfo.cs b/Common/OpenSim.Framework/Properties/AssemblyInfo.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/Properties/AssemblyInfo.cs
rename to Common/OpenSim.Framework/Properties/AssemblyInfo.cs
diff --git a/Common-Source/OpenSim.Framework/Remoting.cs b/Common/OpenSim.Framework/Remoting.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/Remoting.cs
rename to Common/OpenSim.Framework/Remoting.cs
diff --git a/Common-Source/OpenSim.Framework/SimProfile.cs b/Common/OpenSim.Framework/SimProfile.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/SimProfile.cs
rename to Common/OpenSim.Framework/SimProfile.cs
diff --git a/Common-Source/OpenSim.Framework/SimProfileBase.cs b/Common/OpenSim.Framework/SimProfileBase.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/SimProfileBase.cs
rename to Common/OpenSim.Framework/SimProfileBase.cs
diff --git a/Common-Source/OpenSim.Framework/Types/AgentCiruitData.cs b/Common/OpenSim.Framework/Types/AgentCiruitData.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/Types/AgentCiruitData.cs
rename to Common/OpenSim.Framework/Types/AgentCiruitData.cs
diff --git a/Common-Source/OpenSim.Framework/Types/AssetBase.cs b/Common/OpenSim.Framework/Types/AssetBase.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/Types/AssetBase.cs
rename to Common/OpenSim.Framework/Types/AssetBase.cs
diff --git a/Common-Source/OpenSim.Framework/Types/AssetLandmark.cs b/Common/OpenSim.Framework/Types/AssetLandmark.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/Types/AssetLandmark.cs
rename to Common/OpenSim.Framework/Types/AssetLandmark.cs
diff --git a/Common-Source/OpenSim.Framework/Types/AssetStorage.cs b/Common/OpenSim.Framework/Types/AssetStorage.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/Types/AssetStorage.cs
rename to Common/OpenSim.Framework/Types/AssetStorage.cs
diff --git a/Common-Source/OpenSim.Framework/Types/Login.cs b/Common/OpenSim.Framework/Types/Login.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/Types/Login.cs
rename to Common/OpenSim.Framework/Types/Login.cs
diff --git a/Common-Source/OpenSim.Framework/Types/NeighbourInfo.cs b/Common/OpenSim.Framework/Types/NeighbourInfo.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/Types/NeighbourInfo.cs
rename to Common/OpenSim.Framework/Types/NeighbourInfo.cs
diff --git a/Common-Source/OpenSim.Framework/Types/OSVector3.cs b/Common/OpenSim.Framework/Types/OSVector3.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/Types/OSVector3.cs
rename to Common/OpenSim.Framework/Types/OSVector3.cs
diff --git a/Common-Source/OpenSim.Framework/Types/PrimData.cs b/Common/OpenSim.Framework/Types/PrimData.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/Types/PrimData.cs
rename to Common/OpenSim.Framework/Types/PrimData.cs
diff --git a/Common-Source/OpenSim.Framework/UserProfile.cs b/Common/OpenSim.Framework/UserProfile.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/UserProfile.cs
rename to Common/OpenSim.Framework/UserProfile.cs
diff --git a/Common-Source/OpenSim.Framework/UserProfileManager.cs b/Common/OpenSim.Framework/UserProfileManager.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/UserProfileManager.cs
rename to Common/OpenSim.Framework/UserProfileManager.cs
diff --git a/Common-Source/OpenSim.Framework/UserProfileManagerBase.cs b/Common/OpenSim.Framework/UserProfileManagerBase.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/UserProfileManagerBase.cs
rename to Common/OpenSim.Framework/UserProfileManagerBase.cs
diff --git a/Common-Source/OpenSim.Framework/Util.cs b/Common/OpenSim.Framework/Util.cs
similarity index 100%
rename from Common-Source/OpenSim.Framework/Util.cs
rename to Common/OpenSim.Framework/Util.cs
diff --git a/Common-Source/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj
similarity index 100%
rename from Common-Source/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj
rename to Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj
diff --git a/Common-Source/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user
similarity index 100%
rename from Common-Source/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user
rename to Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user
diff --git a/Common-Source/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
similarity index 100%
rename from Common-Source/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
rename to Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
diff --git a/Common-Source/OpenSim.GenericConfig/Xml/Properties/AssemblyInfo.cs b/Common/OpenSim.GenericConfig/Xml/Properties/AssemblyInfo.cs
similarity index 100%
rename from Common-Source/OpenSim.GenericConfig/Xml/Properties/AssemblyInfo.cs
rename to Common/OpenSim.GenericConfig/Xml/Properties/AssemblyInfo.cs
diff --git a/Common-Source/OpenSim.GenericConfig/Xml/XmlConfig.cs b/Common/OpenSim.GenericConfig/Xml/XmlConfig.cs
similarity index 100%
rename from Common-Source/OpenSim.GenericConfig/Xml/XmlConfig.cs
rename to Common/OpenSim.GenericConfig/Xml/XmlConfig.cs
diff --git a/Common-Source/OpenSim.Servers/BaseHttpServer.cs b/Common/OpenSim.Servers/BaseHttpServer.cs
similarity index 100%
rename from Common-Source/OpenSim.Servers/BaseHttpServer.cs
rename to Common/OpenSim.Servers/BaseHttpServer.cs
diff --git a/Common-Source/OpenSim.Servers/BaseServer.cs b/Common/OpenSim.Servers/BaseServer.cs
similarity index 100%
rename from Common-Source/OpenSim.Servers/BaseServer.cs
rename to Common/OpenSim.Servers/BaseServer.cs
diff --git a/Common-Source/OpenSim.Servers/CheckSumServer.cs b/Common/OpenSim.Servers/CheckSumServer.cs
similarity index 100%
rename from Common-Source/OpenSim.Servers/CheckSumServer.cs
rename to Common/OpenSim.Servers/CheckSumServer.cs
diff --git a/Common-Source/OpenSim.Servers/IRestHandler.cs b/Common/OpenSim.Servers/IRestHandler.cs
similarity index 100%
rename from Common-Source/OpenSim.Servers/IRestHandler.cs
rename to Common/OpenSim.Servers/IRestHandler.cs
diff --git a/Common-Source/OpenSim.Servers/LocalUserProfileManager.cs b/Common/OpenSim.Servers/LocalUserProfileManager.cs
similarity index 100%
rename from Common-Source/OpenSim.Servers/LocalUserProfileManager.cs
rename to Common/OpenSim.Servers/LocalUserProfileManager.cs
diff --git a/Common-Source/OpenSim.Servers/LoginResponse.cs b/Common/OpenSim.Servers/LoginResponse.cs
similarity index 100%
rename from Common-Source/OpenSim.Servers/LoginResponse.cs
rename to Common/OpenSim.Servers/LoginResponse.cs
diff --git a/Common-Source/OpenSim.Servers/LoginServer.cs b/Common/OpenSim.Servers/LoginServer.cs
similarity index 100%
rename from Common-Source/OpenSim.Servers/LoginServer.cs
rename to Common/OpenSim.Servers/LoginServer.cs
diff --git a/Common-Source/OpenSim.Servers/OpenSim.Servers.csproj b/Common/OpenSim.Servers/OpenSim.Servers.csproj
similarity index 100%
rename from Common-Source/OpenSim.Servers/OpenSim.Servers.csproj
rename to Common/OpenSim.Servers/OpenSim.Servers.csproj
diff --git a/Common-Source/OpenSim.Servers/OpenSim.Servers.csproj.user b/Common/OpenSim.Servers/OpenSim.Servers.csproj.user
similarity index 100%
rename from Common-Source/OpenSim.Servers/OpenSim.Servers.csproj.user
rename to Common/OpenSim.Servers/OpenSim.Servers.csproj.user
diff --git a/Common-Source/OpenSim.Servers/OpenSim.Servers.dll.build b/Common/OpenSim.Servers/OpenSim.Servers.dll.build
similarity index 100%
rename from Common-Source/OpenSim.Servers/OpenSim.Servers.dll.build
rename to Common/OpenSim.Servers/OpenSim.Servers.dll.build
diff --git a/Common-Source/OpenSim.Servers/UDPServerBase.cs b/Common/OpenSim.Servers/UDPServerBase.cs
similarity index 100%
rename from Common-Source/OpenSim.Servers/UDPServerBase.cs
rename to Common/OpenSim.Servers/UDPServerBase.cs
diff --git a/Common-Source/OpenSim.Servers/XmlRpcMethod.cs b/Common/OpenSim.Servers/XmlRpcMethod.cs
similarity index 100%
rename from Common-Source/OpenSim.Servers/XmlRpcMethod.cs
rename to Common/OpenSim.Servers/XmlRpcMethod.cs
diff --git a/Common-Source/XmlRpcCS/Logger.cs b/Common/XmlRpcCS/Logger.cs
similarity index 100%
rename from Common-Source/XmlRpcCS/Logger.cs
rename to Common/XmlRpcCS/Logger.cs
diff --git a/Common-Source/XmlRpcCS/SimpleHttpRequest.cs b/Common/XmlRpcCS/SimpleHttpRequest.cs
similarity index 100%
rename from Common-Source/XmlRpcCS/SimpleHttpRequest.cs
rename to Common/XmlRpcCS/SimpleHttpRequest.cs
diff --git a/Common-Source/XmlRpcCS/XMLRPC.csproj b/Common/XmlRpcCS/XMLRPC.csproj
similarity index 100%
rename from Common-Source/XmlRpcCS/XMLRPC.csproj
rename to Common/XmlRpcCS/XMLRPC.csproj
diff --git a/Common-Source/XmlRpcCS/XMLRPC.csproj.user b/Common/XmlRpcCS/XMLRPC.csproj.user
similarity index 100%
rename from Common-Source/XmlRpcCS/XMLRPC.csproj.user
rename to Common/XmlRpcCS/XMLRPC.csproj.user
diff --git a/Common-Source/XmlRpcCS/XMLRPC.dll.build b/Common/XmlRpcCS/XMLRPC.dll.build
similarity index 100%
rename from Common-Source/XmlRpcCS/XMLRPC.dll.build
rename to Common/XmlRpcCS/XMLRPC.dll.build
diff --git a/Common-Source/XmlRpcCS/XmlRpcBoxcarRequest.cs b/Common/XmlRpcCS/XmlRpcBoxcarRequest.cs
similarity index 100%
rename from Common-Source/XmlRpcCS/XmlRpcBoxcarRequest.cs
rename to Common/XmlRpcCS/XmlRpcBoxcarRequest.cs
diff --git a/Common-Source/XmlRpcCS/XmlRpcClientProxy.cs b/Common/XmlRpcCS/XmlRpcClientProxy.cs
similarity index 100%
rename from Common-Source/XmlRpcCS/XmlRpcClientProxy.cs
rename to Common/XmlRpcCS/XmlRpcClientProxy.cs
diff --git a/Common-Source/XmlRpcCS/XmlRpcDeserializer.cs b/Common/XmlRpcCS/XmlRpcDeserializer.cs
similarity index 100%
rename from Common-Source/XmlRpcCS/XmlRpcDeserializer.cs
rename to Common/XmlRpcCS/XmlRpcDeserializer.cs
diff --git a/Common-Source/XmlRpcCS/XmlRpcErrorCodes.cs b/Common/XmlRpcCS/XmlRpcErrorCodes.cs
similarity index 100%
rename from Common-Source/XmlRpcCS/XmlRpcErrorCodes.cs
rename to Common/XmlRpcCS/XmlRpcErrorCodes.cs
diff --git a/Common-Source/XmlRpcCS/XmlRpcException.cs b/Common/XmlRpcCS/XmlRpcException.cs
similarity index 100%
rename from Common-Source/XmlRpcCS/XmlRpcException.cs
rename to Common/XmlRpcCS/XmlRpcException.cs
diff --git a/Common-Source/XmlRpcCS/XmlRpcExposedAttribute.cs b/Common/XmlRpcCS/XmlRpcExposedAttribute.cs
similarity index 100%
rename from Common-Source/XmlRpcCS/XmlRpcExposedAttribute.cs
rename to Common/XmlRpcCS/XmlRpcExposedAttribute.cs
diff --git a/Common-Source/XmlRpcCS/XmlRpcRequest.cs b/Common/XmlRpcCS/XmlRpcRequest.cs
similarity index 100%
rename from Common-Source/XmlRpcCS/XmlRpcRequest.cs
rename to Common/XmlRpcCS/XmlRpcRequest.cs
diff --git a/Common-Source/XmlRpcCS/XmlRpcRequestDeserializer.cs b/Common/XmlRpcCS/XmlRpcRequestDeserializer.cs
similarity index 100%
rename from Common-Source/XmlRpcCS/XmlRpcRequestDeserializer.cs
rename to Common/XmlRpcCS/XmlRpcRequestDeserializer.cs
diff --git a/Common-Source/XmlRpcCS/XmlRpcRequestSerializer.cs b/Common/XmlRpcCS/XmlRpcRequestSerializer.cs
similarity index 100%
rename from Common-Source/XmlRpcCS/XmlRpcRequestSerializer.cs
rename to Common/XmlRpcCS/XmlRpcRequestSerializer.cs
diff --git a/Common-Source/XmlRpcCS/XmlRpcResponder.cs b/Common/XmlRpcCS/XmlRpcResponder.cs
similarity index 100%
rename from Common-Source/XmlRpcCS/XmlRpcResponder.cs
rename to Common/XmlRpcCS/XmlRpcResponder.cs
diff --git a/Common-Source/XmlRpcCS/XmlRpcResponse.cs b/Common/XmlRpcCS/XmlRpcResponse.cs
similarity index 100%
rename from Common-Source/XmlRpcCS/XmlRpcResponse.cs
rename to Common/XmlRpcCS/XmlRpcResponse.cs
diff --git a/Common-Source/XmlRpcCS/XmlRpcResponseDeserializer.cs b/Common/XmlRpcCS/XmlRpcResponseDeserializer.cs
similarity index 100%
rename from Common-Source/XmlRpcCS/XmlRpcResponseDeserializer.cs
rename to Common/XmlRpcCS/XmlRpcResponseDeserializer.cs
diff --git a/Common-Source/XmlRpcCS/XmlRpcResponseSerializer.cs b/Common/XmlRpcCS/XmlRpcResponseSerializer.cs
similarity index 100%
rename from Common-Source/XmlRpcCS/XmlRpcResponseSerializer.cs
rename to Common/XmlRpcCS/XmlRpcResponseSerializer.cs
diff --git a/Common-Source/XmlRpcCS/XmlRpcSerializer.cs b/Common/XmlRpcCS/XmlRpcSerializer.cs
similarity index 100%
rename from Common-Source/XmlRpcCS/XmlRpcSerializer.cs
rename to Common/XmlRpcCS/XmlRpcSerializer.cs
diff --git a/Common-Source/XmlRpcCS/XmlRpcServer.cs b/Common/XmlRpcCS/XmlRpcServer.cs
similarity index 100%
rename from Common-Source/XmlRpcCS/XmlRpcServer.cs
rename to Common/XmlRpcCS/XmlRpcServer.cs
diff --git a/Common-Source/XmlRpcCS/XmlRpcSystemObject.cs b/Common/XmlRpcCS/XmlRpcSystemObject.cs
similarity index 100%
rename from Common-Source/XmlRpcCS/XmlRpcSystemObject.cs
rename to Common/XmlRpcCS/XmlRpcSystemObject.cs
diff --git a/Common-Source/XmlRpcCS/XmlRpcXmlTokens.cs b/Common/XmlRpcCS/XmlRpcXmlTokens.cs
similarity index 100%
rename from Common-Source/XmlRpcCS/XmlRpcXmlTokens.cs
rename to Common/XmlRpcCS/XmlRpcXmlTokens.cs
diff --git a/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/AssemblyInfo.cs b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/AssemblyInfo.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/AssemblyInfo.cs
rename to OpenGridServices/OpenGrid.Config/GridConfigDb4o/AssemblyInfo.cs
diff --git a/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
rename to OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
diff --git a/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj
rename to OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user
rename to OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user
diff --git a/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
rename to OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs b/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
rename to OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/DB4oManager.cs b/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
rename to OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs b/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
rename to OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
rename to OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user
rename to OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
rename to OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs b/OpenGridServices/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs
rename to OpenGridServices/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs
rename to OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs
rename to OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
rename to OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user
rename to OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build
rename to OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs
rename to OpenGridServices/OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
rename to OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/MySQLManager.cs b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
rename to OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs
rename to OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
rename to OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user
rename to OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
rename to OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/Properties/AssemblyInfo.cs b/OpenGridServices/OpenGrid.Framework.Data.MySQL/Properties/AssemblyInfo.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/Properties/AssemblyInfo.cs
rename to OpenGridServices/OpenGrid.Framework.Data.MySQL/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
rename to OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user
rename to OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
rename to OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/Properties/AssemblyInfo.cs b/OpenGridServices/OpenGrid.Framework.Data.SQLite/Properties/AssemblyInfo.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/Properties/AssemblyInfo.cs
rename to OpenGridServices/OpenGrid.Framework.Data.SQLite/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs b/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs
rename to OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs b/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs
rename to OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data/GridData.cs b/OpenGridServices/OpenGrid.Framework.Data/GridData.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data/GridData.cs
rename to OpenGridServices/OpenGrid.Framework.Data/GridData.cs
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
rename to OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user
rename to OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
rename to OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs b/OpenGridServices/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs
rename to OpenGridServices/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data/SimProfileData.cs b/OpenGridServices/OpenGrid.Framework.Data/SimProfileData.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data/SimProfileData.cs
rename to OpenGridServices/OpenGrid.Framework.Data/SimProfileData.cs
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data/UserData.cs b/OpenGridServices/OpenGrid.Framework.Data/UserData.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data/UserData.cs
rename to OpenGridServices/OpenGrid.Framework.Data/UserData.cs
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data/UserProfileData.cs b/OpenGridServices/OpenGrid.Framework.Data/UserProfileData.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Data/UserProfileData.cs
rename to OpenGridServices/OpenGrid.Framework.Data/UserProfileData.cs
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Manager/GridManagementAgent.cs b/OpenGridServices/OpenGrid.Framework.Manager/GridManagementAgent.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Manager/GridManagementAgent.cs
rename to OpenGridServices/OpenGrid.Framework.Manager/GridManagementAgent.cs
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Manager/GridServerManager.cs b/OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Manager/GridServerManager.cs
rename to OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
rename to OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user
rename to OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build
similarity index 100%
rename from OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build
rename to OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build
diff --git a/OpenGridServices-Source/OpenGridServices.AssetServer/AssetHttpServer.cs b/OpenGridServices/OpenGridServices.AssetServer/AssetHttpServer.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.AssetServer/AssetHttpServer.cs
rename to OpenGridServices/OpenGridServices.AssetServer/AssetHttpServer.cs
diff --git a/OpenGridServices-Source/OpenGridServices.AssetServer/Main.cs b/OpenGridServices/OpenGridServices.AssetServer/Main.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.AssetServer/Main.cs
rename to OpenGridServices/OpenGridServices.AssetServer/Main.cs
diff --git a/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
rename to OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
diff --git a/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user
rename to OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user
diff --git a/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
rename to OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
diff --git a/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.GridServer.csproj b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.GridServer.csproj
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.GridServer.csproj
rename to OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.GridServer.csproj
diff --git a/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.GridServer.exe.build b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.GridServer.exe.build
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.GridServer.exe.build
rename to OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.GridServer.exe.build
diff --git a/OpenGridServices-Source/OpenGridServices.AssetServer/Properties/AssemblyInfo.cs b/OpenGridServices/OpenGridServices.AssetServer/Properties/AssemblyInfo.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.AssetServer/Properties/AssemblyInfo.cs
rename to OpenGridServices/OpenGridServices.AssetServer/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices-Source/OpenGridServices.GridServer/GridManager.cs b/OpenGridServices/OpenGridServices.GridServer/GridManager.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.GridServer/GridManager.cs
rename to OpenGridServices/OpenGridServices.GridServer/GridManager.cs
diff --git a/OpenGridServices-Source/OpenGridServices.GridServer/Main.cs b/OpenGridServices/OpenGridServices.GridServer/Main.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.GridServer/Main.cs
rename to OpenGridServices/OpenGridServices.GridServer/Main.cs
diff --git a/OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
rename to OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
diff --git a/OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user
rename to OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user
diff --git a/OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
rename to OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
diff --git a/OpenGridServices-Source/OpenGridServices.GridServer/Properties/AssemblyInfo.cs b/OpenGridServices/OpenGridServices.GridServer/Properties/AssemblyInfo.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.GridServer/Properties/AssemblyInfo.cs
rename to OpenGridServices/OpenGridServices.GridServer/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager.mds b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager.mds
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager.mds
rename to OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager.mds
diff --git a/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager.userprefs b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager.userprefs
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager.userprefs
rename to OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager.userprefs
diff --git a/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager.usertasks b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager.usertasks
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager.usertasks
rename to OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager.usertasks
diff --git a/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/AssemblyInfo.cs b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/AssemblyInfo.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/AssemblyInfo.cs
rename to OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/AssemblyInfo.cs
diff --git a/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/BlockingQueue.cs b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/BlockingQueue.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/BlockingQueue.cs
rename to OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/BlockingQueue.cs
diff --git a/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/Connect to grid server.cs b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/Connect to grid server.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/Connect to grid server.cs
rename to OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/Connect to grid server.cs
diff --git a/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
rename to OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
diff --git a/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
rename to OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
diff --git a/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs
rename to OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs
diff --git a/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs
rename to OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs
diff --git a/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
rename to OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
diff --git a/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb
rename to OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb
diff --git a/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs
rename to OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs
diff --git a/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/Util.cs b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/Util.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/Util.cs
rename to OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/Util.cs
diff --git a/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
rename to OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
diff --git a/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
rename to OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
diff --git a/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/generated.cs b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/generated.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/generated.cs
rename to OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/generated.cs
diff --git a/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic b/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
rename to OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
diff --git a/OpenGridServices-Source/OpenGridServices.UserServer/Main.cs b/OpenGridServices/OpenGridServices.UserServer/Main.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.UserServer/Main.cs
rename to OpenGridServices/OpenGridServices.UserServer/Main.cs
diff --git a/OpenGridServices-Source/OpenGridServices.UserServer/OGS-UserServer.csproj b/OpenGridServices/OpenGridServices.UserServer/OGS-UserServer.csproj
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.UserServer/OGS-UserServer.csproj
rename to OpenGridServices/OpenGridServices.UserServer/OGS-UserServer.csproj
diff --git a/OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
rename to OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
diff --git a/OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user
rename to OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user
diff --git a/OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
rename to OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
diff --git a/OpenGridServices-Source/OpenGridServices.UserServer/Properties/AssemblyInfo.cs b/OpenGridServices/OpenGridServices.UserServer/Properties/AssemblyInfo.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.UserServer/Properties/AssemblyInfo.cs
rename to OpenGridServices/OpenGridServices.UserServer/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices-Source/OpenGridServices.UserServer/UserManager.cs b/OpenGridServices/OpenGridServices.UserServer/UserManager.cs
similarity index 100%
rename from OpenGridServices-Source/OpenGridServices.UserServer/UserManager.cs
rename to OpenGridServices/OpenGridServices.UserServer/UserManager.cs
diff --git a/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/AssemblyInfo.cs b/OpenGridServices/OpenUser.Config/UserConfigDb4o/AssemblyInfo.cs
similarity index 100%
rename from OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/AssemblyInfo.cs
rename to OpenGridServices/OpenUser.Config/UserConfigDb4o/AssemblyInfo.cs
diff --git a/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs b/OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
similarity index 100%
rename from OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
rename to OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
diff --git a/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj
similarity index 100%
rename from OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj
rename to OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj
diff --git a/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user
similarity index 100%
rename from OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user
rename to OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user
diff --git a/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
similarity index 100%
rename from OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
rename to OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
diff --git a/OpenGridServices-Source/SQL/mysql-agents.sql b/OpenGridServices/SQL/mysql-agents.sql
similarity index 100%
rename from OpenGridServices-Source/SQL/mysql-agents.sql
rename to OpenGridServices/SQL/mysql-agents.sql
diff --git a/OpenGridServices-Source/SQL/mysql-regions.sql b/OpenGridServices/SQL/mysql-regions.sql
similarity index 100%
rename from OpenGridServices-Source/SQL/mysql-regions.sql
rename to OpenGridServices/SQL/mysql-regions.sql
diff --git a/OpenGridServices-Source/SQL/mysql-users.sql b/OpenGridServices/SQL/mysql-users.sql
similarity index 100%
rename from OpenGridServices-Source/SQL/mysql-users.sql
rename to OpenGridServices/SQL/mysql-users.sql
diff --git a/OpenGridServices-Source/ServiceManager/ServiceManager.cs b/OpenGridServices/ServiceManager/ServiceManager.cs
similarity index 100%
rename from OpenGridServices-Source/ServiceManager/ServiceManager.cs
rename to OpenGridServices/ServiceManager/ServiceManager.cs
diff --git a/OpenGridServices-Source/ServiceManager/ServiceManager.csproj b/OpenGridServices/ServiceManager/ServiceManager.csproj
similarity index 100%
rename from OpenGridServices-Source/ServiceManager/ServiceManager.csproj
rename to OpenGridServices/ServiceManager/ServiceManager.csproj
diff --git a/OpenGridServices-Source/ServiceManager/ServiceManager.csproj.user b/OpenGridServices/ServiceManager/ServiceManager.csproj.user
similarity index 100%
rename from OpenGridServices-Source/ServiceManager/ServiceManager.csproj.user
rename to OpenGridServices/ServiceManager/ServiceManager.csproj.user
diff --git a/OpenGridServices-Source/ServiceManager/ServiceManager.exe.build b/OpenGridServices/ServiceManager/ServiceManager.exe.build
similarity index 100%
rename from OpenGridServices-Source/ServiceManager/ServiceManager.exe.build
rename to OpenGridServices/ServiceManager/ServiceManager.exe.build
diff --git a/OpenSim-Source/OpenSim.GridInterfaces/Local/AssemblyInfo.cs b/OpenSim/OpenSim.GridInterfaces/Local/AssemblyInfo.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.GridInterfaces/Local/AssemblyInfo.cs
rename to OpenSim/OpenSim.GridInterfaces/Local/AssemblyInfo.cs
diff --git a/OpenSim-Source/OpenSim.GridInterfaces/Local/LocalAssetServer.cs b/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
rename to OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
diff --git a/OpenSim-Source/OpenSim.GridInterfaces/Local/LocalGridServer.cs b/OpenSim/OpenSim.GridInterfaces/Local/LocalGridServer.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.GridInterfaces/Local/LocalGridServer.cs
rename to OpenSim/OpenSim.GridInterfaces/Local/LocalGridServer.cs
diff --git a/OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj b/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
similarity index 100%
rename from OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
rename to OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
diff --git a/OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user b/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user
similarity index 100%
rename from OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user
rename to OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user
diff --git a/OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build b/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
similarity index 100%
rename from OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
rename to OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
diff --git a/OpenSim-Source/OpenSim.GridInterfaces/Remote/AssemblyInfo.cs b/OpenSim/OpenSim.GridInterfaces/Remote/AssemblyInfo.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.GridInterfaces/Remote/AssemblyInfo.cs
rename to OpenSim/OpenSim.GridInterfaces/Remote/AssemblyInfo.cs
diff --git a/OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj b/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
similarity index 100%
rename from OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
rename to OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
diff --git a/OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user b/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user
similarity index 100%
rename from OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user
rename to OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user
diff --git a/OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
similarity index 100%
rename from OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
rename to OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
diff --git a/OpenSim-Source/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs b/OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
rename to OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
diff --git a/OpenSim-Source/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs b/OpenSim/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
rename to OpenSim/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
diff --git a/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/AssemblyInfo.cs b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/AssemblyInfo.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/AssemblyInfo.cs
rename to OpenSim/OpenSim.Physics/BasicPhysicsPlugin/AssemblyInfo.cs
diff --git a/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
rename to OpenSim/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
diff --git a/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
similarity index 100%
rename from OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
rename to OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
diff --git a/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user
similarity index 100%
rename from OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user
rename to OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user
diff --git a/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
similarity index 100%
rename from OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
rename to OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
diff --git a/OpenSim-Source/OpenSim.Physics/Manager/AssemblyInfo.cs b/OpenSim/OpenSim.Physics/Manager/AssemblyInfo.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Physics/Manager/AssemblyInfo.cs
rename to OpenSim/OpenSim.Physics/Manager/AssemblyInfo.cs
diff --git a/OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj b/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
similarity index 100%
rename from OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
rename to OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
diff --git a/OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user b/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user
similarity index 100%
rename from OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user
rename to OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user
diff --git a/OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
similarity index 100%
rename from OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
rename to OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
diff --git a/OpenSim-Source/OpenSim.Physics/Manager/PhysicsActor.cs b/OpenSim/OpenSim.Physics/Manager/PhysicsActor.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Physics/Manager/PhysicsActor.cs
rename to OpenSim/OpenSim.Physics/Manager/PhysicsActor.cs
diff --git a/OpenSim-Source/OpenSim.Physics/Manager/PhysicsManager.cs b/OpenSim/OpenSim.Physics/Manager/PhysicsManager.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Physics/Manager/PhysicsManager.cs
rename to OpenSim/OpenSim.Physics/Manager/PhysicsManager.cs
diff --git a/OpenSim-Source/OpenSim.Physics/Manager/PhysicsScene.cs b/OpenSim/OpenSim.Physics/Manager/PhysicsScene.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Physics/Manager/PhysicsScene.cs
rename to OpenSim/OpenSim.Physics/Manager/PhysicsScene.cs
diff --git a/OpenSim-Source/OpenSim.Physics/Manager/PhysicsVector.cs b/OpenSim/OpenSim.Physics/Manager/PhysicsVector.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Physics/Manager/PhysicsVector.cs
rename to OpenSim/OpenSim.Physics/Manager/PhysicsVector.cs
diff --git a/OpenSim-Source/OpenSim.Physics/OdePlugin/AssemblyInfo.cs b/OpenSim/OpenSim.Physics/OdePlugin/AssemblyInfo.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Physics/OdePlugin/AssemblyInfo.cs
rename to OpenSim/OpenSim.Physics/OdePlugin/AssemblyInfo.cs
diff --git a/OpenSim-Source/OpenSim.Physics/OdePlugin/OdePlugin.cs b/OpenSim/OpenSim.Physics/OdePlugin/OdePlugin.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Physics/OdePlugin/OdePlugin.cs
rename to OpenSim/OpenSim.Physics/OdePlugin/OdePlugin.cs
diff --git a/OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj b/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
similarity index 100%
rename from OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
rename to OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
diff --git a/OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user b/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user
similarity index 100%
rename from OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user
rename to OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user
diff --git a/OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build b/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
similarity index 100%
rename from OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
rename to OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
diff --git a/OpenSim-Source/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs b/OpenSim/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs
rename to OpenSim/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs
diff --git a/OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
similarity index 100%
rename from OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
rename to OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
diff --git a/OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user
similarity index 100%
rename from OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user
rename to OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user
diff --git a/OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
similarity index 100%
rename from OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
rename to OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
diff --git a/OpenSim-Source/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs
rename to OpenSim/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/AgentAssetUpload.cs b/OpenSim/OpenSim.RegionServer/AgentAssetUpload.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/AgentAssetUpload.cs
rename to OpenSim/OpenSim.RegionServer/AgentAssetUpload.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/Assets/AssetCache.cs b/OpenSim/OpenSim.RegionServer/Assets/AssetCache.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/Assets/AssetCache.cs
rename to OpenSim/OpenSim.RegionServer/Assets/AssetCache.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/Assets/InventoryCache.cs b/OpenSim/OpenSim.RegionServer/Assets/InventoryCache.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/Assets/InventoryCache.cs
rename to OpenSim/OpenSim.RegionServer/Assets/InventoryCache.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsBase.cs b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsBase.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsBase.cs
rename to OpenSim/OpenSim.RegionServer/AuthenticateSessionsBase.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsLocal.cs b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
rename to OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsRemote.cs b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
rename to OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/CAPS/AdminWebFront.cs b/OpenSim/OpenSim.RegionServer/CAPS/AdminWebFront.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/CAPS/AdminWebFront.cs
rename to OpenSim/OpenSim.RegionServer/CAPS/AdminWebFront.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/ClientView.Grid.cs b/OpenSim/OpenSim.RegionServer/ClientView.Grid.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/ClientView.Grid.cs
rename to OpenSim/OpenSim.RegionServer/ClientView.Grid.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/ClientView.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/ClientView.PacketHandlers.cs
rename to OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/ClientView.ProcessPackets.cs b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/ClientView.ProcessPackets.cs
rename to OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/ClientView.cs
rename to OpenSim/OpenSim.RegionServer/ClientView.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/ClientViewBase.cs b/OpenSim/OpenSim.RegionServer/ClientViewBase.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/ClientViewBase.cs
rename to OpenSim/OpenSim.RegionServer/ClientViewBase.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/Grid.cs b/OpenSim/OpenSim.RegionServer/Grid.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/Grid.cs
rename to OpenSim/OpenSim.RegionServer/Grid.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.csproj
rename to OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
diff --git a/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user
rename to OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user
diff --git a/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
rename to OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
diff --git a/OpenSim-Source/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim/OpenSim.RegionServer/OpenSimMain.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/OpenSimMain.cs
rename to OpenSim/OpenSim.RegionServer/OpenSimMain.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/OpenSimNetworkHandler.cs b/OpenSim/OpenSim.RegionServer/OpenSimNetworkHandler.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/OpenSimNetworkHandler.cs
rename to OpenSim/OpenSim.RegionServer/OpenSimNetworkHandler.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/PacketServer.cs b/OpenSim/OpenSim.RegionServer/PacketServer.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/PacketServer.cs
rename to OpenSim/OpenSim.RegionServer/PacketServer.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/RegionInfo.cs b/OpenSim/OpenSim.RegionServer/RegionInfo.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/RegionInfo.cs
rename to OpenSim/OpenSim.RegionServer/RegionInfo.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/RegionInfoBase.cs b/OpenSim/OpenSim.RegionServer/RegionInfoBase.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/RegionInfoBase.cs
rename to OpenSim/OpenSim.RegionServer/RegionInfoBase.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/RegionServerBase.cs b/OpenSim/OpenSim.RegionServer/RegionServerBase.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/RegionServerBase.cs
rename to OpenSim/OpenSim.RegionServer/RegionServerBase.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/UDPServer.cs b/OpenSim/OpenSim.RegionServer/UDPServer.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/UDPServer.cs
rename to OpenSim/OpenSim.RegionServer/UDPServer.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/VersionInfo.cs b/OpenSim/OpenSim.RegionServer/VersionInfo.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/VersionInfo.cs
rename to OpenSim/OpenSim.RegionServer/VersionInfo.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/types/Mesh.cs b/OpenSim/OpenSim.RegionServer/types/Mesh.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/types/Mesh.cs
rename to OpenSim/OpenSim.RegionServer/types/Mesh.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/types/Triangle.cs b/OpenSim/OpenSim.RegionServer/types/Triangle.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/types/Triangle.cs
rename to OpenSim/OpenSim.RegionServer/types/Triangle.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/world/Avatar.Client.cs b/OpenSim/OpenSim.RegionServer/world/Avatar.Client.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/world/Avatar.Client.cs
rename to OpenSim/OpenSim.RegionServer/world/Avatar.Client.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/world/Avatar.Update.cs b/OpenSim/OpenSim.RegionServer/world/Avatar.Update.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/world/Avatar.Update.cs
rename to OpenSim/OpenSim.RegionServer/world/Avatar.Update.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/world/Avatar.cs b/OpenSim/OpenSim.RegionServer/world/Avatar.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/world/Avatar.cs
rename to OpenSim/OpenSim.RegionServer/world/Avatar.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/world/AvatarAnimations.cs b/OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/world/AvatarAnimations.cs
rename to OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/world/Entity.cs b/OpenSim/OpenSim.RegionServer/world/Entity.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/world/Entity.cs
rename to OpenSim/OpenSim.RegionServer/world/Entity.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/world/Primitive.cs b/OpenSim/OpenSim.RegionServer/world/Primitive.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/world/Primitive.cs
rename to OpenSim/OpenSim.RegionServer/world/Primitive.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/world/Primitive2.cs b/OpenSim/OpenSim.RegionServer/world/Primitive2.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/world/Primitive2.cs
rename to OpenSim/OpenSim.RegionServer/world/Primitive2.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/world/SceneObject.cs b/OpenSim/OpenSim.RegionServer/world/SceneObject.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/world/SceneObject.cs
rename to OpenSim/OpenSim.RegionServer/world/SceneObject.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/world/World.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/world/World.PacketHandlers.cs
rename to OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/world/World.Scripting.cs b/OpenSim/OpenSim.RegionServer/world/World.Scripting.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/world/World.Scripting.cs
rename to OpenSim/OpenSim.RegionServer/world/World.Scripting.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/world/World.cs b/OpenSim/OpenSim.RegionServer/world/World.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/world/World.cs
rename to OpenSim/OpenSim.RegionServer/world/World.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/world/WorldBase.cs b/OpenSim/OpenSim.RegionServer/world/WorldBase.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/world/WorldBase.cs
rename to OpenSim/OpenSim.RegionServer/world/WorldBase.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptContext.cs b/OpenSim/OpenSim.RegionServer/world/scripting/IScriptContext.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptContext.cs
rename to OpenSim/OpenSim.RegionServer/world/scripting/IScriptContext.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptEntity.cs b/OpenSim/OpenSim.RegionServer/world/scripting/IScriptEntity.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptEntity.cs
rename to OpenSim/OpenSim.RegionServer/world/scripting/IScriptEntity.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptHandler.cs b/OpenSim/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
rename to OpenSim/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/world/scripting/Script.cs b/OpenSim/OpenSim.RegionServer/world/scripting/Script.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/world/scripting/Script.cs
rename to OpenSim/OpenSim.RegionServer/world/scripting/Script.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/world/scripting/ScriptFactory.cs b/OpenSim/OpenSim.RegionServer/world/scripting/ScriptFactory.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/world/scripting/ScriptFactory.cs
rename to OpenSim/OpenSim.RegionServer/world/scripting/ScriptFactory.cs
diff --git a/OpenSim-Source/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs
rename to OpenSim/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/ClassInstance.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/ClassInstance.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/ClassInstance.cs
rename to OpenSim/OpenSim.Scripting/EmbeddedJVM/ClassInstance.cs
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/ClassRecord.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/ClassRecord.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/ClassRecord.cs
rename to OpenSim/OpenSim.Scripting/EmbeddedJVM/ClassRecord.cs
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Heap.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/Heap.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Heap.cs
rename to OpenSim/OpenSim.Scripting/EmbeddedJVM/Heap.cs
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs
rename to OpenSim/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/InterpreterLogic.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterLogic.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/InterpreterLogic.cs
rename to OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterLogic.cs
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
rename to OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/InterpreterReturn.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterReturn.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/InterpreterReturn.cs
rename to OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterReturn.cs
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/MainMemory.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/MainMemory.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/MainMemory.cs
rename to OpenSim/OpenSim.Scripting/EmbeddedJVM/MainMemory.cs
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/MethodMemory.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/MethodMemory.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/MethodMemory.cs
rename to OpenSim/OpenSim.Scripting/EmbeddedJVM/MethodMemory.cs
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Object.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/Object.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Object.cs
rename to OpenSim/OpenSim.Scripting/EmbeddedJVM/Object.cs
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
similarity index 100%
rename from OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
rename to OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user
similarity index 100%
rename from OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user
rename to OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
similarity index 100%
rename from OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
rename to OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSimJVM.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSimJVM.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSimJVM.cs
rename to OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSimJVM.cs
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Properties/AssemblyInfo.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/Properties/AssemblyInfo.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Properties/AssemblyInfo.cs
rename to OpenSim/OpenSim.Scripting/EmbeddedJVM/Properties/AssemblyInfo.cs
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Stack.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/Stack.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Stack.cs
rename to OpenSim/OpenSim.Scripting/EmbeddedJVM/Stack.cs
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/StackFrame.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/StackFrame.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/StackFrame.cs
rename to OpenSim/OpenSim.Scripting/EmbeddedJVM/StackFrame.cs
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Thread.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/Thread.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Thread.cs
rename to OpenSim/OpenSim.Scripting/EmbeddedJVM/Thread.cs
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/ArrayReference.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/ArrayReference.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/ArrayReference.cs
rename to OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/ArrayReference.cs
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/BaseType.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/BaseType.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/BaseType.cs
rename to OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/BaseType.cs
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/ObjectReference.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/ObjectReference.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/ObjectReference.cs
rename to OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/ObjectReference.cs
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Byte.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Byte.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Byte.cs
rename to OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Byte.cs
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Char.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Char.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Char.cs
rename to OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Char.cs
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Float.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Float.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Float.cs
rename to OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Float.cs
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Int.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Int.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Int.cs
rename to OpenSim/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Int.cs
diff --git a/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
rename to OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
diff --git a/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj
similarity index 100%
rename from OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj
rename to OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj
diff --git a/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user
similarity index 100%
rename from OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user
rename to OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user
diff --git a/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
similarity index 100%
rename from OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
rename to OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
diff --git a/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs b/OpenSim/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs
rename to OpenSim/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs
diff --git a/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs b/OpenSim/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
rename to OpenSim/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
diff --git a/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs b/OpenSim/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs
rename to OpenSim/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs
diff --git a/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
similarity index 100%
rename from OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
rename to OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
diff --git a/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user
similarity index 100%
rename from OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user
rename to OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user
diff --git a/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
similarity index 100%
rename from OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
rename to OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
diff --git a/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs b/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs
rename to OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs
diff --git a/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj b/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj
similarity index 100%
rename from OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj
rename to OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj
diff --git a/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user b/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user
similarity index 100%
rename from OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user
rename to OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user
diff --git a/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build b/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
similarity index 100%
rename from OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
rename to OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
diff --git a/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs b/OpenSim/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
rename to OpenSim/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
diff --git a/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs b/OpenSim/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
rename to OpenSim/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
diff --git a/OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
similarity index 100%
rename from OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
rename to OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
diff --git a/OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user
similarity index 100%
rename from OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user
rename to OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user
diff --git a/OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
similarity index 100%
rename from OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
rename to OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
diff --git a/OpenSim-Source/OpenSim.Terrain.BasicTerrain/Properties/AssemblyInfo.cs b/OpenSim/OpenSim.Terrain.BasicTerrain/Properties/AssemblyInfo.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Terrain.BasicTerrain/Properties/AssemblyInfo.cs
rename to OpenSim/OpenSim.Terrain.BasicTerrain/Properties/AssemblyInfo.cs
diff --git a/OpenSim-Source/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
similarity index 100%
rename from OpenSim-Source/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
rename to OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
diff --git a/OpenSim-Source/OpenSim/Application.cs b/OpenSim/OpenSim/Application.cs
similarity index 100%
rename from OpenSim-Source/OpenSim/Application.cs
rename to OpenSim/OpenSim/Application.cs
diff --git a/OpenSim-Source/OpenSim/OpenSim.csproj b/OpenSim/OpenSim/OpenSim.csproj
similarity index 100%
rename from OpenSim-Source/OpenSim/OpenSim.csproj
rename to OpenSim/OpenSim/OpenSim.csproj
diff --git a/OpenSim-Source/OpenSim/OpenSim.csproj.user b/OpenSim/OpenSim/OpenSim.csproj.user
similarity index 100%
rename from OpenSim-Source/OpenSim/OpenSim.csproj.user
rename to OpenSim/OpenSim/OpenSim.csproj.user
diff --git a/OpenSim-Source/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim/OpenSim.exe.build
similarity index 100%
rename from OpenSim-Source/OpenSim/OpenSim.exe.build
rename to OpenSim/OpenSim/OpenSim.exe.build
diff --git a/OpenSim-Source/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
similarity index 100%
rename from OpenSim-Source/OpenSim/OpenSimMain.cs
rename to OpenSim/OpenSim/OpenSimMain.cs
diff --git a/prebuild.xml b/prebuild.xml
index e049bd7ff7..8906d717f6 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -36,16 +36,16 @@
      <Project name="XMLRPC" path="XmlRpcCS" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../bin/</OutputPath>
+          <OutputPath>../../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../bin/</OutputPath>
+          <OutputPath>../../bin/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../bin/</ReferencePath>
+      <ReferencePath>../../bin/</ReferencePath>
       <Reference name="System"/>
       <Reference name="System.Xml"/>
 
@@ -59,16 +59,16 @@
     <Project name="OpenSim.Framework" path="OpenSim.Framework" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../bin/</OutputPath>
+          <OutputPath>../../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../bin/</OutputPath>
+          <OutputPath>../../bin/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../bin/</ReferencePath>
+      <ReferencePath>../../bin/</ReferencePath>
       <Reference name="System"/>
       <Reference name="System.Xml"/>
       <Reference name="libsecondlife.dll"/>
@@ -82,16 +82,16 @@
     <Project name="OpenSim.Framework.Console" path="OpenSim.Framework.Console" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../bin/</OutputPath>
+          <OutputPath>../../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../bin/</OutputPath>
+          <OutputPath>../../bin/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../bin/</ReferencePath>
+      <ReferencePath>../../bin/</ReferencePath>
       <Reference name="System" localCopy="false"/>
       <Files>
         <Match pattern="*.cs" recurse="true"/>
@@ -101,7 +101,7 @@
     <Project name="OpenSim.Servers" path="OpenSim.Servers" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../bin/</OutputPath>
+          <OutputPath>../../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
@@ -110,7 +110,7 @@
         </Options>
       </Configuration>
 
-      <ReferencePath>../bin/</ReferencePath>
+      <ReferencePath>../../bin/</ReferencePath>
       <Reference name="System"/>
       <Reference name="System.Xml"/>
      <Reference name="OpenSim.Framework"/>
@@ -127,7 +127,7 @@
     <Project name="OpenSim.Storage.LocalStorageDb4o" path="OpenSim.Storage/LocalStorageDb4o" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../../bin/</OutputPath>
+          <OutputPath>../../../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
@@ -136,7 +136,7 @@
         </Options>
       </Configuration>
 
-      <ReferencePath>../../bin/</ReferencePath>
+      <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System" localCopy="false"/>
       <Reference name="System.Xml"/>
       <Reference name="Db4objects.Db4o.dll"/>
@@ -151,16 +151,16 @@
     <Project name="OpenSim.Storage.LocalStorageSQLite" path="OpenSim.Storage/LocalStorageSQLite" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../../bin/</OutputPath>
+          <OutputPath>../../../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../../bin/</OutputPath>
+          <OutputPath>../../../bin/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../../bin/</ReferencePath>
+      <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System" localCopy="false"/>
       <Reference name="System.Xml"/>
       <Reference name="System.Data"/>
@@ -176,16 +176,16 @@
     <Project name="OpenSim.Storage.LocalStorageBerkeleyDB" path="OpenSim.Storage/LocalStorageBerkeleyDB" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../../bin/</OutputPath>
+          <OutputPath>../../../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../../bin/</OutputPath>
+          <OutputPath>../../../bin/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../../bin/</ReferencePath>
+      <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System" localCopy="false"/>
       <Reference name="System.Xml"/>
       <Reference name="System.Data"/>
@@ -203,16 +203,16 @@
     <Project name="OpenSim.GridInterfaces.Local" path="OpenSim.GridInterfaces/Local" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../../bin/</OutputPath>
+          <OutputPath>../../../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../../bin/</OutputPath>
+          <OutputPath>../../../bin/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../../bin/</ReferencePath>
+      <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System" localCopy="false"/>
       <Reference name="System.Xml"/>
       <Reference name="Db4objects.Db4o.dll"/>
@@ -227,16 +227,16 @@
     <Project name="OpenSim.GridInterfaces.Remote" path="OpenSim.GridInterfaces/Remote" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../../bin/</OutputPath>
+          <OutputPath>../../../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../../bin/</OutputPath>
+          <OutputPath>../../../bin/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../../bin/</ReferencePath>
+      <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System" localCopy="false"/>
       <Reference name="System.Xml"/>
       <Reference name="libsecondlife.dll"/>
@@ -252,16 +252,16 @@
     <Project name="OpenSim.Physics.Manager" path="OpenSim.Physics/Manager" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../../bin/</OutputPath>
+          <OutputPath>../../../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../../bin/</OutputPath>
+          <OutputPath>../../../bin/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../../bin/</ReferencePath>
+      <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System" localCopy="false"/>
       <Reference name="System.Xml" localCopy="false" />
       <Reference name="Axiom.MathLib.dll" localCopy="false"/>
@@ -277,16 +277,16 @@
     <Project name="OpenSim.Physics.BasicPhysicsPlugin" path="OpenSim.Physics/BasicPhysicsPlugin" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../../bin/Physics/</OutputPath>
+          <OutputPath>../../../bin/Physics/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../../bin/Physics/</OutputPath>
+          <OutputPath>../../../bin/Physics/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../../bin/</ReferencePath>
+      <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System" localCopy="false"/>
       <Reference name="Axiom.MathLib.dll" localCopy="false"/>
       <Reference name="OpenSim.Physics.Manager" localCopy="false"/>
@@ -298,16 +298,16 @@
     <Project name="OpenSim.Physics.PhysXPlugin" path="OpenSim.Physics/PhysXPlugin" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../../bin/Physics/</OutputPath>
+          <OutputPath>../../../bin/Physics/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../../bin/Physics/</OutputPath>
+          <OutputPath>../../../bin/Physics/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../../bin/</ReferencePath>
+      <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System" localCopy="false"/>
       <Reference name="Axiom.MathLib.dll" localCopy="false"/>
       <Reference name="PhysX_Wrapper_Dotnet.dll" localCopy="false"/>
@@ -320,16 +320,16 @@
     <Project name="OpenSim.Physics.OdePlugin" path="OpenSim.Physics/OdePlugin" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../../bin/Physics/</OutputPath>
+          <OutputPath>../../../bin/Physics/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../../bin/Physics/</OutputPath>
+          <OutputPath>../../../bin/Physics/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../../bin/</ReferencePath>
+      <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System" localCopy="false"/>
       <Reference name="Axiom.MathLib.dll" localCopy="false"/>
       <Reference name="OpenSim.Physics.Manager" localCopy="false"/>
@@ -344,16 +344,16 @@
      <Project name="OpenSim.GenericConfig.Xml" path="OpenSim.GenericConfig/Xml" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../../bin/</OutputPath>
+          <OutputPath>../../../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../../bin/</OutputPath>
+          <OutputPath>../../../bin/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../../bin/</ReferencePath>
+      <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System"/>
       <Reference name="System.Xml"/>
      <Reference name="OpenSim.Framework"/>
@@ -367,16 +367,16 @@
      <Project name="OpenSim.Scripting.EmbeddedJVM" path="OpenSim.Scripting/EmbeddedJVM" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../../bin/ScriptEngines/</OutputPath>
+          <OutputPath>../../../bin/ScriptEngines/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../../bin/ScriptEngines/</OutputPath>
+          <OutputPath>../../../bin/ScriptEngines/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../../bin/</ReferencePath>
+      <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System"/>
       <Reference name="System.Xml"/>
      <Reference name="OpenSim.Framework"/>
@@ -391,16 +391,16 @@
      <Project name="OpenSim.Terrain.BasicTerrain" path="OpenSim.Terrain.BasicTerrain" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../bin/</OutputPath>
+          <OutputPath>../../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../bin/</OutputPath>
+          <OutputPath>../../bin/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../bin/</ReferencePath>
+      <ReferencePath>../../bin/</ReferencePath>
       <Reference name="System"/>
       <Reference name="System.Drawing"/>
       <Reference name="System.Data"/>
@@ -415,16 +415,16 @@
     <Project name="OpenSim.RegionServer" path="OpenSim.RegionServer" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../bin/</OutputPath>
+          <OutputPath>../../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../bin/</OutputPath>
+          <OutputPath>../../bin/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../bin/</ReferencePath>
+      <ReferencePath>../../bin/</ReferencePath>
       <Reference name="System" localCopy="false"/>
       <Reference name="System.Xml"/>
       <Reference name="libsecondlife.dll"/>
@@ -447,16 +447,16 @@
     <Project name="OpenSim" path="OpenSim" type="Exe">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../bin/</OutputPath>
+          <OutputPath>../../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../bin/</OutputPath>
+          <OutputPath>../../bin/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../bin/</ReferencePath>
+      <ReferencePath>../../bin/</ReferencePath>
       <Reference name="System" localCopy="false"/>
       <Reference name="System.Xml"/>
       <Reference name="libsecondlife.dll"/>
@@ -479,7 +479,7 @@
 </Solution>
   
   
-<Solution name="OpenSim" activeConfig="Debug" path="./">
+<Solution name="OpenGridServices" activeConfig="Debug" path="./">
     <Configuration name="Debug">
       <Options>
         <CompilerDefines>TRACE;DEBUG</CompilerDefines>