diff --git a/README.md b/README.md
index 3e0c981..f75df01 100644
--- a/README.md
+++ b/README.md
@@ -3,10 +3,14 @@ ConsoleChat
 
 This program was made as a personal project to learn Java network programming. The concept of it is rather simple, all it does is send messages to a server which, in turn, sends the message to everyone else (aside from some other commands added). Although the license is MIT, please consider also disclosing the source-code under an open-source license. It helps to give back to the community and help others just like this may have helped you.
 
-###Compilation
-_Compile in the corresponding directory._
+###Compiling
+To compile the source code, make sure you have JDK and Apache Ant installed. Then run the following command:
+```
+$ ant jar
+```
 
-```
-$ javac Server.java
-$ javac Client.java
-```
+###Contributing
+To contribute to the project, simply open a pull request and I'll make sure to get back to you as soon as possible.
+
+###License
+This program is licensed with an [MIT license](/LICENSE). However, please take into account that you took from the community, and you should make sure to give back.
diff --git a/build.xml b/build.xml
new file mode 100644
index 0000000..988a1cd
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,31 @@
+<project name="ConsoleChat" basedir="." default="main" >
+	<property name="src.dir" value="src" />
+	<property name="bin.dir" value="bin" />
+	<property name="classes.dir" value="${bin.dir}/classes" />
+	<property name="jar.dir" value="${bin.dir}/jar" />
+	<property name="main-class-client" value="consolechat.client.Client" />
+	<property name="main-class-server" value="consolechat.server.Server" />
+	
+	<target name="clean" >
+		<delete dir="bin" />
+	</target>
+	
+	<target name="compile" >
+		<mkdir dir="${classes.dir}" />
+		<javac srcdir="${src.dir}" destdir="${classes.dir}" />
+	</target>
+	
+	<target name="jar" depends="compile" >
+		<mkdir dir="${jar.dir}" />
+		<jar destfile="${jar.dir}/${ant.project.name}-client.jar" basedir="${classes.dir}" >
+			<manifest>
+				<attribute name="Main-Class" value="${main-class-client}" />
+			</manifest>
+		</jar>
+		<jar destfile="${jar.dir}/${ant.project.name}-server.jar" basedir="${classes.dir}" >
+			<manifest>
+				<attribute name="Main-Class" value="${main-class-server}" />
+			</manifest>
+		</jar>
+	</target>
+</project>
diff --git a/src-client/Client.java b/src/consolechat/client/Client.java
similarity index 99%
rename from src-client/Client.java
rename to src/consolechat/client/Client.java
index 10fa773..13126eb 100644
--- a/src-client/Client.java
+++ b/src/consolechat/client/Client.java
@@ -1,3 +1,5 @@
+package consolechat.client;
+
 import java.net.*;
 import java.io.*;
 import java.lang.*;
diff --git a/src-client/ClientThread.java b/src/consolechat/client/ClientThread.java
similarity index 97%
rename from src-client/ClientThread.java
rename to src/consolechat/client/ClientThread.java
index f90fb60..6604f59 100644
--- a/src-client/ClientThread.java
+++ b/src/consolechat/client/ClientThread.java
@@ -1,3 +1,5 @@
+package consolechat.client;
+
 import java.io.*;
 import java.net.*;
 
diff --git a/src-server/Server.java b/src/consolechat/server/Server.java
similarity index 99%
rename from src-server/Server.java
rename to src/consolechat/server/Server.java
index e2e2937..1092cb2 100644
--- a/src-server/Server.java
+++ b/src/consolechat/server/Server.java
@@ -1,3 +1,5 @@
+package consolechat.server;
+
 import java.net.*;
 import java.io.*;
 import java.util.*;
diff --git a/src-server/ServerThread.java b/src/consolechat/server/ServerThread.java
similarity index 99%
rename from src-server/ServerThread.java
rename to src/consolechat/server/ServerThread.java
index 97c88a5..a086adb 100644
--- a/src-server/ServerThread.java
+++ b/src/consolechat/server/ServerThread.java
@@ -1,3 +1,5 @@
+package consolechat.server;
+
 import java.net.*;
 import java.io.*;