diff --git a/OpenSim/Framework/Data.Base/BaseDataReader.cs b/OpenSim/Data/Base/BaseDataReader.cs
similarity index 100%
rename from OpenSim/Framework/Data.Base/BaseDataReader.cs
rename to OpenSim/Data/Base/BaseDataReader.cs
diff --git a/OpenSim/Framework/Data.Base/BaseDatabaseConnector.cs b/OpenSim/Data/Base/BaseDatabaseConnector.cs
similarity index 100%
rename from OpenSim/Framework/Data.Base/BaseDatabaseConnector.cs
rename to OpenSim/Data/Base/BaseDatabaseConnector.cs
diff --git a/OpenSim/Framework/Data.Base/BaseFieldMapper.cs b/OpenSim/Data/Base/BaseFieldMapper.cs
similarity index 100%
rename from OpenSim/Framework/Data.Base/BaseFieldMapper.cs
rename to OpenSim/Data/Base/BaseFieldMapper.cs
diff --git a/OpenSim/Framework/Data.Base/BaseRowMapper.cs b/OpenSim/Data/Base/BaseRowMapper.cs
similarity index 100%
rename from OpenSim/Framework/Data.Base/BaseRowMapper.cs
rename to OpenSim/Data/Base/BaseRowMapper.cs
diff --git a/OpenSim/Framework/Data.Base/BaseSchema.cs b/OpenSim/Data/Base/BaseSchema.cs
similarity index 100%
rename from OpenSim/Framework/Data.Base/BaseSchema.cs
rename to OpenSim/Data/Base/BaseSchema.cs
diff --git a/OpenSim/Framework/Data.Base/BaseTableMapper.cs b/OpenSim/Data/Base/BaseTableMapper.cs
similarity index 100%
rename from OpenSim/Framework/Data.Base/BaseTableMapper.cs
rename to OpenSim/Data/Base/BaseTableMapper.cs
diff --git a/OpenSim/Framework/Data.Base/OpenSim.Framework.Data.Base.snk b/OpenSim/Data/Base/OpenSim.Framework.Data.Base.snk
similarity index 100%
rename from OpenSim/Framework/Data.Base/OpenSim.Framework.Data.Base.snk
rename to OpenSim/Data/Base/OpenSim.Framework.Data.Base.snk
diff --git a/OpenSim/Framework/Data.Base/Properties/AssemblyInfo.cs b/OpenSim/Data/Base/Properties/AssemblyInfo.cs
similarity index 100%
rename from OpenSim/Framework/Data.Base/Properties/AssemblyInfo.cs
rename to OpenSim/Data/Base/Properties/AssemblyInfo.cs
diff --git a/OpenSim/Framework/Data.DB4o/DB4oGridData.cs b/OpenSim/Data/DB4o/DB4oGridData.cs
similarity index 100%
rename from OpenSim/Framework/Data.DB4o/DB4oGridData.cs
rename to OpenSim/Data/DB4o/DB4oGridData.cs
diff --git a/OpenSim/Framework/Data.DB4o/DB4oManager.cs b/OpenSim/Data/DB4o/DB4oManager.cs
similarity index 100%
rename from OpenSim/Framework/Data.DB4o/DB4oManager.cs
rename to OpenSim/Data/DB4o/DB4oManager.cs
diff --git a/OpenSim/Framework/Data.DB4o/DB4oUserData.cs b/OpenSim/Data/DB4o/DB4oUserData.cs
similarity index 100%
rename from OpenSim/Framework/Data.DB4o/DB4oUserData.cs
rename to OpenSim/Data/DB4o/DB4oUserData.cs
diff --git a/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs b/OpenSim/Data/DB4o/Properties/AssemblyInfo.cs
similarity index 100%
rename from OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs
rename to OpenSim/Data/DB4o/Properties/AssemblyInfo.cs
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
similarity index 100%
rename from OpenSim/Framework/Data.MSSQL/MSSQLAssetData.cs
rename to OpenSim/Data/MSSQL/MSSQLAssetData.cs
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLDataStore.cs b/OpenSim/Data/MSSQL/MSSQLDataStore.cs
similarity index 100%
rename from OpenSim/Framework/Data.MSSQL/MSSQLDataStore.cs
rename to OpenSim/Data/MSSQL/MSSQLDataStore.cs
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs b/OpenSim/Data/MSSQL/MSSQLGridData.cs
similarity index 100%
rename from OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
rename to OpenSim/Data/MSSQL/MSSQLGridData.cs
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
similarity index 100%
rename from OpenSim/Framework/Data.MSSQL/MSSQLInventoryData.cs
rename to OpenSim/Data/MSSQL/MSSQLInventoryData.cs
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLLogData.cs b/OpenSim/Data/MSSQL/MSSQLLogData.cs
similarity index 100%
rename from OpenSim/Framework/Data.MSSQL/MSSQLLogData.cs
rename to OpenSim/Data/MSSQL/MSSQLLogData.cs
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs
similarity index 100%
rename from OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
rename to OpenSim/Data/MSSQL/MSSQLManager.cs
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
similarity index 100%
rename from OpenSim/Framework/Data.MSSQL/MSSQLUserData.cs
rename to OpenSim/Data/MSSQL/MSSQLUserData.cs
diff --git a/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs b/OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs
similarity index 100%
rename from OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs
rename to OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs
diff --git a/OpenSim/Framework/Data.MSSQL/Resources/AvatarAppearance.sql b/OpenSim/Data/MSSQL/Resources/AvatarAppearance.sql
similarity index 100%
rename from OpenSim/Framework/Data.MSSQL/Resources/AvatarAppearance.sql
rename to OpenSim/Data/MSSQL/Resources/AvatarAppearance.sql
diff --git a/OpenSim/Framework/Data.MSSQL/Resources/CreateAssetsTable.sql b/OpenSim/Data/MSSQL/Resources/CreateAssetsTable.sql
similarity index 100%
rename from OpenSim/Framework/Data.MSSQL/Resources/CreateAssetsTable.sql
rename to OpenSim/Data/MSSQL/Resources/CreateAssetsTable.sql
diff --git a/OpenSim/Framework/Data.MSSQL/Resources/CreateFoldersTable.sql b/OpenSim/Data/MSSQL/Resources/CreateFoldersTable.sql
similarity index 100%
rename from OpenSim/Framework/Data.MSSQL/Resources/CreateFoldersTable.sql
rename to OpenSim/Data/MSSQL/Resources/CreateFoldersTable.sql
diff --git a/OpenSim/Framework/Data.MSSQL/Resources/CreateItemsTable.sql b/OpenSim/Data/MSSQL/Resources/CreateItemsTable.sql
similarity index 100%
rename from OpenSim/Framework/Data.MSSQL/Resources/CreateItemsTable.sql
rename to OpenSim/Data/MSSQL/Resources/CreateItemsTable.sql
diff --git a/OpenSim/Framework/Data.MSSQL/Resources/CreateUserFriendsTable.sql b/OpenSim/Data/MSSQL/Resources/CreateUserFriendsTable.sql
similarity index 100%
rename from OpenSim/Framework/Data.MSSQL/Resources/CreateUserFriendsTable.sql
rename to OpenSim/Data/MSSQL/Resources/CreateUserFriendsTable.sql
diff --git a/OpenSim/Framework/Data.MSSQL/Resources/Mssql-agents.sql b/OpenSim/Data/MSSQL/Resources/Mssql-agents.sql
similarity index 100%
rename from OpenSim/Framework/Data.MSSQL/Resources/Mssql-agents.sql
rename to OpenSim/Data/MSSQL/Resources/Mssql-agents.sql
diff --git a/OpenSim/Framework/Data.MSSQL/Resources/Mssql-logs.sql b/OpenSim/Data/MSSQL/Resources/Mssql-logs.sql
similarity index 100%
rename from OpenSim/Framework/Data.MSSQL/Resources/Mssql-logs.sql
rename to OpenSim/Data/MSSQL/Resources/Mssql-logs.sql
diff --git a/OpenSim/Framework/Data.MSSQL/Resources/Mssql-regions.sql b/OpenSim/Data/MSSQL/Resources/Mssql-regions.sql
similarity index 100%
rename from OpenSim/Framework/Data.MSSQL/Resources/Mssql-regions.sql
rename to OpenSim/Data/MSSQL/Resources/Mssql-regions.sql
diff --git a/OpenSim/Framework/Data.MSSQL/Resources/Mssql-users.sql b/OpenSim/Data/MSSQL/Resources/Mssql-users.sql
similarity index 100%
rename from OpenSim/Framework/Data.MSSQL/Resources/Mssql-users.sql
rename to OpenSim/Data/MSSQL/Resources/Mssql-users.sql
diff --git a/OpenSim/Framework/Data.MSSQLMapper/MSSQLDatabaseMapper.cs b/OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs
similarity index 100%
rename from OpenSim/Framework/Data.MSSQLMapper/MSSQLDatabaseMapper.cs
rename to OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs
diff --git a/OpenSim/Framework/Data.MapperFactory/DataMapperFactory.cs b/OpenSim/Data/MapperFactory/DataMapperFactory.cs
similarity index 100%
rename from OpenSim/Framework/Data.MapperFactory/DataMapperFactory.cs
rename to OpenSim/Data/MapperFactory/DataMapperFactory.cs
diff --git a/OpenSim/Framework/Data.MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
similarity index 100%
rename from OpenSim/Framework/Data.MySQL/MySQLAssetData.cs
rename to OpenSim/Data/MySQL/MySQLAssetData.cs
diff --git a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs
similarity index 100%
rename from OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
rename to OpenSim/Data/MySQL/MySQLDataStore.cs
diff --git a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs
similarity index 100%
rename from OpenSim/Framework/Data.MySQL/MySQLGridData.cs
rename to OpenSim/Data/MySQL/MySQLGridData.cs
diff --git a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
similarity index 100%
rename from OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
rename to OpenSim/Data/MySQL/MySQLInventoryData.cs
diff --git a/OpenSim/Framework/Data.MySQL/MySQLLogData.cs b/OpenSim/Data/MySQL/MySQLLogData.cs
similarity index 100%
rename from OpenSim/Framework/Data.MySQL/MySQLLogData.cs
rename to OpenSim/Data/MySQL/MySQLLogData.cs
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
similarity index 100%
rename from OpenSim/Framework/Data.MySQL/MySQLManager.cs
rename to OpenSim/Data/MySQL/MySQLManager.cs
diff --git a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
similarity index 100%
rename from OpenSim/Framework/Data.MySQL/MySQLUserData.cs
rename to OpenSim/Data/MySQL/MySQLUserData.cs
diff --git a/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs b/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs
similarity index 100%
rename from OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
rename to OpenSim/Data/MySQL/Properties/AssemblyInfo.cs
diff --git a/OpenSim/Framework/Data.MySQL/Resources/AvatarAppearance.sql b/OpenSim/Data/MySQL/Resources/AvatarAppearance.sql
similarity index 100%
rename from OpenSim/Framework/Data.MySQL/Resources/AvatarAppearance.sql
rename to OpenSim/Data/MySQL/Resources/AvatarAppearance.sql
diff --git a/OpenSim/Framework/Data.MySQL/Resources/CreateAgentsTable.sql b/OpenSim/Data/MySQL/Resources/CreateAgentsTable.sql
similarity index 100%
rename from OpenSim/Framework/Data.MySQL/Resources/CreateAgentsTable.sql
rename to OpenSim/Data/MySQL/Resources/CreateAgentsTable.sql
diff --git a/OpenSim/Framework/Data.MySQL/Resources/CreateAssetsTable.sql b/OpenSim/Data/MySQL/Resources/CreateAssetsTable.sql
similarity index 100%
rename from OpenSim/Framework/Data.MySQL/Resources/CreateAssetsTable.sql
rename to OpenSim/Data/MySQL/Resources/CreateAssetsTable.sql
diff --git a/OpenSim/Framework/Data.MySQL/Resources/CreateFoldersTable.sql b/OpenSim/Data/MySQL/Resources/CreateFoldersTable.sql
similarity index 100%
rename from OpenSim/Framework/Data.MySQL/Resources/CreateFoldersTable.sql
rename to OpenSim/Data/MySQL/Resources/CreateFoldersTable.sql
diff --git a/OpenSim/Framework/Data.MySQL/Resources/CreateItemsTable.sql b/OpenSim/Data/MySQL/Resources/CreateItemsTable.sql
similarity index 100%
rename from OpenSim/Framework/Data.MySQL/Resources/CreateItemsTable.sql
rename to OpenSim/Data/MySQL/Resources/CreateItemsTable.sql
diff --git a/OpenSim/Framework/Data.MySQL/Resources/CreateLogsTable.sql b/OpenSim/Data/MySQL/Resources/CreateLogsTable.sql
similarity index 100%
rename from OpenSim/Framework/Data.MySQL/Resources/CreateLogsTable.sql
rename to OpenSim/Data/MySQL/Resources/CreateLogsTable.sql
diff --git a/OpenSim/Framework/Data.MySQL/Resources/CreateRegionsTable.sql b/OpenSim/Data/MySQL/Resources/CreateRegionsTable.sql
similarity index 100%
rename from OpenSim/Framework/Data.MySQL/Resources/CreateRegionsTable.sql
rename to OpenSim/Data/MySQL/Resources/CreateRegionsTable.sql
diff --git a/OpenSim/Framework/Data.MySQL/Resources/CreateUserFriendsTable.sql b/OpenSim/Data/MySQL/Resources/CreateUserFriendsTable.sql
similarity index 100%
rename from OpenSim/Framework/Data.MySQL/Resources/CreateUserFriendsTable.sql
rename to OpenSim/Data/MySQL/Resources/CreateUserFriendsTable.sql
diff --git a/OpenSim/Framework/Data.MySQL/Resources/CreateUsersTable.sql b/OpenSim/Data/MySQL/Resources/CreateUsersTable.sql
similarity index 100%
rename from OpenSim/Framework/Data.MySQL/Resources/CreateUsersTable.sql
rename to OpenSim/Data/MySQL/Resources/CreateUsersTable.sql
diff --git a/OpenSim/Framework/Data.MySQL/Resources/UpgradeFoldersTableToVersion2.sql b/OpenSim/Data/MySQL/Resources/UpgradeFoldersTableToVersion2.sql
similarity index 100%
rename from OpenSim/Framework/Data.MySQL/Resources/UpgradeFoldersTableToVersion2.sql
rename to OpenSim/Data/MySQL/Resources/UpgradeFoldersTableToVersion2.sql
diff --git a/OpenSim/Framework/Data.MySQL/Resources/UpgradeItemsTableToVersion2.sql b/OpenSim/Data/MySQL/Resources/UpgradeItemsTableToVersion2.sql
similarity index 100%
rename from OpenSim/Framework/Data.MySQL/Resources/UpgradeItemsTableToVersion2.sql
rename to OpenSim/Data/MySQL/Resources/UpgradeItemsTableToVersion2.sql
diff --git a/OpenSim/Framework/Data.MySQL/Resources/UpgradeRegionsTableToVersion2.sql b/OpenSim/Data/MySQL/Resources/UpgradeRegionsTableToVersion2.sql
similarity index 100%
rename from OpenSim/Framework/Data.MySQL/Resources/UpgradeRegionsTableToVersion2.sql
rename to OpenSim/Data/MySQL/Resources/UpgradeRegionsTableToVersion2.sql
diff --git a/OpenSim/Framework/Data.MySQL/Resources/UpgradeRegionsTableToVersion3.sql b/OpenSim/Data/MySQL/Resources/UpgradeRegionsTableToVersion3.sql
similarity index 100%
rename from OpenSim/Framework/Data.MySQL/Resources/UpgradeRegionsTableToVersion3.sql
rename to OpenSim/Data/MySQL/Resources/UpgradeRegionsTableToVersion3.sql
diff --git a/OpenSim/Framework/Data.MySQL/Resources/UpgradeUsersTableToVersion2.sql b/OpenSim/Data/MySQL/Resources/UpgradeUsersTableToVersion2.sql
similarity index 100%
rename from OpenSim/Framework/Data.MySQL/Resources/UpgradeUsersTableToVersion2.sql
rename to OpenSim/Data/MySQL/Resources/UpgradeUsersTableToVersion2.sql
diff --git a/OpenSim/Framework/Data.MySQLMapper/MySQLDataReader.cs b/OpenSim/Data/MySQLMapper/MySQLDataReader.cs
similarity index 100%
rename from OpenSim/Framework/Data.MySQLMapper/MySQLDataReader.cs
rename to OpenSim/Data/MySQLMapper/MySQLDataReader.cs
diff --git a/OpenSim/Framework/Data.MySQLMapper/MySQLDatabaseMapper.cs b/OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs
similarity index 100%
rename from OpenSim/Framework/Data.MySQLMapper/MySQLDatabaseMapper.cs
rename to OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs
diff --git a/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs b/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs
similarity index 100%
rename from OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
rename to OpenSim/Data/SQLite/Properties/AssemblyInfo.cs
diff --git a/OpenSim/Framework/Data.SQLite/Resources/001_AssetStore.sql b/OpenSim/Data/SQLite/Resources/001_AssetStore.sql
similarity index 100%
rename from OpenSim/Framework/Data.SQLite/Resources/001_AssetStore.sql
rename to OpenSim/Data/SQLite/Resources/001_AssetStore.sql
diff --git a/OpenSim/Framework/Data.SQLite/Resources/001_InventoryStore.sql b/OpenSim/Data/SQLite/Resources/001_InventoryStore.sql
similarity index 100%
rename from OpenSim/Framework/Data.SQLite/Resources/001_InventoryStore.sql
rename to OpenSim/Data/SQLite/Resources/001_InventoryStore.sql
diff --git a/OpenSim/Framework/Data.SQLite/Resources/001_RegionStore.sql b/OpenSim/Data/SQLite/Resources/001_RegionStore.sql
similarity index 100%
rename from OpenSim/Framework/Data.SQLite/Resources/001_RegionStore.sql
rename to OpenSim/Data/SQLite/Resources/001_RegionStore.sql
diff --git a/OpenSim/Framework/Data.SQLite/Resources/001_UserStore.sql b/OpenSim/Data/SQLite/Resources/001_UserStore.sql
similarity index 100%
rename from OpenSim/Framework/Data.SQLite/Resources/001_UserStore.sql
rename to OpenSim/Data/SQLite/Resources/001_UserStore.sql
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
similarity index 100%
rename from OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs
rename to OpenSim/Data/SQLite/SQLiteAssetData.cs
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs b/OpenSim/Data/SQLite/SQLiteGridData.cs
similarity index 100%
rename from OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
rename to OpenSim/Data/SQLite/SQLiteGridData.cs
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
similarity index 100%
rename from OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
rename to OpenSim/Data/SQLite/SQLiteInventoryStore.cs
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteManager.cs b/OpenSim/Data/SQLite/SQLiteManager.cs
similarity index 100%
rename from OpenSim/Framework/Data.SQLite/SQLiteManager.cs
rename to OpenSim/Data/SQLite/SQLiteManager.cs
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
similarity index 100%
rename from OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
rename to OpenSim/Data/SQLite/SQLiteRegionData.cs
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
similarity index 100%
rename from OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
rename to OpenSim/Data/SQLite/SQLiteUserData.cs
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteUtils.cs b/OpenSim/Data/SQLite/SQLiteUtils.cs
similarity index 100%
rename from OpenSim/Framework/Data.SQLite/SQLiteUtils.cs
rename to OpenSim/Data/SQLite/SQLiteUtils.cs