diff --git a/src/resources/client_info/ClientFactory.java b/src/resources/client_info/ClientFactory.java
index 3f75eb7d3..18628fa2f 100644
--- a/src/resources/client_info/ClientFactory.java
+++ b/src/resources/client_info/ClientFactory.java
@@ -39,6 +39,8 @@ import resources.client_info.visitors.SlotDefinitionData;
 import resources.client_info.visitors.SlotDescriptorData;
 
 public class ClientFactory extends DataFactory {
+	private static ClientFactory instance;
+
 	private Map <String, ClientData> dataMap = new HashMap<>();
 	private Map <String, String> typeMap = new HashMap<>();
 	
@@ -167,6 +169,12 @@ public class ClientFactory extends DataFactory {
 
 	@Override
 	protected String getFolder() {
-		return "./DataObject/";
+		return "./clientdata/";
+	}
+
+	private static ClientFactory getInstance() {
+		if (instance == null)
+			instance = new ClientFactory();
+		return instance;
 	}
 }
diff --git a/src/resources/client_info/DataFactory.java b/src/resources/client_info/DataFactory.java
index 4e5e59827..376c742fa 100644
--- a/src/resources/client_info/DataFactory.java
+++ b/src/resources/client_info/DataFactory.java
@@ -39,11 +39,6 @@ import java.nio.ByteOrder;
  * Created by Waverunner on 6/9/2015
  */
 public abstract class DataFactory {
-	private static DataFactory instance;
-
-	public DataFactory() {
-		instance = this;
-	}
 
 	private ClientData getFileType(ByteBuffer bb) {
 		bb.position(8); // Skip the first FORM and data size
@@ -60,7 +55,7 @@ public abstract class DataFactory {
 		try {
 			File f = new File(getFolder() + file);
 			if (!f.exists()) {
-				System.out.println(file + " not found!");
+				System.out.println(getFolder() + file + " not found!");
 				return null;
 			}
 
@@ -140,8 +135,4 @@ public abstract class DataFactory {
 
 	protected abstract ClientData createDataObject(String type);
 	protected abstract String getFolder();
-
-	protected static DataFactory getInstance() {
-		return instance;
-	}
 }
diff --git a/src/resources/client_info/ServerFactory.java b/src/resources/client_info/ServerFactory.java
index d2ac2a4a9..a0b1074a4 100644
--- a/src/resources/client_info/ServerFactory.java
+++ b/src/resources/client_info/ServerFactory.java
@@ -34,6 +34,7 @@ import resources.client_info.visitors.DatatableData;
  * Created by Waverunner on 6/9/2015
  */
 public final class ServerFactory extends DataFactory {
+	private static ServerFactory instance;
 
 	public static DatatableData getDatatable(String file) {
 		ClientData data = getInstance().readFile(file);
@@ -50,4 +51,10 @@ public final class ServerFactory extends DataFactory {
 	protected String getFolder() {
 		return "./serverdata/";
 	}
+
+	private static ServerFactory getInstance() {
+		if (instance == null)
+			instance = new ServerFactory();
+		return instance;
+	}
 }
diff --git a/src/services/map/MapService.java b/src/services/map/MapService.java
index d47affac4..33a9a107d 100644
--- a/src/services/map/MapService.java
+++ b/src/services/map/MapService.java
@@ -28,6 +28,7 @@
 package services.map;
 
 import com.sun.corba.se.spi.activation.Server;
+import com.sun.deploy.util.SessionState;
 import intents.network.GalacticPacketIntent;
 import network.packets.Packet;
 import network.packets.swg.SWGPacket;
@@ -131,7 +132,7 @@ public class MapService extends Service {
 	}
 
 	private void loadMapCategories() {
-		DatatableData table = ServerFactory.getDatatable("datatables/player/planet_map_cat.iff");
+		DatatableData table = (DatatableData) ClientFactory.getInfoFromFile("datatables/player/planet_map_cat.iff");
 		for (int row = 0; row < table.getRowCount(); row++) {
 			MapCategory category = new MapCategory();
 			category.setName(table.getCell(row, 0).toString());