diff --git a/OpenSim/OpenSim.Reg/Avatar.Client.cs b/OpenSim/OpenSim.Region/Avatar.Client.cs
similarity index 100%
rename from OpenSim/OpenSim.Reg/Avatar.Client.cs
rename to OpenSim/OpenSim.Region/Avatar.Client.cs
diff --git a/OpenSim/OpenSim.Reg/Avatar.Update.cs b/OpenSim/OpenSim.Region/Avatar.Update.cs
similarity index 100%
rename from OpenSim/OpenSim.Reg/Avatar.Update.cs
rename to OpenSim/OpenSim.Region/Avatar.Update.cs
diff --git a/OpenSim/OpenSim.Reg/Avatar.cs b/OpenSim/OpenSim.Region/Avatar.cs
similarity index 100%
rename from OpenSim/OpenSim.Reg/Avatar.cs
rename to OpenSim/OpenSim.Region/Avatar.cs
diff --git a/OpenSim/OpenSim.Reg/AvatarAnimations.cs b/OpenSim/OpenSim.Region/AvatarAnimations.cs
similarity index 100%
rename from OpenSim/OpenSim.Reg/AvatarAnimations.cs
rename to OpenSim/OpenSim.Region/AvatarAnimations.cs
diff --git a/OpenSim/OpenSim.Reg/Entity.cs b/OpenSim/OpenSim.Region/Entity.cs
similarity index 100%
rename from OpenSim/OpenSim.Reg/Entity.cs
rename to OpenSim/OpenSim.Region/Entity.cs
diff --git a/OpenSim/OpenSim.Reg/Estate/EstateManager.cs b/OpenSim/OpenSim.Region/Estate/EstateManager.cs
similarity index 100%
rename from OpenSim/OpenSim.Reg/Estate/EstateManager.cs
rename to OpenSim/OpenSim.Region/Estate/EstateManager.cs
diff --git a/OpenSim/OpenSim.Reg/OpenSim.World.csproj b/OpenSim/OpenSim.Region/OpenSim.World.csproj
similarity index 100%
rename from OpenSim/OpenSim.Reg/OpenSim.World.csproj
rename to OpenSim/OpenSim.Region/OpenSim.World.csproj
diff --git a/OpenSim/OpenSim.Reg/OpenSim.World.dll.build b/OpenSim/OpenSim.Region/OpenSim.World.dll.build
similarity index 100%
rename from OpenSim/OpenSim.Reg/OpenSim.World.dll.build
rename to OpenSim/OpenSim.Region/OpenSim.World.dll.build
diff --git a/OpenSim/OpenSim.Reg/ParcelManager.cs b/OpenSim/OpenSim.Region/ParcelManager.cs
similarity index 100%
rename from OpenSim/OpenSim.Reg/ParcelManager.cs
rename to OpenSim/OpenSim.Region/ParcelManager.cs
diff --git a/OpenSim/OpenSim.Reg/Primitive.cs b/OpenSim/OpenSim.Region/Primitive.cs
similarity index 100%
rename from OpenSim/OpenSim.Reg/Primitive.cs
rename to OpenSim/OpenSim.Region/Primitive.cs
diff --git a/OpenSim/OpenSim.Reg/SceneObject.cs b/OpenSim/OpenSim.Region/SceneObject.cs
similarity index 100%
rename from OpenSim/OpenSim.Reg/SceneObject.cs
rename to OpenSim/OpenSim.Region/SceneObject.cs
diff --git a/OpenSim/OpenSim.Reg/World.PacketHandlers.cs b/OpenSim/OpenSim.Region/World.PacketHandlers.cs
similarity index 100%
rename from OpenSim/OpenSim.Reg/World.PacketHandlers.cs
rename to OpenSim/OpenSim.Region/World.PacketHandlers.cs
diff --git a/OpenSim/OpenSim.Reg/World.Scripting.cs b/OpenSim/OpenSim.Region/World.Scripting.cs
similarity index 100%
rename from OpenSim/OpenSim.Reg/World.Scripting.cs
rename to OpenSim/OpenSim.Region/World.Scripting.cs
diff --git a/OpenSim/OpenSim.Reg/World.cs b/OpenSim/OpenSim.Region/World.cs
similarity index 100%
rename from OpenSim/OpenSim.Reg/World.cs
rename to OpenSim/OpenSim.Region/World.cs
diff --git a/OpenSim/OpenSim.Reg/WorldBase.cs b/OpenSim/OpenSim.Region/WorldBase.cs
similarity index 100%
rename from OpenSim/OpenSim.Reg/WorldBase.cs
rename to OpenSim/OpenSim.Region/WorldBase.cs
diff --git a/OpenSim/OpenSim.Reg/scripting/IScriptContext.cs b/OpenSim/OpenSim.Region/scripting/IScriptContext.cs
similarity index 100%
rename from OpenSim/OpenSim.Reg/scripting/IScriptContext.cs
rename to OpenSim/OpenSim.Region/scripting/IScriptContext.cs
diff --git a/OpenSim/OpenSim.Reg/scripting/IScriptEntity.cs b/OpenSim/OpenSim.Region/scripting/IScriptEntity.cs
similarity index 100%
rename from OpenSim/OpenSim.Reg/scripting/IScriptEntity.cs
rename to OpenSim/OpenSim.Region/scripting/IScriptEntity.cs
diff --git a/OpenSim/OpenSim.Reg/scripting/IScriptHandler.cs b/OpenSim/OpenSim.Region/scripting/IScriptHandler.cs
similarity index 100%
rename from OpenSim/OpenSim.Reg/scripting/IScriptHandler.cs
rename to OpenSim/OpenSim.Region/scripting/IScriptHandler.cs
diff --git a/OpenSim/OpenSim.Reg/scripting/Script.cs b/OpenSim/OpenSim.Region/scripting/Script.cs
similarity index 100%
rename from OpenSim/OpenSim.Reg/scripting/Script.cs
rename to OpenSim/OpenSim.Region/scripting/Script.cs
diff --git a/OpenSim/OpenSim.Reg/scripting/ScriptFactory.cs b/OpenSim/OpenSim.Region/scripting/ScriptFactory.cs
similarity index 100%
rename from OpenSim/OpenSim.Reg/scripting/ScriptFactory.cs
rename to OpenSim/OpenSim.Region/scripting/ScriptFactory.cs
diff --git a/OpenSim/OpenSim.Reg/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim/OpenSim.Region/scripting/Scripts/FollowRandomAvatar.cs
similarity index 100%
rename from OpenSim/OpenSim.Reg/scripting/Scripts/FollowRandomAvatar.cs
rename to OpenSim/OpenSim.Region/scripting/Scripts/FollowRandomAvatar.cs
diff --git a/OpenSim/OpenSim.Reg/types/Mesh.cs b/OpenSim/OpenSim.Region/types/Mesh.cs
similarity index 100%
rename from OpenSim/OpenSim.Reg/types/Mesh.cs
rename to OpenSim/OpenSim.Region/types/Mesh.cs
diff --git a/OpenSim/OpenSim.Reg/types/Triangle.cs b/OpenSim/OpenSim.Region/types/Triangle.cs
similarity index 100%
rename from OpenSim/OpenSim.Reg/types/Triangle.cs
rename to OpenSim/OpenSim.Region/types/Triangle.cs