diff --git a/OpenSim/Framework/AssetConfig.cs b/OpenSim/Framework/AssetConfig.cs
index 4074595eac..8a4ce92def 100644
--- a/OpenSim/Framework/AssetConfig.cs
+++ b/OpenSim/Framework/AssetConfig.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Framework
                                                 "Default Startup Message", "Welcome to OGS", false);
 
             configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
+                                                "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
 
             configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
                                                 "Http Listener port", DefaultHttpPort.ToString(), false);
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
index d850c20820..9519f176d2 100644
--- a/OpenSim/Framework/GridConfig.cs
+++ b/OpenSim/Framework/GridConfig.cs
@@ -90,7 +90,7 @@ namespace OpenSim.Framework
             configMember.addConfigurationOption("sim_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "Key to expect from a simulator", "null", false);
             configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
+                                                "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
 
             configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
                                                 "Http Listener port", DefaultHttpPort.ToString(), false);
diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs
index df1e90b0d0..7136efaa1e 100644
--- a/OpenSim/Framework/InventoryConfig.cs
+++ b/OpenSim/Framework/InventoryConfig.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Framework
             configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "Key to expect from user server", "null", false);
             configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "DLL for database provider", "OpenSim.Framework.Data.SQLite.dll", false);
+                                                "DLL for database provider", "OpenSim.Data.SQLite.dll", false);
             configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
                                                 "Http Listener port", DefaultHttpPort.ToString(), false);
         }
diff --git a/OpenSim/Framework/MessageServerConfig.cs b/OpenSim/Framework/MessageServerConfig.cs
index b903e80a6d..f15efa64df 100644
--- a/OpenSim/Framework/MessageServerConfig.cs
+++ b/OpenSim/Framework/MessageServerConfig.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Framework
                                                 "Key to expect from user server", "null", false);
 
             configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
+                                                "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
             
             configMember.addConfigurationOption("region_comms_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "DLL for comms provider", "OpenSim.Region.Communications.OGS1.dll", false);
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index 13c7bec45d..8335bba27a 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Framework
                                                 "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString() + "/",
                                                 false);
             configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
+                                                "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
 
             configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
                                                 "Http Listener port", DefaultHttpPort.ToString(), false);
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index e9027bac3b..5ca8cf760a 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -34,9 +34,9 @@ using libsecondlife;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Data;
+using OpenSim.Data;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.Data.MySQL;
+using OpenSim.Data.MySQL;
 
 namespace OpenSim.Grid.GridServer
 {
@@ -602,10 +602,10 @@ namespace OpenSim.Grid.GridServer
 
             foreach (KeyValuePair<string, IGridData> kvp in _plugins)
             {
-                //OpenSim.Framework.Data.MySQL.MySQLGridData dbengine = new OpenSim.Framework.Data.MySQL.MySQLGridData();
+                //OpenSim.Data.MySQL.MySQLGridData dbengine = new OpenSim.Data.MySQL.MySQLGridData();
                 try
                 {
-                    OpenSim.Framework.Data.MySQL.MySQLGridData mysqldata = (OpenSim.Framework.Data.MySQL.MySQLGridData)(kvp.Value);
+                    OpenSim.Data.MySQL.MySQLGridData mysqldata = (OpenSim.Data.MySQL.MySQLGridData)(kvp.Value);
                     //DataResponse insertResponse = mysqldata.DeleteProfile(TheSim);
                     DataResponse insertResponse = mysqldata.DeleteProfile(uuid);
                     switch (insertResponse)
@@ -720,7 +720,7 @@ namespace OpenSim.Grid.GridServer
             IList simProfileList = new ArrayList();
 
             bool fastMode = false; // MySQL Only
-            fastMode = (Config.DatabaseProvider == "OpenSim.Framework.Data.MySQL.dll");
+            fastMode = (Config.DatabaseProvider == "OpenSim.Data.MySQL.dll");
 
             if (fastMode)
             {
diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs
index c4e8a58241..1b16cb21b1 100644
--- a/OpenSim/Grid/MessagingServer/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer/MessageService.cs
@@ -36,7 +36,7 @@ using libsecondlife;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Data;
+using OpenSim.Data;
 using OpenSim.Framework.Servers;
 using FriendRights = libsecondlife.FriendRights;
 
diff --git a/OpenSim/Grid/MessagingServer/PresenceInformer.cs b/OpenSim/Grid/MessagingServer/PresenceInformer.cs
index 9e8b230a6e..f270bbe8d2 100644
--- a/OpenSim/Grid/MessagingServer/PresenceInformer.cs
+++ b/OpenSim/Grid/MessagingServer/PresenceInformer.cs
@@ -35,7 +35,7 @@ using libsecondlife;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Data;
+using OpenSim.Data;
 using OpenSim.Framework.Servers;
 
 namespace OpenSim.Grid.MessagingServer
diff --git a/OpenSim/Grid/MessagingServer/UserPresenceData.cs b/OpenSim/Grid/MessagingServer/UserPresenceData.cs
index a95083e6ff..4390903a40 100644
--- a/OpenSim/Grid/MessagingServer/UserPresenceData.cs
+++ b/OpenSim/Grid/MessagingServer/UserPresenceData.cs
@@ -30,7 +30,7 @@ using System.Collections;
 using System.Collections.Generic;
 using libsecondlife;
 using OpenSim.Framework;
-using OpenSim.Framework.Data;
+using OpenSim.Data;
 
 namespace OpenSim.Grid.MessagingServer
 {
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 7917118c29..5fad88ac8d 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -35,7 +35,7 @@ using Nwc.XmlRpc;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Data;
+using OpenSim.Data;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Statistics;
 using OpenSim.Framework.UserManagement;
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 9f1ad88f9f..be2aafd182 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -191,7 +191,7 @@ namespace OpenSim
                 config.Set("physical_prim", true);
                 config.Set("see_into_this_sim_from_neighbor", true);
                 config.Set("serverside_object_permissions", false);
-                config.Set("storage_plugin", "OpenSim.Framework.Data.SQLite.dll");
+                config.Set("storage_plugin", "OpenSim.Data.SQLite.dll");
                 config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
                 config.Set("storage_prim_inventories", true);
                 config.Set("startup_console_commands_file", String.Empty);
@@ -208,9 +208,9 @@ namespace OpenSim
             {
                 config.Set("accounts_authenticate", false);
                 config.Set("welcome_message", "Welcome to OpenSim");
-                config.Set("inventory_plugin", "OpenSim.Framework.Data.SQLite.dll");
-                config.Set("userDatabase_plugin", "OpenSim.Framework.Data.SQLite.dll");
-                config.Set("asset_plugin", "OpenSim.Framework.Data.SQLite.dll");
+                config.Set("inventory_plugin", "OpenSim.Data.SQLite.dll");
+                config.Set("userDatabase_plugin", "OpenSim.Data.SQLite.dll");
+                config.Set("asset_plugin", "OpenSim.Data.SQLite.dll");
                 config.Set("dump_assets_to_file", false);
             }
 
@@ -270,11 +270,11 @@ namespace OpenSim
 
                 m_permissions = startupConfig.GetBoolean("serverside_object_permissions", false);
 
-                m_storageDll = startupConfig.GetString("storage_plugin", "OpenSim.Framework.Data.SQLite.dll");
+                m_storageDll = startupConfig.GetString("storage_plugin", "OpenSim.Data.SQLite.dll");
                 if (m_storageDll == "OpenSim.DataStore.MonoSqlite.dll") 
                 {
-                    m_storageDll = "OpenSim.Framework.Data.SQLite.dll";
-                    Console.WriteLine("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Framework.Data.SQLite.dll.");
+                    m_storageDll = "OpenSim.Data.SQLite.dll";
+                    Console.WriteLine("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Data.SQLite.dll.");
                     Thread.Sleep(3000);
                 }
                 m_storageConnectionString
@@ -297,11 +297,11 @@ namespace OpenSim
                 m_standaloneAuthenticate = standaloneConfig.GetBoolean("accounts_authenticate", false);
                 m_standaloneWelcomeMessage = standaloneConfig.GetString("welcome_message", "Welcome to OpenSim");
                 m_standaloneInventoryPlugin =
-                    standaloneConfig.GetString("inventory_plugin", "OpenSim.Framework.Data.SQLite.dll");
+                    standaloneConfig.GetString("inventory_plugin", "OpenSim.Data.SQLite.dll");
                 m_standaloneUserPlugin =
-                    standaloneConfig.GetString("userDatabase_plugin", "OpenSim.Framework.Data.SQLite.dll");
+                    standaloneConfig.GetString("userDatabase_plugin", "OpenSim.Data.SQLite.dll");
                 m_standaloneAssetPlugin =
-                    standaloneConfig.GetString("asset_plugin", "OpenSim.Framework.Data.SQLite.dll");
+                    standaloneConfig.GetString("asset_plugin", "OpenSim.Data.SQLite.dll");
 
                 m_dumpAssetsToFile = standaloneConfig.GetBoolean("dump_assets_to_file", false);
             }
diff --git a/OpenSim/Region/Environment/Modules/AppearanceTableMapper.cs b/OpenSim/Region/Environment/Modules/AppearanceTableMapper.cs
index cdbd6a0842..53539526fc 100644
--- a/OpenSim/Region/Environment/Modules/AppearanceTableMapper.cs
+++ b/OpenSim/Region/Environment/Modules/AppearanceTableMapper.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Text;
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Framework;
-using OpenSim.Framework.Data.Base;
+using OpenSim.Data.Base;
 
 namespace OpenSim.Region.Environment.Modules
 {
diff --git a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
index 59490ba039..cb94021086 100644
--- a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
@@ -33,10 +33,10 @@ using libsecondlife;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Data.MySQLMapper;
+using OpenSim.Data.MySQLMapper;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
-using OpenSim.Framework.Data.Base;
+using OpenSim.Data.Base;
 
 namespace OpenSim.Region.Environment.Modules
 {
diff --git a/OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs b/OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs
index 579ee0116f..d6ef1fb199 100644
--- a/OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs
+++ b/OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Text;
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Framework;
-using OpenSim.Framework.Data.Base;
+using OpenSim.Data.Base;
 
 namespace OpenSim.Region.Modules.AvatarFactory
 {
diff --git a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
index b122753cb2..f413fb9e84 100644
--- a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
@@ -34,8 +34,8 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
-using OpenSim.Framework.Data.Base;
-using OpenSim.Framework.Data.MapperFactory;
+using OpenSim.Data.Base;
+using OpenSim.Data.MapperFactory;
 
 namespace OpenSim.Region.Modules.AvatarFactory
 {
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
index 12d6871397..3eaf5aa8ee 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
@@ -33,7 +33,7 @@ using System.IO;
 using libsecondlife;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Data;
+using OpenSim.Data;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 
diff --git a/OpenSim/Tests/Inventory/TestInventory.cs b/OpenSim/Tests/Inventory/TestInventory.cs
index 5906b8f902..c1351d9426 100644
--- a/OpenSim/Tests/Inventory/TestInventory.cs
+++ b/OpenSim/Tests/Inventory/TestInventory.cs
@@ -32,9 +32,9 @@ using NUnit.Framework;
 
 using libsecondlife;
 using OpenSim.Framework.Types;
-using OpenSim.Framework.Data;
-using OpenSim.Framework.Data.SQLite;
-using OpenSim.Framework.Data.MySQL;
+using OpenSim.Data;
+using OpenSim.Data.SQLite;
+using OpenSim.Data.MySQL;
 using OpenSim.Framework.Console;
 
 namespace OpenSim.Test.Inventory