diff --git a/ConvertToPlugins/bin/Axiom.MathLib.dll b/bin/Axiom.MathLib.dll
similarity index 100%
rename from ConvertToPlugins/bin/Axiom.MathLib.dll
rename to bin/Axiom.MathLib.dll
diff --git a/ConvertToPlugins/bin/Db4objects.Db4o.dll b/bin/Db4objects.Db4o.dll
similarity index 100%
rename from ConvertToPlugins/bin/Db4objects.Db4o.dll
rename to bin/Db4objects.Db4o.dll
diff --git a/ConvertToPlugins/bin/avatar-template.dat b/bin/avatar-template.dat
similarity index 100%
rename from ConvertToPlugins/bin/avatar-template.dat
rename to bin/avatar-template.dat
diff --git a/ConvertToPlugins/bin/libsecondlife.dll b/bin/libsecondlife.dll
similarity index 100%
rename from ConvertToPlugins/bin/libsecondlife.dll
rename to bin/libsecondlife.dll
diff --git a/ConvertToPlugins/bin/log4net.dll b/bin/log4net.dll
similarity index 100%
rename from ConvertToPlugins/bin/log4net.dll
rename to bin/log4net.dll
diff --git a/ConvertToPlugins/bin/new-login.dat b/bin/new-login.dat
similarity index 100%
rename from ConvertToPlugins/bin/new-login.dat
rename to bin/new-login.dat
diff --git a/ConvertToPlugins/genvers.sh b/genvers.sh
similarity index 100%
rename from ConvertToPlugins/genvers.sh
rename to genvers.sh
diff --git a/ConvertToPlugins/opensim.build b/opensim.build
similarity index 100%
rename from ConvertToPlugins/opensim.build
rename to opensim.build
diff --git a/ConvertToPlugins/src/Assets/AssetCache.cs b/src/Assets/AssetCache.cs
similarity index 100%
rename from ConvertToPlugins/src/Assets/AssetCache.cs
rename to src/Assets/AssetCache.cs
diff --git a/ConvertToPlugins/src/Config.cs b/src/Config.cs
similarity index 100%
rename from ConvertToPlugins/src/Config.cs
rename to src/Config.cs
diff --git a/ConvertToPlugins/src/Config/SimConfig/AssemblyInfo.cs b/src/Config/SimConfig/AssemblyInfo.cs
similarity index 100%
rename from ConvertToPlugins/src/Config/SimConfig/AssemblyInfo.cs
rename to src/Config/SimConfig/AssemblyInfo.cs
diff --git a/ConvertToPlugins/src/Config/SimConfig/Db4SimConfig.cs b/src/Config/SimConfig/Db4SimConfig.cs
similarity index 100%
rename from ConvertToPlugins/src/Config/SimConfig/Db4SimConfig.cs
rename to src/Config/SimConfig/Db4SimConfig.cs
diff --git a/ConvertToPlugins/src/Config/SimConfig/SimConfig.csproj b/src/Config/SimConfig/SimConfig.csproj
similarity index 100%
rename from ConvertToPlugins/src/Config/SimConfig/SimConfig.csproj
rename to src/Config/SimConfig/SimConfig.csproj
diff --git a/ConvertToPlugins/src/Config/SimConfig/SimConfig.sln b/src/Config/SimConfig/SimConfig.sln
similarity index 100%
rename from ConvertToPlugins/src/Config/SimConfig/SimConfig.sln
rename to src/Config/SimConfig/SimConfig.sln
diff --git a/ConvertToPlugins/src/Config/default.build b/src/Config/default.build
similarity index 100%
rename from ConvertToPlugins/src/Config/default.build
rename to src/Config/default.build
diff --git a/ConvertToPlugins/src/GridInterfaces/AssemblyInfo.cs b/src/GridInterfaces/AssemblyInfo.cs
similarity index 100%
rename from ConvertToPlugins/src/GridInterfaces/AssemblyInfo.cs
rename to src/GridInterfaces/AssemblyInfo.cs
diff --git a/ConvertToPlugins/src/GridInterfaces/GridInterfaces.csproj b/src/GridInterfaces/GridInterfaces.csproj
similarity index 100%
rename from ConvertToPlugins/src/GridInterfaces/GridInterfaces.csproj
rename to src/GridInterfaces/GridInterfaces.csproj
diff --git a/ConvertToPlugins/src/GridInterfaces/GridInterfaces.sln b/src/GridInterfaces/GridInterfaces.sln
similarity index 100%
rename from ConvertToPlugins/src/GridInterfaces/GridInterfaces.sln
rename to src/GridInterfaces/GridInterfaces.sln
diff --git a/ConvertToPlugins/src/GridInterfaces/IAssetServer.cs b/src/GridInterfaces/IAssetServer.cs
similarity index 100%
rename from ConvertToPlugins/src/GridInterfaces/IAssetServer.cs
rename to src/GridInterfaces/IAssetServer.cs
diff --git a/ConvertToPlugins/src/GridInterfaces/IGridServer.cs b/src/GridInterfaces/IGridServer.cs
similarity index 100%
rename from ConvertToPlugins/src/GridInterfaces/IGridServer.cs
rename to src/GridInterfaces/IGridServer.cs
diff --git a/ConvertToPlugins/src/GridInterfaces/default.build b/src/GridInterfaces/default.build
similarity index 100%
rename from ConvertToPlugins/src/GridInterfaces/default.build
rename to src/GridInterfaces/default.build
diff --git a/ConvertToPlugins/src/GridServers/LoginServer.cs b/src/GridServers/LoginServer.cs
similarity index 100%
rename from ConvertToPlugins/src/GridServers/LoginServer.cs
rename to src/GridServers/LoginServer.cs
diff --git a/ConvertToPlugins/src/HeightMapGenHills.cs b/src/HeightMapGenHills.cs
similarity index 100%
rename from ConvertToPlugins/src/HeightMapGenHills.cs
rename to src/HeightMapGenHills.cs
diff --git a/ConvertToPlugins/src/LocalServers/LocalGridServers/AssemblyInfo.cs b/src/LocalServers/LocalGridServers/AssemblyInfo.cs
similarity index 100%
rename from ConvertToPlugins/src/LocalServers/LocalGridServers/AssemblyInfo.cs
rename to src/LocalServers/LocalGridServers/AssemblyInfo.cs
diff --git a/ConvertToPlugins/src/LocalServers/LocalGridServers/LocalGrid.cs b/src/LocalServers/LocalGridServers/LocalGrid.cs
similarity index 100%
rename from ConvertToPlugins/src/LocalServers/LocalGridServers/LocalGrid.cs
rename to src/LocalServers/LocalGridServers/LocalGrid.cs
diff --git a/ConvertToPlugins/src/LocalServers/LocalGridServers/LocalGridServers.csproj b/src/LocalServers/LocalGridServers/LocalGridServers.csproj
similarity index 100%
rename from ConvertToPlugins/src/LocalServers/LocalGridServers/LocalGridServers.csproj
rename to src/LocalServers/LocalGridServers/LocalGridServers.csproj
diff --git a/ConvertToPlugins/src/LocalServers/LocalGridServers/LocalGridServers.sln b/src/LocalServers/LocalGridServers/LocalGridServers.sln
similarity index 100%
rename from ConvertToPlugins/src/LocalServers/LocalGridServers/LocalGridServers.sln
rename to src/LocalServers/LocalGridServers/LocalGridServers.sln
diff --git a/ConvertToPlugins/src/LocalServers/default.build b/src/LocalServers/default.build
similarity index 100%
rename from ConvertToPlugins/src/LocalServers/default.build
rename to src/LocalServers/default.build
diff --git a/ConvertToPlugins/src/Main.cs b/src/Main.cs
similarity index 100%
rename from ConvertToPlugins/src/Main.cs
rename to src/Main.cs
diff --git a/ConvertToPlugins/src/OpenSimClient.cs b/src/OpenSimClient.cs
similarity index 100%
rename from ConvertToPlugins/src/OpenSimClient.cs
rename to src/OpenSimClient.cs
diff --git a/ConvertToPlugins/src/OpenSimConsole.cs b/src/OpenSimConsole.cs
similarity index 100%
rename from ConvertToPlugins/src/OpenSimConsole.cs
rename to src/OpenSimConsole.cs
diff --git a/ConvertToPlugins/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs b/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs
similarity index 100%
rename from ConvertToPlugins/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs
rename to src/RemoteServers/RemoteGridServers/AssemblyInfo.cs
diff --git a/ConvertToPlugins/src/RemoteServers/RemoteGridServers/RemoteGrid.cs b/src/RemoteServers/RemoteGridServers/RemoteGrid.cs
similarity index 100%
rename from ConvertToPlugins/src/RemoteServers/RemoteGridServers/RemoteGrid.cs
rename to src/RemoteServers/RemoteGridServers/RemoteGrid.cs
diff --git a/ConvertToPlugins/src/RemoteServers/RemoteGridServers/RemoteGridServers.csproj b/src/RemoteServers/RemoteGridServers/RemoteGridServers.csproj
similarity index 100%
rename from ConvertToPlugins/src/RemoteServers/RemoteGridServers/RemoteGridServers.csproj
rename to src/RemoteServers/RemoteGridServers/RemoteGridServers.csproj
diff --git a/ConvertToPlugins/src/RemoteServers/RemoteGridServers/RemoteGridServers.sln b/src/RemoteServers/RemoteGridServers/RemoteGridServers.sln
similarity index 100%
rename from ConvertToPlugins/src/RemoteServers/RemoteGridServers/RemoteGridServers.sln
rename to src/RemoteServers/RemoteGridServers/RemoteGridServers.sln
diff --git a/ConvertToPlugins/src/RemoteServers/default.build b/src/RemoteServers/default.build
similarity index 100%
rename from ConvertToPlugins/src/RemoteServers/default.build
rename to src/RemoteServers/default.build
diff --git a/ConvertToPlugins/src/Second-server.csproj b/src/Second-server.csproj
similarity index 100%
rename from ConvertToPlugins/src/Second-server.csproj
rename to src/Second-server.csproj
diff --git a/ConvertToPlugins/src/Second-server.sln b/src/Second-server.sln
similarity index 100%
rename from ConvertToPlugins/src/Second-server.sln
rename to src/Second-server.sln
diff --git a/ConvertToPlugins/src/ServerConsole/ServerConsole/AssemblyInfo.cs b/src/ServerConsole/ServerConsole/AssemblyInfo.cs
similarity index 100%
rename from ConvertToPlugins/src/ServerConsole/ServerConsole/AssemblyInfo.cs
rename to src/ServerConsole/ServerConsole/AssemblyInfo.cs
diff --git a/ConvertToPlugins/src/ServerConsole/ServerConsole/ServerConsole.cs b/src/ServerConsole/ServerConsole/ServerConsole.cs
similarity index 100%
rename from ConvertToPlugins/src/ServerConsole/ServerConsole/ServerConsole.cs
rename to src/ServerConsole/ServerConsole/ServerConsole.cs
diff --git a/ConvertToPlugins/src/ServerConsole/ServerConsole/ServerConsole.csproj b/src/ServerConsole/ServerConsole/ServerConsole.csproj
similarity index 100%
rename from ConvertToPlugins/src/ServerConsole/ServerConsole/ServerConsole.csproj
rename to src/ServerConsole/ServerConsole/ServerConsole.csproj
diff --git a/ConvertToPlugins/src/ServerConsole/ServerConsole/ServerConsole.sln b/src/ServerConsole/ServerConsole/ServerConsole.sln
similarity index 100%
rename from ConvertToPlugins/src/ServerConsole/ServerConsole/ServerConsole.sln
rename to src/ServerConsole/ServerConsole/ServerConsole.sln
diff --git a/ConvertToPlugins/src/ServerConsole/default.build b/src/ServerConsole/default.build
similarity index 100%
rename from ConvertToPlugins/src/ServerConsole/default.build
rename to src/ServerConsole/default.build
diff --git a/ConvertToPlugins/src/Util.cs b/src/Util.cs
similarity index 100%
rename from ConvertToPlugins/src/Util.cs
rename to src/Util.cs
diff --git a/ConvertToPlugins/src/VersionInfo.cs b/src/VersionInfo.cs
similarity index 100%
rename from ConvertToPlugins/src/VersionInfo.cs
rename to src/VersionInfo.cs
diff --git a/ConvertToPlugins/src/VersionInfo.cs.template b/src/VersionInfo.cs.template
similarity index 100%
rename from ConvertToPlugins/src/VersionInfo.cs.template
rename to src/VersionInfo.cs.template
diff --git a/ConvertToPlugins/src/physics/AssemblyInfo.cs b/src/physics/AssemblyInfo.cs
similarity index 100%
rename from ConvertToPlugins/src/physics/AssemblyInfo.cs
rename to src/physics/AssemblyInfo.cs
diff --git a/ConvertToPlugins/src/physics/PhysicsManager.cs b/src/physics/PhysicsManager.cs
similarity index 100%
rename from ConvertToPlugins/src/physics/PhysicsManager.cs
rename to src/physics/PhysicsManager.cs
diff --git a/ConvertToPlugins/src/physics/PhysicsManager.csproj b/src/physics/PhysicsManager.csproj
similarity index 100%
rename from ConvertToPlugins/src/physics/PhysicsManager.csproj
rename to src/physics/PhysicsManager.csproj
diff --git a/ConvertToPlugins/src/physics/PhysicsManager.sln b/src/physics/PhysicsManager.sln
similarity index 100%
rename from ConvertToPlugins/src/physics/PhysicsManager.sln
rename to src/physics/PhysicsManager.sln
diff --git a/ConvertToPlugins/src/physics/default.build b/src/physics/default.build
similarity index 100%
rename from ConvertToPlugins/src/physics/default.build
rename to src/physics/default.build
diff --git a/ConvertToPlugins/src/physics/plugins/AssemblyInfo.cs b/src/physics/plugins/AssemblyInfo.cs
similarity index 100%
rename from ConvertToPlugins/src/physics/plugins/AssemblyInfo.cs
rename to src/physics/plugins/AssemblyInfo.cs
diff --git a/ConvertToPlugins/src/physics/plugins/PhysXplugin.cs b/src/physics/plugins/PhysXplugin.cs
similarity index 100%
rename from ConvertToPlugins/src/physics/plugins/PhysXplugin.cs
rename to src/physics/plugins/PhysXplugin.cs
diff --git a/ConvertToPlugins/src/physics/plugins/PhysXplugin.csproj b/src/physics/plugins/PhysXplugin.csproj
similarity index 100%
rename from ConvertToPlugins/src/physics/plugins/PhysXplugin.csproj
rename to src/physics/plugins/PhysXplugin.csproj
diff --git a/ConvertToPlugins/src/physics/plugins/PhysXplugin.sln b/src/physics/plugins/PhysXplugin.sln
similarity index 100%
rename from ConvertToPlugins/src/physics/plugins/PhysXplugin.sln
rename to src/physics/plugins/PhysXplugin.sln
diff --git a/ConvertToPlugins/src/physics/plugins/default.build b/src/physics/plugins/default.build
similarity index 100%
rename from ConvertToPlugins/src/physics/plugins/default.build
rename to src/physics/plugins/default.build
diff --git a/ConvertToPlugins/src/types/Mesh.cs b/src/types/Mesh.cs
similarity index 100%
rename from ConvertToPlugins/src/types/Mesh.cs
rename to src/types/Mesh.cs
diff --git a/ConvertToPlugins/src/types/Triangle.cs b/src/types/Triangle.cs
similarity index 100%
rename from ConvertToPlugins/src/types/Triangle.cs
rename to src/types/Triangle.cs
diff --git a/ConvertToPlugins/src/world/Avatar.cs b/src/world/Avatar.cs
similarity index 100%
rename from ConvertToPlugins/src/world/Avatar.cs
rename to src/world/Avatar.cs
diff --git a/ConvertToPlugins/src/world/Entity.cs b/src/world/Entity.cs
similarity index 100%
rename from ConvertToPlugins/src/world/Entity.cs
rename to src/world/Entity.cs
diff --git a/ConvertToPlugins/src/world/Primitive.cs b/src/world/Primitive.cs
similarity index 100%
rename from ConvertToPlugins/src/world/Primitive.cs
rename to src/world/Primitive.cs
diff --git a/ConvertToPlugins/src/world/ScriptEngine.cs b/src/world/ScriptEngine.cs
similarity index 100%
rename from ConvertToPlugins/src/world/ScriptEngine.cs
rename to src/world/ScriptEngine.cs
diff --git a/ConvertToPlugins/src/world/SurfacePatch.cs b/src/world/SurfacePatch.cs
similarity index 100%
rename from ConvertToPlugins/src/world/SurfacePatch.cs
rename to src/world/SurfacePatch.cs
diff --git a/ConvertToPlugins/src/world/World.cs b/src/world/World.cs
similarity index 100%
rename from ConvertToPlugins/src/world/World.cs
rename to src/world/World.cs
diff --git a/ConvertToPlugins/src/world/scripting/IScript.cs b/src/world/scripting/IScript.cs
similarity index 100%
rename from ConvertToPlugins/src/world/scripting/IScript.cs
rename to src/world/scripting/IScript.cs