diff --git a/src/resources/objects/cell/CellObject.java b/src/resources/objects/cell/CellObject.java
index 60aad61e..32f1e86b 100644
--- a/src/resources/objects/cell/CellObject.java
+++ b/src/resources/objects/cell/CellObject.java
@@ -22,17 +22,17 @@
 package resources.objects.cell;
 
 import protocol.swg.UpdateCellPermissionMessage;
-import resources.objects.object.BaseObject;
 
 import com.sleepycat.persist.model.NotPersistent;
 import com.sleepycat.persist.model.Persistent;
 import engine.clients.Client;
+import engine.resources.objects.SWGObject;
 import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
 
 @Persistent(version=0)
-public class CellObject extends BaseObject {
+public class CellObject extends SWGObject {
 	
 	private int cellNumber = 0;
 	@NotPersistent
diff --git a/src/resources/objects/intangible/IntangibleObject.java b/src/resources/objects/intangible/IntangibleObject.java
index a1f5e897..23801ed6 100644
--- a/src/resources/objects/intangible/IntangibleObject.java
+++ b/src/resources/objects/intangible/IntangibleObject.java
@@ -21,17 +21,16 @@
  ******************************************************************************/
 package resources.objects.intangible;
 
-import resources.objects.object.BaseObject;
-
 import com.sleepycat.persist.model.Persistent;
 
 import engine.clients.Client;
+import engine.resources.objects.SWGObject;
 import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
 
 @Persistent(version=0)
-public class IntangibleObject extends BaseObject {
+public class IntangibleObject extends SWGObject {
 	
 	private int genericInt;
 	
diff --git a/src/resources/objects/object/BaseObject.java b/src/resources/objects/object/BaseObject.java
deleted file mode 100644
index fb88ce01..00000000
--- a/src/resources/objects/object/BaseObject.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 <Project SWG>
- * 
- * This File is part of NGECore2.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. 
- * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination.
- ******************************************************************************/
-package resources.objects.object;
-
-import com.sleepycat.persist.model.Persistent;
-
-import engine.clients.Client;
-import engine.resources.objects.SWGObject;
-import engine.resources.scene.Planet;
-import engine.resources.scene.Point3D;
-import engine.resources.scene.Quaternion;
-
-@Persistent(version=0)
-public class BaseObject extends SWGObject {
-	
-	public BaseObject(long objectID, Planet planet, Point3D position, Quaternion orientation, String Template) {
-		super(objectID, planet, position, orientation, Template);
-	}
-	
-	public BaseObject() {
-		super();
-	}
-
-	@Override
-	public void sendBaselines(Client arg0) {
-		// TODO Auto-generated method stub
-		
-	}
-
-}
diff --git a/src/resources/objects/staticobject/StaticObject.java b/src/resources/objects/staticobject/StaticObject.java
index 3ee2ab23..53297b00 100644
--- a/src/resources/objects/staticobject/StaticObject.java
+++ b/src/resources/objects/staticobject/StaticObject.java
@@ -21,18 +21,17 @@
  ******************************************************************************/
 package resources.objects.staticobject;
 
-import resources.objects.object.BaseObject;
-
 import com.sleepycat.persist.model.NotPersistent;
 import com.sleepycat.persist.model.Persistent;
 
 import engine.clients.Client;
+import engine.resources.objects.SWGObject;
 import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
 
 @Persistent(version=0)
-public class StaticObject extends BaseObject {
+public class StaticObject extends SWGObject {
 	
 	@NotPersistent
 	private StaticMessageBuilder messageBuilder;
diff --git a/src/resources/objects/tangible/TangibleObject.java b/src/resources/objects/tangible/TangibleObject.java
index 312b51c2..2b89cd36 100644
--- a/src/resources/objects/tangible/TangibleObject.java
+++ b/src/resources/objects/tangible/TangibleObject.java
@@ -33,19 +33,19 @@ import protocol.swg.UpdatePVPStatusMessage;
 import protocol.swg.objectControllerObjects.ShowFlyText;
 
 import resources.common.RGB;
-import resources.objects.object.BaseObject;
 import resources.objects.creature.CreatureObject;
 
 import com.sleepycat.persist.model.NotPersistent;
 import com.sleepycat.persist.model.Persistent;
 
 import engine.clients.Client;
+import engine.resources.objects.SWGObject;
 import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
 
 @Persistent(version=0)
-public class TangibleObject extends BaseObject {
+public class TangibleObject extends SWGObject {
 	
 	// TODO: Thread safety
 	
diff --git a/src/resources/objects/universe/UniverseObject.java b/src/resources/objects/universe/UniverseObject.java
index 021082ef..723d5a1e 100644
--- a/src/resources/objects/universe/UniverseObject.java
+++ b/src/resources/objects/universe/UniverseObject.java
@@ -23,13 +23,14 @@ package resources.objects.universe;
 
 import com.sleepycat.persist.model.Persistent;
 
+import engine.clients.Client;
+import engine.resources.objects.SWGObject;
 import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
-import resources.objects.object.BaseObject;
 
 @Persistent(version=0)
-public class UniverseObject extends BaseObject {
+public class UniverseObject extends SWGObject {
 	
 	public UniverseObject(long objectID, Planet planet, Point3D position, Quaternion orientation, String Template) {
 		super(objectID, planet, position, orientation, Template);
@@ -38,5 +39,11 @@ public class UniverseObject extends BaseObject {
 	public UniverseObject() {
 		super();
 	}
+
+	@Override
+	public void sendBaselines(Client arg0) {
+		// TODO Auto-generated method stub
+		
+	}
 	
 }
diff --git a/src/resources/objects/weapon/WeaponObject.java b/src/resources/objects/weapon/WeaponObject.java
index f893a030..8caa651e 100644
--- a/src/resources/objects/weapon/WeaponObject.java
+++ b/src/resources/objects/weapon/WeaponObject.java
@@ -21,21 +21,17 @@
  ******************************************************************************/
 package resources.objects.weapon;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import resources.objects.tangible.TangibleObject;
 
 import com.sleepycat.persist.model.NotPersistent;
 import com.sleepycat.persist.model.Persistent;
 
 import engine.clients.Client;
-import engine.resources.objects.SWGObject;
 import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
 
-@Persistent(version=1)
+@Persistent(version=0)
 public class WeaponObject extends TangibleObject {
 	
 	// TODO: Thread safety