diff --git a/OpenSim/Framework/Data/AssetDataBase.cs b/OpenSim/Data/AssetDataBase.cs
similarity index 100%
rename from OpenSim/Framework/Data/AssetDataBase.cs
rename to OpenSim/Data/AssetDataBase.cs
diff --git a/OpenSim/Framework/Data/DataStoreBase.cs b/OpenSim/Data/DataStoreBase.cs
similarity index 100%
rename from OpenSim/Framework/Data/DataStoreBase.cs
rename to OpenSim/Data/DataStoreBase.cs
diff --git a/OpenSim/Framework/Data/GridDataBase.cs b/OpenSim/Data/GridDataBase.cs
similarity index 100%
rename from OpenSim/Framework/Data/GridDataBase.cs
rename to OpenSim/Data/GridDataBase.cs
diff --git a/OpenSim/Framework/Data/IGridData.cs b/OpenSim/Data/IGridData.cs
similarity index 100%
rename from OpenSim/Framework/Data/IGridData.cs
rename to OpenSim/Data/IGridData.cs
diff --git a/OpenSim/Framework/Data/ILogData.cs b/OpenSim/Data/ILogData.cs
similarity index 100%
rename from OpenSim/Framework/Data/ILogData.cs
rename to OpenSim/Data/ILogData.cs
diff --git a/OpenSim/Framework/Data/IniConfig.cs b/OpenSim/Data/IniConfig.cs
similarity index 100%
rename from OpenSim/Framework/Data/IniConfig.cs
rename to OpenSim/Data/IniConfig.cs
diff --git a/OpenSim/Framework/Data/InventoryDataBase.cs b/OpenSim/Data/InventoryDataBase.cs
similarity index 100%
rename from OpenSim/Framework/Data/InventoryDataBase.cs
rename to OpenSim/Data/InventoryDataBase.cs
diff --git a/OpenSim/Framework/Data/OpenSimDataReader.cs b/OpenSim/Data/OpenSimDataReader.cs
similarity index 100%
rename from OpenSim/Framework/Data/OpenSimDataReader.cs
rename to OpenSim/Data/OpenSimDataReader.cs
diff --git a/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs b/OpenSim/Data/OpenSimDatabaseConnector.cs
similarity index 100%
rename from OpenSim/Framework/Data/OpenSimDatabaseConnector.cs
rename to OpenSim/Data/OpenSimDatabaseConnector.cs
diff --git a/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs b/OpenSim/Data/OpenSimObjectFieldMapper.cs
similarity index 100%
rename from OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs
rename to OpenSim/Data/OpenSimObjectFieldMapper.cs
diff --git a/OpenSim/Framework/Data/OpenSimTableMapper.cs b/OpenSim/Data/OpenSimTableMapper.cs
similarity index 100%
rename from OpenSim/Framework/Data/OpenSimTableMapper.cs
rename to OpenSim/Data/OpenSimTableMapper.cs
diff --git a/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs b/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs
similarity index 100%
rename from OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs
rename to OpenSim/Data/PrimitiveBaseShapeTableMapper.cs
diff --git a/OpenSim/Framework/Data/Properties/AssemblyInfo.cs b/OpenSim/Data/Properties/AssemblyInfo.cs
similarity index 100%
rename from OpenSim/Framework/Data/Properties/AssemblyInfo.cs
rename to OpenSim/Data/Properties/AssemblyInfo.cs
diff --git a/OpenSim/Framework/Data/RegionProfileData.cs b/OpenSim/Data/RegionProfileData.cs
similarity index 100%
rename from OpenSim/Framework/Data/RegionProfileData.cs
rename to OpenSim/Data/RegionProfileData.cs
diff --git a/OpenSim/Framework/Data/ReservationData.cs b/OpenSim/Data/ReservationData.cs
similarity index 100%
rename from OpenSim/Framework/Data/ReservationData.cs
rename to OpenSim/Data/ReservationData.cs
diff --git a/OpenSim/Framework/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs
similarity index 100%
rename from OpenSim/Framework/Data/UserDataBase.cs
rename to OpenSim/Data/UserDataBase.cs