diff --git a/OpenSim/Framework/General/ACL.cs b/OpenSim/Framework/ACL.cs
similarity index 100%
rename from OpenSim/Framework/General/ACL.cs
rename to OpenSim/Framework/ACL.cs
diff --git a/OpenSim/Framework/General/AgentCircuitManager.cs b/OpenSim/Framework/AgentCircuitManager.cs
similarity index 100%
rename from OpenSim/Framework/General/AgentCircuitManager.cs
rename to OpenSim/Framework/AgentCircuitManager.cs
diff --git a/OpenSim/Framework/General/AgentCiruitData.cs b/OpenSim/Framework/AgentCiruitData.cs
similarity index 100%
rename from OpenSim/Framework/General/AgentCiruitData.cs
rename to OpenSim/Framework/AgentCiruitData.cs
diff --git a/OpenSim/Framework/General/AgentInventory.cs b/OpenSim/Framework/AgentInventory.cs
similarity index 100%
rename from OpenSim/Framework/General/AgentInventory.cs
rename to OpenSim/Framework/AgentInventory.cs
diff --git a/OpenSim/Framework/General/AgentWearable.cs b/OpenSim/Framework/AgentWearable.cs
similarity index 100%
rename from OpenSim/Framework/General/AgentWearable.cs
rename to OpenSim/Framework/AgentWearable.cs
diff --git a/OpenSim/Framework/General/Properties/AssemblyInfo.cs b/OpenSim/Framework/AssemblyInfo.cs
similarity index 100%
rename from OpenSim/Framework/General/Properties/AssemblyInfo.cs
rename to OpenSim/Framework/AssemblyInfo.cs
diff --git a/OpenSim/Framework/General/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
similarity index 100%
rename from OpenSim/Framework/General/AssetBase.cs
rename to OpenSim/Framework/AssetBase.cs
diff --git a/OpenSim/Framework/General/AssetConfig.cs b/OpenSim/Framework/AssetConfig.cs
similarity index 100%
rename from OpenSim/Framework/General/AssetConfig.cs
rename to OpenSim/Framework/AssetConfig.cs
diff --git a/OpenSim/Framework/General/AssetLandmark.cs b/OpenSim/Framework/AssetLandmark.cs
similarity index 100%
rename from OpenSim/Framework/General/AssetLandmark.cs
rename to OpenSim/Framework/AssetLandmark.cs
diff --git a/OpenSim/Framework/General/AssetStorage.cs b/OpenSim/Framework/AssetStorage.cs
similarity index 100%
rename from OpenSim/Framework/General/AssetStorage.cs
rename to OpenSim/Framework/AssetStorage.cs
diff --git a/OpenSim/Framework/General/AuthenticateResponse.cs b/OpenSim/Framework/AuthenticateResponse.cs
similarity index 100%
rename from OpenSim/Framework/General/AuthenticateResponse.cs
rename to OpenSim/Framework/AuthenticateResponse.cs
diff --git a/OpenSim/Framework/General/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
similarity index 100%
rename from OpenSim/Framework/General/BlockingQueue.cs
rename to OpenSim/Framework/BlockingQueue.cs
diff --git a/OpenSim/Framework/General/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
similarity index 100%
rename from OpenSim/Framework/General/ClientManager.cs
rename to OpenSim/Framework/ClientManager.cs
diff --git a/OpenSim/Framework/General/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs
similarity index 100%
rename from OpenSim/Framework/General/ConfigurationMember.cs
rename to OpenSim/Framework/ConfigurationMember.cs
diff --git a/OpenSim/Framework/General/ConfigurationOption.cs b/OpenSim/Framework/ConfigurationOption.cs
similarity index 100%
rename from OpenSim/Framework/General/ConfigurationOption.cs
rename to OpenSim/Framework/ConfigurationOption.cs
diff --git a/OpenSim/Framework/General/Culture.cs b/OpenSim/Framework/Culture.cs
similarity index 100%
rename from OpenSim/Framework/General/Culture.cs
rename to OpenSim/Framework/Culture.cs
diff --git a/OpenSim/Framework/General/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
similarity index 100%
rename from OpenSim/Framework/General/EstateSettings.cs
rename to OpenSim/Framework/EstateSettings.cs
diff --git a/OpenSim/Framework/General/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
similarity index 100%
rename from OpenSim/Framework/General/GridConfig.cs
rename to OpenSim/Framework/GridConfig.cs
diff --git a/OpenSim/Framework/General/IAssetProvider.cs b/OpenSim/Framework/IAssetProvider.cs
similarity index 100%
rename from OpenSim/Framework/General/IAssetProvider.cs
rename to OpenSim/Framework/IAssetProvider.cs
diff --git a/OpenSim/Framework/General/IAssetServer.cs b/OpenSim/Framework/IAssetServer.cs
similarity index 100%
rename from OpenSim/Framework/General/IAssetServer.cs
rename to OpenSim/Framework/IAssetServer.cs
diff --git a/OpenSim/Framework/General/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
similarity index 100%
rename from OpenSim/Framework/General/IClientAPI.cs
rename to OpenSim/Framework/IClientAPI.cs
diff --git a/OpenSim/Framework/General/IGenericConfig.cs b/OpenSim/Framework/IGenericConfig.cs
similarity index 100%
rename from OpenSim/Framework/General/IGenericConfig.cs
rename to OpenSim/Framework/IGenericConfig.cs
diff --git a/OpenSim/Framework/General/IPlugin.cs b/OpenSim/Framework/IPlugin.cs
similarity index 100%
rename from OpenSim/Framework/General/IPlugin.cs
rename to OpenSim/Framework/IPlugin.cs
diff --git a/OpenSim/Framework/General/IRegionCommsListener.cs b/OpenSim/Framework/IRegionCommsListener.cs
similarity index 100%
rename from OpenSim/Framework/General/IRegionCommsListener.cs
rename to OpenSim/Framework/IRegionCommsListener.cs
diff --git a/OpenSim/Framework/General/IScene.cs b/OpenSim/Framework/IScene.cs
similarity index 100%
rename from OpenSim/Framework/General/IScene.cs
rename to OpenSim/Framework/IScene.cs
diff --git a/OpenSim/Framework/General/IUserData.cs b/OpenSim/Framework/IUserData.cs
similarity index 100%
rename from OpenSim/Framework/General/IUserData.cs
rename to OpenSim/Framework/IUserData.cs
diff --git a/OpenSim/Framework/General/IUserService.cs b/OpenSim/Framework/IUserService.cs
similarity index 100%
rename from OpenSim/Framework/General/IUserService.cs
rename to OpenSim/Framework/IUserService.cs
diff --git a/OpenSim/Framework/General/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs
similarity index 100%
rename from OpenSim/Framework/General/InventoryConfig.cs
rename to OpenSim/Framework/InventoryConfig.cs
diff --git a/OpenSim/Framework/General/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
similarity index 100%
rename from OpenSim/Framework/General/InventoryItemBase.cs
rename to OpenSim/Framework/InventoryItemBase.cs
diff --git a/OpenSim/Framework/General/LandData.cs b/OpenSim/Framework/LandData.cs
similarity index 100%
rename from OpenSim/Framework/General/LandData.cs
rename to OpenSim/Framework/LandData.cs
diff --git a/OpenSim/Framework/General/Login.cs b/OpenSim/Framework/Login.cs
similarity index 100%
rename from OpenSim/Framework/General/Login.cs
rename to OpenSim/Framework/Login.cs
diff --git a/OpenSim/Framework/General/MapBlockData.cs b/OpenSim/Framework/MapBlockData.cs
similarity index 100%
rename from OpenSim/Framework/General/MapBlockData.cs
rename to OpenSim/Framework/MapBlockData.cs
diff --git a/OpenSim/Framework/General/NeighbourInfo.cs b/OpenSim/Framework/NeighbourInfo.cs
similarity index 100%
rename from OpenSim/Framework/General/NeighbourInfo.cs
rename to OpenSim/Framework/NeighbourInfo.cs
diff --git a/OpenSim/Framework/General/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
similarity index 100%
rename from OpenSim/Framework/General/NetworkServersInfo.cs
rename to OpenSim/Framework/NetworkServersInfo.cs
diff --git a/OpenSim/Framework/General/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
similarity index 100%
rename from OpenSim/Framework/General/PrimitiveBaseShape.cs
rename to OpenSim/Framework/PrimitiveBaseShape.cs
diff --git a/OpenSim/Framework/General/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs
similarity index 100%
rename from OpenSim/Framework/General/RegionCommsListener.cs
rename to OpenSim/Framework/RegionCommsListener.cs
diff --git a/OpenSim/Framework/General/RegionHandle.cs b/OpenSim/Framework/RegionHandle.cs
similarity index 100%
rename from OpenSim/Framework/General/RegionHandle.cs
rename to OpenSim/Framework/RegionHandle.cs
diff --git a/OpenSim/Framework/General/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
similarity index 100%
rename from OpenSim/Framework/General/RegionInfo.cs
rename to OpenSim/Framework/RegionInfo.cs
diff --git a/OpenSim/Framework/General/Remoting.cs b/OpenSim/Framework/Remoting.cs
similarity index 100%
rename from OpenSim/Framework/General/Remoting.cs
rename to OpenSim/Framework/Remoting.cs
diff --git a/OpenSim/Framework/General/UUID.cs b/OpenSim/Framework/UUID.cs
similarity index 100%
rename from OpenSim/Framework/General/UUID.cs
rename to OpenSim/Framework/UUID.cs
diff --git a/OpenSim/Framework/General/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
similarity index 100%
rename from OpenSim/Framework/General/UserConfig.cs
rename to OpenSim/Framework/UserConfig.cs
diff --git a/OpenSim/Framework/General/UserProfileData.cs b/OpenSim/Framework/UserProfileData.cs
similarity index 100%
rename from OpenSim/Framework/General/UserProfileData.cs
rename to OpenSim/Framework/UserProfileData.cs
diff --git a/OpenSim/Framework/General/Util.cs b/OpenSim/Framework/Util.cs
similarity index 100%
rename from OpenSim/Framework/General/Util.cs
rename to OpenSim/Framework/Util.cs
diff --git a/prebuild.xml b/prebuild.xml
index 79f8d3a943..ddf90ab2f5 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -53,19 +53,19 @@
       </Files>
     </Project>
 	
-    <Project name="OpenSim.Framework" path="OpenSim/Framework/General" type="Library">
+    <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="System.Data"/>
@@ -75,7 +75,7 @@
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="Nini.dll" />
       <Files>
-        <Match pattern="*.cs" recurse="true"/>
+        <Match pattern="*.cs" recurse="false"/>
       </Files>
     </Project>