diff --git a/src/resources/common/Difficulty.java b/src/resources/datatables/Difficulty.java
similarity index 97%
rename from src/resources/common/Difficulty.java
rename to src/resources/datatables/Difficulty.java
index e1229723..ddb2f458 100644
--- a/src/resources/common/Difficulty.java
+++ b/src/resources/datatables/Difficulty.java
@@ -19,7 +19,7 @@
  * 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.common;
+package resources.datatables;
 
 public class Difficulty {
 	
diff --git a/src/resources/common/FactionStatus.java b/src/resources/datatables/FactionStatus.java
similarity index 97%
rename from src/resources/common/FactionStatus.java
rename to src/resources/datatables/FactionStatus.java
index 95a24034..7ab5ffdd 100644
--- a/src/resources/common/FactionStatus.java
+++ b/src/resources/datatables/FactionStatus.java
@@ -19,7 +19,7 @@
  * 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.common;
+package resources.datatables;
 
 public class FactionStatus {
 	
diff --git a/src/resources/common/Factions.java b/src/resources/datatables/Factions.java
similarity index 97%
rename from src/resources/common/Factions.java
rename to src/resources/datatables/Factions.java
index f748524b..4c70d5e4 100644
--- a/src/resources/common/Factions.java
+++ b/src/resources/datatables/Factions.java
@@ -19,7 +19,7 @@
  * 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.common;
+package resources.datatables;
 
 import engine.resources.common.CRC;
 
diff --git a/src/resources/common/Options.java b/src/resources/datatables/Options.java
similarity index 99%
rename from src/resources/common/Options.java
rename to src/resources/datatables/Options.java
index 5b8faa0e..b3ee62a3 100644
--- a/src/resources/common/Options.java
+++ b/src/resources/datatables/Options.java
@@ -19,7 +19,7 @@
  * 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.common;
+package resources.datatables;
 
 public class Options {
 	
diff --git a/src/resources/common/PvpStatus.java b/src/resources/datatables/PvpStatus.java
similarity index 97%
rename from src/resources/common/PvpStatus.java
rename to src/resources/datatables/PvpStatus.java
index e668ba56..ddded7a4 100644
--- a/src/resources/common/PvpStatus.java
+++ b/src/resources/datatables/PvpStatus.java
@@ -19,7 +19,7 @@
  * 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.common;
+package resources.datatables;
 
 public class PvpStatus {
 	
diff --git a/src/resources/common/StateStatus.java b/src/resources/datatables/StateStatus.java
similarity index 98%
rename from src/resources/common/StateStatus.java
rename to src/resources/datatables/StateStatus.java
index e97026c7..e805f7cb 100644
--- a/src/resources/common/StateStatus.java
+++ b/src/resources/datatables/StateStatus.java
@@ -19,7 +19,7 @@
  * 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.common;
+package resources.datatables;
 
 public class StateStatus {
 	// States.iff
diff --git a/src/services/CharacterService.java b/src/services/CharacterService.java
index 11025730..35140bf5 100644
--- a/src/services/CharacterService.java
+++ b/src/services/CharacterService.java
@@ -45,6 +45,7 @@ import engine.resources.scene.Quaternion;
 import engine.resources.service.INetworkDispatch;
 import engine.resources.service.INetworkRemoteEvent;
 import resources.common.*;
+import resources.datatables.Options;
 import protocol.swg.ClientCreateCharacter;
 import protocol.swg.ClientMfdStatusUpdateMessage;
 import protocol.swg.ClientRandomNameRequest;
diff --git a/src/services/gcw/GCWService.java b/src/services/gcw/GCWService.java
index e89c7e48..e3b34efb 100644
--- a/src/services/gcw/GCWService.java
+++ b/src/services/gcw/GCWService.java
@@ -43,8 +43,8 @@ import protocol.swg.GcwGroupsRsp;
 import protocol.swg.GcwRegionsReq;
 import protocol.swg.GcwRegionsRsp;
 
-import resources.common.FactionStatus;
 import resources.common.Opcodes;
+import resources.datatables.FactionStatus;
 import resources.gcw.CurrentServerGCWZoneHistory;
 import resources.gcw.CurrentServerGCWZonePercent;
 import resources.gcw.OtherServerGCWZonePercent;
diff --git a/src/services/spawn/SpawnService.java b/src/services/spawn/SpawnService.java
index 1b08bbf3..37eeca8f 100644
--- a/src/services/spawn/SpawnService.java
+++ b/src/services/spawn/SpawnService.java
@@ -37,9 +37,9 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import org.python.core.Py;
 
-import resources.common.Options;
-import resources.common.PvpStatus;
 import resources.common.collidables.CollidableCircle;
+import resources.datatables.Options;
+import resources.datatables.PvpStatus;
 import resources.objects.tangible.TangibleObject;
 import services.ai.LairActor;
 import engine.resources.scene.Planet;