Index: .classpath
===================================================================
--- .classpath	(revision 3a0d46809595cba3e6e5e24d2930e67a60a5d479)
+++ .classpath	(revision b87af8aab304d2d0bd8648476e981efa2b450350)
@@ -4,4 +4,5 @@
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="src" path="gen"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/galconcommon"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: src/com/example/helloandroid/ClientThread.java
===================================================================
--- src/com/example/helloandroid/ClientThread.java	(revision 3a0d46809595cba3e6e5e24d2930e67a60a5d479)
+++ src/com/example/helloandroid/ClientThread.java	(revision b87af8aab304d2d0bd8648476e981efa2b450350)
@@ -1,3 +1,5 @@
 package com.example.helloandroid;
+
+import common.*;
 
 /*
Index: c/com/example/helloandroid/Connection.java
===================================================================
--- src/com/example/helloandroid/Connection.java	(revision 3a0d46809595cba3e6e5e24d2930e67a60a5d479)
+++ 	(revision )
@@ -1,155 +1,0 @@
-package com.example.helloandroid;
-import java.net.*;
-import java.io.*;
-
-
-/*
- * This class serves as a basis for the threads that the other projects use to listen to incoming messages over a network. The most important
- * method, run, initializes a connection based on the constructor arguments and calls different methods depending on the result, which could
- * range from a successful connection, to an unsuccessful one, to one that gets interrupted later on. Any class inheriting this one simply
- * has to extend the methods called in run and the processMessage method to customize the behavior in different situations.
- */
-
-public class Connection extends Thread {
-	private boolean connected;
-	private boolean interrupted;
-	private String ip;
-	private int port;
-    private Socket socket;
-    private PrintWriter out;
-    private BufferedReader in;
-
-    public Connection(String ip, int port, String threadName) {
-    	super(threadName);
-    	
-    	connected = false;
-    	interrupted = false;
-    	socket = null;
-    	this.ip = ip;
-    	this.port = port;
-    }
-    
-    public Connection(Socket socket, String threadName) {
-    	super(threadName);
-    	
-    	connected = false;
-    	interrupted = false;
-    	this.socket = socket;
-    }
-    
-    public static boolean isConnected(Connection obj) {
-    	return obj != null && obj.connected;
-    }
-    
-    protected PrintWriter getOut() {
-    	return out;
-    }
-    
-    protected BufferedReader getIn() {
-    	return in;
-    }
-    
-    public void interrupt() {
-    	interrupted = true;
-    }
-    
-    public void closeConnection() {
-    	try {
-    		if(connected) {
-    			connected = false;
-	    		socket.close();
-		    	out.close();
-		    	in.close();
-    		}
-    	} catch(IOException ioe) {
-    		ioe.printStackTrace();
-    	}
-    }
-    
-    protected void sendMessage(MessageType type, String input) {
-		out.println(type);
-		out.println(input);
-    }
-    
-    protected void processMessage(MessageType type, String input) {
-    	
-    }
-    
-    protected void connectionStart() {
-    	
-    }
-    
-    protected void connectionSuccess() {
-    	
-    }
-    
-    protected void connectionFailure(String str) {
-    	
-    }
-    
-    protected void connectionBreak() {
-    	
-    }
-    
-    protected void peerDisconnect() {
-    	
-    }
-    
-    protected void connectionEnd() {
-    	
-    }
-    
-    public void run() {
-    	String strType, str;
-    	
-    	try {
-    		connectionStart();
-    		if(socket == null) {
-    			connectionFailure("about to make new socket");
-    			socket = new Socket(ip, port);
-    		}
-    		connectionFailure("made new socket");
-    		if(!interrupted) {
-    			out = new PrintWriter(socket.getOutputStream(), true);
-    			in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
-            	connected = true;
-            	connectionSuccess();
-    		}
-    		connectionFailure("end of connection");
-    	}catch(UnknownHostException uhe) {
-    		if(!interrupted)
-    			connectionFailure("UnknownHostException");
-    	}catch(ConnectException ce) {
-    		if(!interrupted)
-    			connectionFailure("ConnectException");
-    	}catch(IOException ioe) {
-    		if(!interrupted)
-    			ioe.printStackTrace();
-    		connectionFailure("IOException");
-    	}catch(Exception e) {
-    		connectionFailure("Exception");
-    	}catch(Throwable e) {
-    		connectionFailure("Throwable");
-    	}
-    	connectionFailure("finished connection");
-    	
-    	if(interrupted)
-    		closeConnection();
-    		
-    	try{
-    		while(connected && (strType = in.readLine()) != null && (str = in.readLine()) != null) {
-	    		processMessage(MessageType.valueOf(strType), str);
-	    	}
-    		if(connected)
-    			peerDisconnect();
-		}catch(SocketException se) {
-			if(connected)
-				connectionBreak();
-		}catch(IOException ioe) {
-			ioe.printStackTrace();
-		}
-
-		closeConnection();
-		connectionEnd();
-	}
-}
Index: c/com/example/helloandroid/MessageType.java
===================================================================
--- src/com/example/helloandroid/MessageType.java	(revision 3a0d46809595cba3e6e5e24d2930e67a60a5d479)
+++ 	(revision )
@@ -1,28 +1,0 @@
-package com.example.helloandroid;
-
-
-public enum MessageType {
-	Admin,				//used
-	StartServer,		//used
-	StopServer,			//used
-	Info,				//used
-	Chat,				//used
-    Channel,			//used
-    Login,				//used
-    Create,				//used
-    LoadStart,			//used
-    LoadEnd,			//used
-    LoadMap,			//used
-    Registered,			//used
-    PlayerJoined,		//used
-    PlayerLeft,			//used
-    State,
-    Movement,			//used
-    Target,
-    Creature,
-    StatChange,
-    Item,
-    RegisteredItem,
-    Inventory,
-    Upgrade
-}