diff --git a/OpenMetaverseCore/CapsToPacket.cs b/OpenMetaverse/CapsToPacket.cs
similarity index 100%
rename from OpenMetaverseCore/CapsToPacket.cs
rename to OpenMetaverse/CapsToPacket.cs
diff --git a/OpenMetaverseCore/Helpers.cs b/OpenMetaverse/Helpers.cs
similarity index 100%
rename from OpenMetaverseCore/Helpers.cs
rename to OpenMetaverse/Helpers.cs
diff --git a/OpenMetaverseCore/_Packets_.cs b/OpenMetaverse/_Packets_.cs
similarity index 99%
rename from OpenMetaverseCore/_Packets_.cs
rename to OpenMetaverse/_Packets_.cs
index e31009cd..01894e97 100644
--- a/OpenMetaverseCore/_Packets_.cs
+++ b/OpenMetaverse/_Packets_.cs
@@ -28,6 +28,22 @@ using System;
 using System.Text;
 using OpenMetaverse;
 
+namespace OpenMetaverse
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public enum PacketFrequency : byte
+    {
+        /// <summary></summary>
+        Low,
+        /// <summary></summary>
+        Medium,
+        /// <summary></summary>
+        High
+    }
+}
+    
 namespace OpenMetaverse.Packets
 {
     /// <summary>
diff --git a/OpenMetaverseCore/AssemblyInfo.cs b/OpenMetaverseCore/AssemblyInfo.cs
deleted file mode 100644
index ae3a15d1..00000000
--- a/OpenMetaverseCore/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenMetaverse Networking Core")]
-[assembly: AssemblyDescription("The OpenMetaverse Network abstraction library")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("OpenMetaverse")]
-[assembly: AssemblyProduct("libOpenMetaverse")]
-[assembly: AssemblyCopyright("2009 OpenMetaverse Foundation")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("71acd58b-2794-4ba7-982c-f08568881067")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-[assembly: AssemblyVersion("0.0.0.*")]
-[assembly: AssemblyFileVersion("0.0.0.0")]
diff --git a/OpenMetaverseCore/CoreTypes.cs b/OpenMetaverseCore/CoreTypes.cs
deleted file mode 100644
index d289efae..00000000
--- a/OpenMetaverseCore/CoreTypes.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace OpenMetaverse
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public enum PacketFrequency : byte
-    {
-        /// <summary></summary>
-        Low,
-        /// <summary></summary>
-        Medium,
-        /// <summary></summary>
-        High
-    }    
-}
diff --git a/Programs/mapgenerator/template.cs b/Programs/mapgenerator/template.cs
index 74ade038..40c3f2f0 100644
--- a/Programs/mapgenerator/template.cs
+++ b/Programs/mapgenerator/template.cs
@@ -28,6 +28,22 @@ using System;
 using System.Text;
 using OpenMetaverse;
 
+namespace OpenMetaverse
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public enum PacketFrequency : byte
+    {
+        /// <summary></summary>
+        Low,
+        /// <summary></summary>
+        Medium,
+        /// <summary></summary>
+        High
+    }
+}
+    
 namespace OpenMetaverse.Packets
 {
     /// <summary>
diff --git a/mapgen.bat b/mapgen.bat
index 95f8b18b..ab69895a 100644
--- a/mapgen.bat
+++ b/mapgen.bat
@@ -1 +1 @@
-"bin/mapgenerator.exe" data/message_template.msg Programs/mapgenerator/template.cs Programs/mapgenerator/unusedpackets.txt OpenMetaverseCore/_Packets_.cs
\ No newline at end of file
+"bin/mapgenerator.exe" data/message_template.msg Programs/mapgenerator/template.cs Programs/mapgenerator/unusedpackets.txt OpenMetaverse/_Packets_.cs
\ No newline at end of file
diff --git a/prebuild.xml b/prebuild.xml
index 70f61f24..504df204 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -146,32 +146,6 @@
       </Files>
     </Project>
 
-	<Project name="OpenMetaverseCore" path="OpenMetaverseCore" type="Library" rootNamespace="OpenMetaverse" frameworkVersion="v3_5">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../bin/</OutputPath>
-          <XmlDocFile>OpenMetaverseCore.XML</XmlDocFile>
-        </Options>
-      </Configuration>
-
-      <ReferencePath>../bin/</ReferencePath>
-      <Reference name="System"/>
-      <Reference name="System.Xml"/>
-      <Reference name="System.Core"/>
-      <Reference name="System.Data"/>
-      <Reference name="OpenMetaverseTypes"/>
-      <Reference name="OpenMetaverse.StructuredData"/>
-      <Reference name="log4net"/>      
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-
     <Project name="OpenMetaverse" path="OpenMetaverse" type="Library" rootNamespace="OpenMetaverse" frameworkVersion="v3_5">
       <Configuration name="Debug">
         <Options>
@@ -191,7 +165,6 @@
       <Reference name="System.Xml"/>
       <Reference name="System.Data"/>
       <Reference name="System.Drawing"/>
-      <Reference name="OpenMetaverseCore"/>
       <Reference name="OpenMetaverseTypes"/>
       <Reference name="OpenMetaverse.StructuredData"/>
       <Reference name="OpenMetaverse.Http"/>
@@ -221,7 +194,6 @@
       <Reference name="System.Xml"/>
       <Reference name="System.Data"/>
       <Reference name="OpenMetaverse"/>
-      <Reference name="OpenMetaverseCore"/>      
       <Reference name="OpenMetaverseTypes"/>
       <Reference name="OpenMetaverse.StructuredData"/>
       <Reference name="OpenMetaverse.Http"/>
@@ -248,7 +220,6 @@
       <Reference name="System.Data"/>
       <Reference name="nunit.framework.dll"/>
       <Reference name="OpenMetaverse"/>
-      <Reference name="OpenMetaverseCore"/>      
       <Reference name="OpenMetaverseTypes"/>
       <Reference name="OpenMetaverse.StructuredData"/>
       <Files>
@@ -272,7 +243,6 @@
       <Reference name="System"/>
       <Reference name="System.Xml"/>
       <Reference name="OpenMetaverse"/>
-      <Reference name="OpenMetaverseCore"/>
       <Reference name="OpenMetaverseTypes"/>
       <Reference name="OpenMetaverse.StructuredData"/>
       <Reference name="OpenMetaverse.Http"/>
@@ -366,7 +336,6 @@
       <Reference name="System.Data"/>
       <Reference name="System.Drawing"/>
       <Reference name="System.Windows.Forms"/>
-      <Reference name="OpenMetaverseCore"/>
       <Reference name="OpenMetaverse"/>
       <Reference name="OpenMetaverseTypes"/>
       <Files>
@@ -425,7 +394,6 @@
       <Reference name="System.Drawing"/>
       <Reference name="System.Windows.Forms"/>
       <Reference name="OpenMetaverse"/>
-      <Reference name="OpenMetaverseCore"/>      
       <Reference name="OpenMetaverseTypes"/>
 
       <Files>
@@ -452,7 +420,6 @@
       <Reference name="System"/>
       <Reference name="System.Drawing"/>
       <Reference name="OpenMetaverse"/>
-      <Reference name="OpenMetaverseCore"/>      
       <Reference name="OpenMetaverseTypes"/>
       <Reference name="OpenMetaverse.Http"/>
 
@@ -554,7 +521,6 @@
       <Reference name="GlacialList"/>
       <Reference name="ICSharpCode.SharpZipLib"/>
       <Reference name="OpenMetaverse"/>
-      <Reference name="OpenMetaverseCore"/>      
       <Reference name="OpenMetaverseTypes"/>
       <Reference name="OpenMetaverse.StructuredData"/>
 
@@ -584,7 +550,6 @@
       <Reference name="System.Drawing"/>
       <Reference name="System.Windows.Forms"/>
       <Reference name="OpenMetaverse"/>
-      <Reference name="OpenMetaverseCore"/>      
       <Reference name="OpenMetaverseTypes"/>
       <Reference name="OpenMetaverse.Http"/>
 
@@ -639,7 +604,6 @@
       <Reference name="System.Drawing"/>
       <Reference name="System.Windows.Forms"/>
       <Reference name="OpenMetaverse"/>
-      <Reference name="OpenMetaverseCore"/>      
       <Reference name="OpenMetaverseTypes"/>
       <Reference name="OpenMetaverse.Http"/>
       <Reference name="OpenMetaverse.StructuredData"/>
@@ -670,7 +634,6 @@
       <Reference name="System"/>
       <Reference name="System.Xml"/>
       <Reference name="OpenMetaverse"/>
-      <Reference name="OpenMetaverseCore"/>      
       <Reference name="OpenMetaverseTypes"/>
 
       <Files>
@@ -693,7 +656,6 @@
       <ReferencePath>../../bin/</ReferencePath>
       <Reference name="System"/>
       <Reference name="OpenMetaverse"/>
-      <Reference name="OpenMetaverseCore"/>      
       <Reference name="OpenMetaverseTypes"/>
       <Reference name="OpenMetaverse.Utilities"/>
 
@@ -722,7 +684,6 @@
       <Reference name="System.Drawing"/>
       <Reference name="System.Windows.Forms"/>
       <Reference name="OpenMetaverse"/>
-      <Reference name="OpenMetaverseCore"/>      
       <Reference name="OpenMetaverseTypes"/>
 
       <Files>
@@ -779,7 +740,6 @@
       <Reference name="System.Drawing"/>
       <Reference name="System.Windows.Forms"/>
       <Reference name="OpenMetaverse"/>
-      <Reference name="OpenMetaverseCore"/>      
       <Reference name="OpenMetaverseTypes"/>
 
       <Files>
@@ -805,7 +765,6 @@
       <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System"/>
       <Reference name="OpenMetaverse"/>
-      <Reference name="OpenMetaverseCore"/>
       <Reference name="OpenMetaverseTypes"/>
 
       <Files>
@@ -830,7 +789,6 @@
       <Reference name="System.Xml"/>
       <Reference name="System.Web"/>
       <Reference name="System.Drawing"/>
-      <Reference name="OpenMetaverseCore"/>      
       <Reference name="OpenMetaverse"/>
       <Reference name="OpenMetaverseTypes"/>
       <Reference name="OpenMetaverse.Utilities"/>