diff --git a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseDataReader.cs b/OpenSim/Framework/Data.Base/BaseDataReader.cs
similarity index 100%
rename from ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseDataReader.cs
rename to OpenSim/Framework/Data.Base/BaseDataReader.cs
diff --git a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseDatabaseConnector.cs b/OpenSim/Framework/Data.Base/BaseDatabaseConnector.cs
similarity index 100%
rename from ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseDatabaseConnector.cs
rename to OpenSim/Framework/Data.Base/BaseDatabaseConnector.cs
diff --git a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseFieldMapper.cs b/OpenSim/Framework/Data.Base/BaseFieldMapper.cs
similarity index 100%
rename from ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseFieldMapper.cs
rename to OpenSim/Framework/Data.Base/BaseFieldMapper.cs
diff --git a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseRowMapper.cs b/OpenSim/Framework/Data.Base/BaseRowMapper.cs
similarity index 100%
rename from ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseRowMapper.cs
rename to OpenSim/Framework/Data.Base/BaseRowMapper.cs
diff --git a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseSchema.cs b/OpenSim/Framework/Data.Base/BaseSchema.cs
similarity index 100%
rename from ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseSchema.cs
rename to OpenSim/Framework/Data.Base/BaseSchema.cs
diff --git a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseTableMapper.cs b/OpenSim/Framework/Data.Base/BaseTableMapper.cs
similarity index 100%
rename from ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseTableMapper.cs
rename to OpenSim/Framework/Data.Base/BaseTableMapper.cs
diff --git a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.Base/Properties/AssemblyInfo.cs
similarity index 100%
rename from ThirdParty/TribalMedia/TribalMedia.Framework.Data/Properties/AssemblyInfo.cs
rename to OpenSim/Framework/Data.Base/Properties/AssemblyInfo.cs
diff --git a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/TribalMedia.Framework.Data.snk b/OpenSim/Framework/Data.Base/TribalMedia.Framework.Data.snk
similarity index 100%
rename from ThirdParty/TribalMedia/TribalMedia.Framework.Data/TribalMedia.Framework.Data.snk
rename to OpenSim/Framework/Data.Base/TribalMedia.Framework.Data.snk
diff --git a/prebuild.xml b/prebuild.xml
index 1af4e04b2e..17ae6aa591 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -155,7 +155,7 @@
       </Files>
     </Project>
 
-    <Project name="TribalMedia.Framework.Data" path="ThirdParty/TribalMedia/TribalMedia.Framework.Data" type="Library">
+    <Project name="OpenSim.Framework.Data.Base" path="OpenSim/Framework/Data.Base" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -197,7 +197,7 @@
       <Reference name="libsecondlife.dll"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="MySql.Data.dll"/>
-      <Reference name="TribalMedia.Framework.Data"/>
+      <Reference name="OpenSim.Framework.Data.Base"/>
       <Reference name="log4net"/>
       <Files>
         <Match pattern="*.cs" recurse="true"/>
@@ -722,7 +722,7 @@
       <Reference name="Microsoft.JScript"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="OpenSim.Framework.Communications"/>
-      <Reference name="TribalMedia.Framework.Data"/>
+      <Reference name="OpenSim.Framework.Data.Base"/>
       <Reference name="Nini.dll" />
       <Reference name="log4net"/>
       <Files>
@@ -1018,7 +1018,6 @@
       <Reference name="System.Data"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Data"/>
-      <!--      <Reference name="TribalMedia.Framework.Data"/> -->
       <Reference name="libsecondlife.dll"/>
       <Reference name="MySql.Data.dll"/>
       <Reference name="OpenSim.Framework.Console"/>