diff --git a/.classpath b/.classpath
deleted file mode 100644
index a35cd9e..0000000
--- a/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="lib" path="lib/jdom_0.9.jar"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/.project b/.project
deleted file mode 100644
index 605a36b..0000000
--- a/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>justCheckers</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/README.rst b/README.rst
new file mode 100644
index 0000000..7d3020c
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,26 @@
+======================
+justCheckers - README!
+======================
+
+About the Project
+-----------------
+
+*justCheckers* is an advanced open source checkers game for Android. The aim of 
+the project is to make a game capable of supporting:
+
+- Skinning
+- Network Games
+- Computer Opponents
+- Various Rules and Internationalizations
+- Cross platform (both OS and input types)
+
+Current Progress
+----------------
+
+The *justCheckers* project is in the middle of a general overhaul of the codebase to allow for a more modern approach.  Both the game engine needs to get decoupled from the platform specific code.
+
+Links
+-----
+
+- Project website: http://justcheckers.org/
+- Project @ Github: https://github.com/dorianpula/justcheckers 
\ No newline at end of file
diff --git a/README.txt b/README.txt
deleted file mode 100644
index 827c5d2..0000000
--- a/README.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-== About the Project ==
-
-justCheckers is an advanced open source checkers game for Android. The aim of 
-the project is to make a game capable of supporting:
-
-* Skinning
-* Network Games
-* Computer Opponents
-* Various Rules and Internationalizations
-
-Project homepage: http://justcheckers.org/
-
-== Current Progress ==
-
-The justCheckers project is in the middle of a general rewrite as much of the 
-code was designed for a desktop Java application rather than an Android app.  
-Also the game engine requires a general overhaul to allow for handling of 
-various variants of checkers.
diff --git a/android/build.gradle b/android/build.gradle
new file mode 100755
index 0000000..07d3b9a
--- /dev/null
+++ b/android/build.gradle
@@ -0,0 +1,47 @@
+/*
+    Modular Gradle Build for justCheckers Android
+    ---------------------------------------------
+
+    Author: Dorian Pula (dorian.pula@amber-penguin-software.ca)
+    License: AGPL v3.
+
+    Gradle docs:
+        http://www.gradle.org/docs/current/userguide/userguide_single.html
+    Gradle Android build docs:
+        https://sites.google.com/a/android.com/tools/tech-docs/new-build-system
+*/
+
+buildscript {
+    repositories {
+        maven { url 'http://repo1.maven.org/maven2' }
+
+    }
+    dependencies { classpath 'com.android.tools.build:gradle:0.3' }
+}
+
+apply plugin: 'android'
+
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
+
+// Description of the project
+description = 'justCheckers'
+version = '0.3'
+
+// Androids!!!
+android {
+	compileSdkVersion 14
+}
+	
+// Setup build script repositories starting with Maven repositories
+repositories {
+	maven {
+	    url 'http://repo1.maven.org/maven2'
+	}
+}
+
+// Dependency management
+dependencies {
+
+	compile 'jdom:jdom:0.7' // TODO: Get rid of the JDOM and use Android's content provider.
+}
\ No newline at end of file
diff --git a/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
similarity index 69%
rename from src/main/AndroidManifest.xml
rename to android/src/main/AndroidManifest.xml
index 6cd350e..eb3dc6e 100644
--- a/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -7,16 +7,16 @@
     <application android:icon="@drawable/icon" android:label="@string/app_name"
         android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
         
-        <activity android:name=".MenuActivity">
+        <activity android:name="main.java.org.justcheckers.android.MenuActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         
-		<activity android:name=".GameActivity" />
-		<activity android:name=".InfoActivity" />
-		<activity android:name=".SettingsActivity" />
+		<activity android:name="main.java.org.justcheckers.android.GameActivity" />
+		<activity android:name="main.java.org.justcheckers.android.InfoActivity" />
+		<activity android:name="main.java.org.justcheckers.android.SettingsActivity" />
 		
     </application>
     
diff --git a/src/main/java/org/justcheckers/android/GameActivity.java b/android/src/main/java/org/justcheckers/android/GameActivity.java
similarity index 95%
rename from src/main/java/org/justcheckers/android/GameActivity.java
rename to android/src/main/java/org/justcheckers/android/GameActivity.java
index 704292f..bafbb2d 100644
--- a/src/main/java/org/justcheckers/android/GameActivity.java
+++ b/android/src/main/java/org/justcheckers/android/GameActivity.java
@@ -19,10 +19,10 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package org.justcheckers.android;
+package main.java.org.justcheckers.android;
 
-import org.justcheckers.game.Game;
-import org.justcheckers.game.Rulebook;
+import main.java.org.justcheckers.game.Game;
+import main.java.org.justcheckers.game.Rulebook;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/src/main/java/org/justcheckers/android/InfoActivity.java b/android/src/main/java/org/justcheckers/android/InfoActivity.java
similarity index 97%
rename from src/main/java/org/justcheckers/android/InfoActivity.java
rename to android/src/main/java/org/justcheckers/android/InfoActivity.java
index 106be39..0085f59 100644
--- a/src/main/java/org/justcheckers/android/InfoActivity.java
+++ b/android/src/main/java/org/justcheckers/android/InfoActivity.java
@@ -19,14 +19,14 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package org.justcheckers.android;
+package main.java.org.justcheckers.android;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
-import org.justcheckers.common.GlobalConstants;
+import main.java.org.justcheckers.common.GlobalConstants;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/src/main/java/org/justcheckers/android/MenuActivity.java b/android/src/main/java/org/justcheckers/android/MenuActivity.java
similarity index 96%
rename from src/main/java/org/justcheckers/android/MenuActivity.java
rename to android/src/main/java/org/justcheckers/android/MenuActivity.java
index a2d5f50..51075d3 100644
--- a/src/main/java/org/justcheckers/android/MenuActivity.java
+++ b/android/src/main/java/org/justcheckers/android/MenuActivity.java
@@ -19,10 +19,10 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package org.justcheckers.android;
+package main.java.org.justcheckers.android;
 
-import org.justcheckers.common.GlobalConstants;
-import org.justcheckers.common.LoggingAndStatistics;
+import main.java.org.justcheckers.common.GlobalConstants;
+import main.java.org.justcheckers.common.LoggingAndStatistics;
 
 import android.app.Activity;
 import android.content.Intent;
diff --git a/src/main/java/org/justcheckers/android/SettingsActivity.java b/android/src/main/java/org/justcheckers/android/SettingsActivity.java
similarity index 97%
rename from src/main/java/org/justcheckers/android/SettingsActivity.java
rename to android/src/main/java/org/justcheckers/android/SettingsActivity.java
index c4aaa25..2f4f934 100644
--- a/src/main/java/org/justcheckers/android/SettingsActivity.java
+++ b/android/src/main/java/org/justcheckers/android/SettingsActivity.java
@@ -19,7 +19,7 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package org.justcheckers.android;
+package main.java.org.justcheckers.android;
 
 import android.graphics.Color;
 import android.os.Bundle;
diff --git a/src/main/java/org/justcheckers/common/GlobalConstants.java b/android/src/main/java/org/justcheckers/common/GlobalConstants.java
similarity index 97%
rename from src/main/java/org/justcheckers/common/GlobalConstants.java
rename to android/src/main/java/org/justcheckers/common/GlobalConstants.java
index 953c109..efdeb18 100644
--- a/src/main/java/org/justcheckers/common/GlobalConstants.java
+++ b/android/src/main/java/org/justcheckers/common/GlobalConstants.java
@@ -19,7 +19,7 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package org.justcheckers.common;
+package main.java.org.justcheckers.common;
 
 /**
  * Organizational class to keep all the constants in.
diff --git a/src/main/java/org/justcheckers/common/LoggingAndStatistics.java b/android/src/main/java/org/justcheckers/common/LoggingAndStatistics.java
similarity index 96%
rename from src/main/java/org/justcheckers/common/LoggingAndStatistics.java
rename to android/src/main/java/org/justcheckers/common/LoggingAndStatistics.java
index ea7cb79..776f617 100644
--- a/src/main/java/org/justcheckers/common/LoggingAndStatistics.java
+++ b/android/src/main/java/org/justcheckers/common/LoggingAndStatistics.java
@@ -19,7 +19,7 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package org.justcheckers.common;import org.justcheckers.android.R;
+package main.java.org.justcheckers.common;import org.justcheckers.android.R;
 
 import android.app.Activity;
 import android.os.Build;
diff --git a/src/main/java/org/justcheckers/game/Board.java b/android/src/main/java/org/justcheckers/game/Board.java
similarity index 99%
rename from src/main/java/org/justcheckers/game/Board.java
rename to android/src/main/java/org/justcheckers/game/Board.java
index 0e6c6f0..d46b2e7 100644
--- a/src/main/java/org/justcheckers/game/Board.java
+++ b/android/src/main/java/org/justcheckers/game/Board.java
@@ -19,7 +19,7 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package org.justcheckers.game;
+package main.java.org.justcheckers.game;
 
 /**
  * Container for the state of the checker board during a game.
diff --git a/src/main/java/org/justcheckers/game/Game.java b/android/src/main/java/org/justcheckers/game/Game.java
similarity index 99%
rename from src/main/java/org/justcheckers/game/Game.java
rename to android/src/main/java/org/justcheckers/game/Game.java
index 9dcaefa..d20b58b 100644
--- a/src/main/java/org/justcheckers/game/Game.java
+++ b/android/src/main/java/org/justcheckers/game/Game.java
@@ -19,7 +19,7 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package org.justcheckers.game;
+package main.java.org.justcheckers.game;
 
 import android.graphics.Point;
 
diff --git a/src/main/java/org/justcheckers/game/GameEngine.java b/android/src/main/java/org/justcheckers/game/GameEngine.java
similarity index 96%
rename from src/main/java/org/justcheckers/game/GameEngine.java
rename to android/src/main/java/org/justcheckers/game/GameEngine.java
index 8e17d24..3b7bf38 100644
--- a/src/main/java/org/justcheckers/game/GameEngine.java
+++ b/android/src/main/java/org/justcheckers/game/GameEngine.java
@@ -19,7 +19,7 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package org.justcheckers.game;
+package main.java.org.justcheckers.game;
 
 /**
  * @author dpula
diff --git a/src/main/java/org/justcheckers/game/Player.java b/android/src/main/java/org/justcheckers/game/Player.java
similarity index 98%
rename from src/main/java/org/justcheckers/game/Player.java
rename to android/src/main/java/org/justcheckers/game/Player.java
index b211255..af267e8 100644
--- a/src/main/java/org/justcheckers/game/Player.java
+++ b/android/src/main/java/org/justcheckers/game/Player.java
@@ -19,7 +19,7 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package org.justcheckers.game;
+package main.java.org.justcheckers.game;
 
 /**
  * Manages the information of a single player.
diff --git a/src/main/java/org/justcheckers/game/Rulebook.java b/android/src/main/java/org/justcheckers/game/Rulebook.java
similarity index 99%
rename from src/main/java/org/justcheckers/game/Rulebook.java
rename to android/src/main/java/org/justcheckers/game/Rulebook.java
index 41993fd..9dd1ba5 100644
--- a/src/main/java/org/justcheckers/game/Rulebook.java
+++ b/android/src/main/java/org/justcheckers/game/Rulebook.java
@@ -19,7 +19,7 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package org.justcheckers.game;
+package main.java.org.justcheckers.game;
 
 /**
  * The rules for a game of checkers. This class provides a reference object for
diff --git a/src/main/java/org/justcheckers/test/game/AmericanGameTest.java b/android/src/main/java/org/justcheckers/test/game/AmericanGameTest.java
similarity index 94%
rename from src/main/java/org/justcheckers/test/game/AmericanGameTest.java
rename to android/src/main/java/org/justcheckers/test/game/AmericanGameTest.java
index 45db1b8..92d7d43 100644
--- a/src/main/java/org/justcheckers/test/game/AmericanGameTest.java
+++ b/android/src/main/java/org/justcheckers/test/game/AmericanGameTest.java
@@ -20,7 +20,7 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package org.justcheckers.test.game;
+package main.java.org.justcheckers.test.game;
 
 /**
  * Regression test for a game of checkers played according to American rules.
diff --git a/src/main/java/org/justcheckers/test/game/GameLogicTest.java b/android/src/main/java/org/justcheckers/test/game/GameLogicTest.java
similarity index 94%
rename from src/main/java/org/justcheckers/test/game/GameLogicTest.java
rename to android/src/main/java/org/justcheckers/test/game/GameLogicTest.java
index 496d655..b750285 100644
--- a/src/main/java/org/justcheckers/test/game/GameLogicTest.java
+++ b/android/src/main/java/org/justcheckers/test/game/GameLogicTest.java
@@ -19,7 +19,7 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package org.justcheckers.test.game;
+package main.java.org.justcheckers.test.game;
 
 /**
  * Test the game engine logic.  Tests if the game engine can manipulate the
diff --git a/src/main/java/org/justcheckers/test/game/GameStateTest.java b/android/src/main/java/org/justcheckers/test/game/GameStateTest.java
similarity index 90%
rename from src/main/java/org/justcheckers/test/game/GameStateTest.java
rename to android/src/main/java/org/justcheckers/test/game/GameStateTest.java
index b77d7a5..916d507 100644
--- a/src/main/java/org/justcheckers/test/game/GameStateTest.java
+++ b/android/src/main/java/org/justcheckers/test/game/GameStateTest.java
@@ -19,10 +19,10 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package org.justcheckers.test.game;
+package main.java.org.justcheckers.test.game;
 
-import org.justcheckers.game.Game;
-import org.justcheckers.game.Rulebook;
+import main.java.org.justcheckers.game.Game;
+import main.java.org.justcheckers.game.Rulebook;
 
 /**
  * Test the game state logic.  Tests the NQPOJO (not quite plain old Java 
diff --git a/src/main/java/org/justcheckers/test/game/InternationalGameTest.java b/android/src/main/java/org/justcheckers/test/game/InternationalGameTest.java
similarity index 94%
rename from src/main/java/org/justcheckers/test/game/InternationalGameTest.java
rename to android/src/main/java/org/justcheckers/test/game/InternationalGameTest.java
index 28c5883..606a4f5 100644
--- a/src/main/java/org/justcheckers/test/game/InternationalGameTest.java
+++ b/android/src/main/java/org/justcheckers/test/game/InternationalGameTest.java
@@ -20,7 +20,7 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package org.justcheckers.test.game;
+package main.java.org.justcheckers.test.game;
 
 /**
  * Regression test for a game of checkers played according to International 
diff --git a/src/main/java/org/justcheckers/xml/ConfigSettings.java b/android/src/main/java/org/justcheckers/xml/ConfigSettings.java
similarity index 97%
rename from src/main/java/org/justcheckers/xml/ConfigSettings.java
rename to android/src/main/java/org/justcheckers/xml/ConfigSettings.java
index 595b93f..9383b6d 100644
--- a/src/main/java/org/justcheckers/xml/ConfigSettings.java
+++ b/android/src/main/java/org/justcheckers/xml/ConfigSettings.java
@@ -1,7 +1,4 @@
-package org.justcheckers.xml;
-
-import java.util.HashMap;
-import java.util.Set;
+package main.java.org.justcheckers.xml;
 
 /***************************************************************************
  *                                                                         *
diff --git a/src/main/java/org/justcheckers/xml/ConfigSettingsIO.java b/android/src/main/java/org/justcheckers/xml/ConfigSettingsIO.java
similarity index 97%
rename from src/main/java/org/justcheckers/xml/ConfigSettingsIO.java
rename to android/src/main/java/org/justcheckers/xml/ConfigSettingsIO.java
index a3edbbb..4b14844 100644
--- a/src/main/java/org/justcheckers/xml/ConfigSettingsIO.java
+++ b/android/src/main/java/org/justcheckers/xml/ConfigSettingsIO.java
@@ -1,4 +1,4 @@
-package org.justcheckers.xml;
+package main.java.org.justcheckers.xml;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -148,7 +148,7 @@ public class ConfigSettingsIO extends XML_IO{
 			for(int k=0;k<attributes.size();k++){
 				Attribute current = (Attribute)attributes.get(k);
 
-				String total = toFullSettingName(e) + "." + current.getName();
+				String total = toFullSettingName(e) + "" + current.getName();
 				cs.setElementAttribute(total,current.getValue());
 			}	
 		}	  
@@ -162,7 +162,7 @@ public class ConfigSettingsIO extends XML_IO{
 		*/
 		protected String correctKeyForNumber(String uncorrectedKey){
 			int i = 1;
-			String correctedKey = uncorrectedKey + "." + i;
+			String correctedKey = uncorrectedKey + "" + i;
 			//is there a key with this name?
 			boolean reachedEnd = (ConfigSettings.getInstance().getElementText(correctedKey) == null);
 			while(!reachedEnd){
@@ -277,7 +277,7 @@ public class ConfigSettingsIO extends XML_IO{
 			respective parts, delimited by the "."	*/
 		private ArrayList splitSettingKey(String key){	
 			ArrayList l = new ArrayList();
-			StringTokenizer st = new StringTokenizer(key,".",false);		
+			StringTokenizer st = new StringTokenizer(key, "",false);
 			while(st.hasMoreTokens()){
 				l.add(st.nextToken());
 			}
diff --git a/src/main/java/org/justcheckers/xml/GameSettings.java b/android/src/main/java/org/justcheckers/xml/GameSettings.java
similarity index 98%
rename from src/main/java/org/justcheckers/xml/GameSettings.java
rename to android/src/main/java/org/justcheckers/xml/GameSettings.java
index 3864785..0a8991b 100644
--- a/src/main/java/org/justcheckers/xml/GameSettings.java
+++ b/android/src/main/java/org/justcheckers/xml/GameSettings.java
@@ -1,4 +1,4 @@
-package org.justcheckers.xml;
+package main.java.org.justcheckers.xml;
 
 import java.util.HashMap;
 
diff --git a/src/main/java/org/justcheckers/xml/GameSettingsIO.java b/android/src/main/java/org/justcheckers/xml/GameSettingsIO.java
similarity index 97%
rename from src/main/java/org/justcheckers/xml/GameSettingsIO.java
rename to android/src/main/java/org/justcheckers/xml/GameSettingsIO.java
index baca3c1..3268283 100644
--- a/src/main/java/org/justcheckers/xml/GameSettingsIO.java
+++ b/android/src/main/java/org/justcheckers/xml/GameSettingsIO.java
@@ -1,4 +1,4 @@
-package org.justcheckers.xml;
+package main.java.org.justcheckers.xml;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -150,7 +150,7 @@ public class GameSettingsIO extends XML_IO{
 			for(int k=0;k<attributes.size();k++){
 				Attribute current = (Attribute)attributes.get(k);
 
-				String total = toFullSettingName(e) + "." + current.getName();
+				String total = toFullSettingName(e) + "" + current.getName();
 				gs.setElementAttribute(total,current.getValue());
 			}	
 		}	  
@@ -164,7 +164,7 @@ public class GameSettingsIO extends XML_IO{
 		*/
 		protected String correctKeyForNumber(String uncorrectedKey){
 			int i = 1;
-			String correctedKey = uncorrectedKey + "." + i;
+			String correctedKey = uncorrectedKey + "" + i;
 			//is there a key with this name?
 			boolean reachedEnd = (GameSettings.getInstance().getElementText(correctedKey) == null);
 			while(!reachedEnd){
@@ -279,7 +279,7 @@ public class GameSettingsIO extends XML_IO{
 			respective parts, delimited by the "."	*/
 		private ArrayList splitSettingKey(String key){	
 			ArrayList l = new ArrayList();
-			StringTokenizer st = new StringTokenizer(key,".",false);		
+			StringTokenizer st = new StringTokenizer(key, "",false);
 			while(st.hasMoreTokens()){
 				l.add(st.nextToken());
 			}
diff --git a/src/main/java/org/justcheckers/xml/Settings.java b/android/src/main/java/org/justcheckers/xml/Settings.java
similarity index 98%
rename from src/main/java/org/justcheckers/xml/Settings.java
rename to android/src/main/java/org/justcheckers/xml/Settings.java
index 2f48307..ef22b9a 100644
--- a/src/main/java/org/justcheckers/xml/Settings.java
+++ b/android/src/main/java/org/justcheckers/xml/Settings.java
@@ -1,4 +1,4 @@
-package org.justcheckers.xml;
+package main.java.org.justcheckers.xml;
  
 import java.util.Set;
 import java.util.HashMap;
diff --git a/src/main/java/org/justcheckers/xml/UserSettings.java b/android/src/main/java/org/justcheckers/xml/UserSettings.java
similarity index 98%
rename from src/main/java/org/justcheckers/xml/UserSettings.java
rename to android/src/main/java/org/justcheckers/xml/UserSettings.java
index 8674439..d863368 100644
--- a/src/main/java/org/justcheckers/xml/UserSettings.java
+++ b/android/src/main/java/org/justcheckers/xml/UserSettings.java
@@ -1,4 +1,4 @@
-package org.justcheckers.xml;
+package main.java.org.justcheckers.xml;
 
 import java.util.HashMap;
 
diff --git a/src/main/java/org/justcheckers/xml/UserSettingsIO.java b/android/src/main/java/org/justcheckers/xml/UserSettingsIO.java
similarity index 97%
rename from src/main/java/org/justcheckers/xml/UserSettingsIO.java
rename to android/src/main/java/org/justcheckers/xml/UserSettingsIO.java
index c17007a..94e4033 100644
--- a/src/main/java/org/justcheckers/xml/UserSettingsIO.java
+++ b/android/src/main/java/org/justcheckers/xml/UserSettingsIO.java
@@ -1,4 +1,4 @@
-package org.justcheckers.xml;
+package main.java.org.justcheckers.xml;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -152,7 +152,7 @@ public class UserSettingsIO extends XML_IO{
 			for(int k=0;k<attributes.size();k++){
 				Attribute current = (Attribute)attributes.get(k);
 
-				String total = toFullSettingName(e) + "." + current.getName();
+				String total = toFullSettingName(e) + "" + current.getName();
 				us.setElementAttribute(total,current.getValue());
 				System.out.println("attribute: " + total + " = " + current.getValue());
 
@@ -168,7 +168,7 @@ public class UserSettingsIO extends XML_IO{
 		*/
 		protected String correctKeyForNumber(String uncorrectedKey){
 			int i = 1;
-			String correctedKey = uncorrectedKey + "." + i;
+			String correctedKey = uncorrectedKey + "" + i;
 			//is there a key with this name?
 			boolean reachedEnd = (UserSettings.getInstance().getElementText(correctedKey) == null);
 			while(!reachedEnd){
@@ -283,7 +283,7 @@ public class UserSettingsIO extends XML_IO{
 			respective parts, delimited by the "."	*/
 		private ArrayList splitSettingKey(String key){	
 			ArrayList l = new ArrayList();
-			StringTokenizer st = new StringTokenizer(key,".",false);		
+			StringTokenizer st = new StringTokenizer(key, "",false);
 			while(st.hasMoreTokens()){
 				l.add(st.nextToken());
 			}
diff --git a/src/main/java/org/justcheckers/xml/VisitDOM.java b/android/src/main/java/org/justcheckers/xml/VisitDOM.java
similarity index 98%
rename from src/main/java/org/justcheckers/xml/VisitDOM.java
rename to android/src/main/java/org/justcheckers/xml/VisitDOM.java
index 6beed14..8fd4998 100644
--- a/src/main/java/org/justcheckers/xml/VisitDOM.java
+++ b/android/src/main/java/org/justcheckers/xml/VisitDOM.java
@@ -9,7 +9,7 @@
 // (at your option) any later version.      
 // ********************************************************************
 
-package org.justcheckers.xml;
+package main.java.org.justcheckers.xml;
 import java.util.Iterator;
 import org.jdom.Element;
 import org.jdom.Text;
diff --git a/src/main/java/org/justcheckers/xml/XMLFileFilter.java b/android/src/main/java/org/justcheckers/xml/XMLFileFilter.java
similarity index 95%
rename from src/main/java/org/justcheckers/xml/XMLFileFilter.java
rename to android/src/main/java/org/justcheckers/xml/XMLFileFilter.java
index 1b9c78c..a231da9 100644
--- a/src/main/java/org/justcheckers/xml/XMLFileFilter.java
+++ b/android/src/main/java/org/justcheckers/xml/XMLFileFilter.java
@@ -1,4 +1,4 @@
-package org.justcheckers.xml;
+package main.java.org.justcheckers.xml;
 
 import java.io.File;
 import java.io.FileFilter;
diff --git a/src/main/java/org/justcheckers/xml/XML_IO.java b/android/src/main/java/org/justcheckers/xml/XML_IO.java
similarity index 99%
rename from src/main/java/org/justcheckers/xml/XML_IO.java
rename to android/src/main/java/org/justcheckers/xml/XML_IO.java
index 3e25b47..f93ecc5 100644
--- a/src/main/java/org/justcheckers/xml/XML_IO.java
+++ b/android/src/main/java/org/justcheckers/xml/XML_IO.java
@@ -1,4 +1,4 @@
-package org.justcheckers.xml;
+package main.java.org.justcheckers.xml;
 
 import java.io.File;
 import java.net.URL;
@@ -199,7 +199,7 @@ public abstract class XML_IO{
 			Element currentElement = e;
 			while(!currentElement.isRootElement()){
 				currentElement = currentElement.getParent();
-				path = currentElement.getName() + "." + path;			
+				path = currentElement.getName() + "" + path;
 			}
 			
 			return correctKeyForNumber(path);
diff --git a/src/main/proguard.cfg b/android/src/main/proguard.cfg
similarity index 100%
rename from src/main/proguard.cfg
rename to android/src/main/proguard.cfg
diff --git a/src/main/project.properties b/android/src/main/project.properties
similarity index 100%
rename from src/main/project.properties
rename to android/src/main/project.properties
diff --git a/src/main/res/drawable-hdpi/attack_king.png b/android/src/main/res/drawable-hdpi/attack_king.png
similarity index 100%
rename from src/main/res/drawable-hdpi/attack_king.png
rename to android/src/main/res/drawable-hdpi/attack_king.png
diff --git a/src/main/res/drawable-hdpi/attack_pawn.png b/android/src/main/res/drawable-hdpi/attack_pawn.png
similarity index 100%
rename from src/main/res/drawable-hdpi/attack_pawn.png
rename to android/src/main/res/drawable-hdpi/attack_pawn.png
diff --git a/src/main/res/drawable-hdpi/backdrop.jpg b/android/src/main/res/drawable-hdpi/backdrop.jpg
similarity index 100%
rename from src/main/res/drawable-hdpi/backdrop.jpg
rename to android/src/main/res/drawable-hdpi/backdrop.jpg
diff --git a/src/main/res/drawable-hdpi/defend_king.png b/android/src/main/res/drawable-hdpi/defend_king.png
similarity index 100%
rename from src/main/res/drawable-hdpi/defend_king.png
rename to android/src/main/res/drawable-hdpi/defend_king.png
diff --git a/src/main/res/drawable-hdpi/defend_pawn.png b/android/src/main/res/drawable-hdpi/defend_pawn.png
similarity index 100%
rename from src/main/res/drawable-hdpi/defend_pawn.png
rename to android/src/main/res/drawable-hdpi/defend_pawn.png
diff --git a/src/main/res/drawable-hdpi/icon.png b/android/src/main/res/drawable-hdpi/icon.png
similarity index 100%
rename from src/main/res/drawable-hdpi/icon.png
rename to android/src/main/res/drawable-hdpi/icon.png
diff --git a/src/main/res/drawable-hdpi/idea.png b/android/src/main/res/drawable-hdpi/idea.png
similarity index 100%
rename from src/main/res/drawable-hdpi/idea.png
rename to android/src/main/res/drawable-hdpi/idea.png
diff --git a/src/main/res/drawable-hdpi/logo.png b/android/src/main/res/drawable-hdpi/logo.png
similarity index 100%
rename from src/main/res/drawable-hdpi/logo.png
rename to android/src/main/res/drawable-hdpi/logo.png
diff --git a/src/main/res/drawable-hdpi/non_play.png b/android/src/main/res/drawable-hdpi/non_play.png
similarity index 100%
rename from src/main/res/drawable-hdpi/non_play.png
rename to android/src/main/res/drawable-hdpi/non_play.png
diff --git a/src/main/res/drawable-hdpi/play.png b/android/src/main/res/drawable-hdpi/play.png
similarity index 100%
rename from src/main/res/drawable-hdpi/play.png
rename to android/src/main/res/drawable-hdpi/play.png
diff --git a/src/main/res/drawable-hdpi/splash.jpg b/android/src/main/res/drawable-hdpi/splash.jpg
similarity index 100%
rename from src/main/res/drawable-hdpi/splash.jpg
rename to android/src/main/res/drawable-hdpi/splash.jpg
diff --git a/src/main/res/drawable-ldpi/icon.png b/android/src/main/res/drawable-ldpi/icon.png
similarity index 100%
rename from src/main/res/drawable-ldpi/icon.png
rename to android/src/main/res/drawable-ldpi/icon.png
diff --git a/src/main/res/drawable-mdpi/icon.png b/android/src/main/res/drawable-mdpi/icon.png
similarity index 100%
rename from src/main/res/drawable-mdpi/icon.png
rename to android/src/main/res/drawable-mdpi/icon.png
diff --git a/src/main/res/layout/game_screen_landscape.xml b/android/src/main/res/layout/game_screen_landscape.xml
similarity index 100%
rename from src/main/res/layout/game_screen_landscape.xml
rename to android/src/main/res/layout/game_screen_landscape.xml
diff --git a/src/main/res/layout/game_screen_portrait.xml b/android/src/main/res/layout/game_screen_portrait.xml
similarity index 100%
rename from src/main/res/layout/game_screen_portrait.xml
rename to android/src/main/res/layout/game_screen_portrait.xml
diff --git a/src/main/res/layout/info_screen.xml b/android/src/main/res/layout/info_screen.xml
similarity index 100%
rename from src/main/res/layout/info_screen.xml
rename to android/src/main/res/layout/info_screen.xml
diff --git a/src/main/res/layout/main_menu.xml b/android/src/main/res/layout/main_menu.xml
similarity index 100%
rename from src/main/res/layout/main_menu.xml
rename to android/src/main/res/layout/main_menu.xml
diff --git a/src/main/res/layout/settings_screen.xml b/android/src/main/res/layout/settings_screen.xml
similarity index 100%
rename from src/main/res/layout/settings_screen.xml
rename to android/src/main/res/layout/settings_screen.xml
diff --git a/src/main/res/raw/gpl_3_license.txt b/android/src/main/res/raw/gpl_3_license.txt
similarity index 100%
rename from src/main/res/raw/gpl_3_license.txt
rename to android/src/main/res/raw/gpl_3_license.txt
diff --git a/src/main/res/raw/readme.txt b/android/src/main/res/raw/readme.txt
similarity index 100%
rename from src/main/res/raw/readme.txt
rename to android/src/main/res/raw/readme.txt
diff --git a/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml
similarity index 100%
rename from src/main/res/values/strings.xml
rename to android/src/main/res/values/strings.xml
diff --git a/src/main/res/values/user_interface_en.xml b/android/src/main/res/values/user_interface_en.xml
similarity index 100%
rename from src/main/res/values/user_interface_en.xml
rename to android/src/main/res/values/user_interface_en.xml
diff --git a/src/main/res/values/user_interface_template.xml b/android/src/main/res/values/user_interface_template.xml
similarity index 100%
rename from src/main/res/values/user_interface_template.xml
rename to android/src/main/res/values/user_interface_template.xml
diff --git a/build.gradle b/build.gradle
index c3c983c..c46cf6b 100755
--- a/build.gradle
+++ b/build.gradle
@@ -1,29 +1,17 @@
 /*
- * Modular Gradle Build for justCheckers
- * Author: Dorian Pula
- * 
- * 	URI for docs: http://www.gradle.org/docs/current/userguide/userguide_single.html
- */
+    Modular Gradle Build for justCheckers
+    ---------------------------------------------
 
-// TODO: Add the Android Gradle plugin: https://github.com/jvoegele/gradle-android-plugin/wiki
-// TODO: Add in support for multiple projects, to allow for clean separation of projects.
+    Author: Dorian Pula (dorian.pula@amber-penguin-software.ca)
+    License: AGPL v3.
 
-buildscript {
-    repositories {
-maven {
-            url 'http://repo1.maven.org/maven2'
-        }
-        //mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.3'
-    }
-}
+    Gradle docs:
+        http://www.gradle.org/docs/current/userguide/userguide_single.html
+    Gradle Android build docs:
+        https://sites.google.com/a/android.com/tools/tech-docs/new-build-system
+*/
 
-apply plugin: 'android'
-
-//apply plugin: 'war'
-//apply plugin: 'jetty'
+apply plugin: 'java'
 
 sourceCompatibility = 1.6
 targetCompatibility = 1.6
@@ -32,135 +20,4 @@ targetCompatibility = 1.6
 description = 'justCheckers'
 version = '0.3'
 
-// Androids!!!
-android {
-    //target = "android-14"
-	compileSdkVersion 14    
-/*defaultConfig {
-        versionCode = 12
-        minSdkVersion = 8
-    } */
-}
-
-project.ext {
-	appName = 'justCheckers'
-    appBaseName = "justcheckers"
-
-    hibernateVersion = '3.5.4-Final'
-    slf4jVersion = '1.6.0'
-	springVersion = '3.1.3.RELEASE'
-}
-
-// Setup everything to work with the Eclipse friendly Web setup.
-//sourceSets.main.java.srcDirs = ['src', 'gen']
-//sourceSets.main.resources.srcDirs = ['res']
-//sourceSets.test.java.srcDirs = ['test-src']
-	
-// Setup build script repositories starting with Maven repositories
-repositories {
-//    flatDir {
-//        dirs 'WebContent/WEB-INF/lib'
-//    }
-	maven {
-	    url 'http://repo1.maven.org/maven2'
-	}
-}
-
-// Dependency management
-dependencies {
-
-	//compile 'org.jdom:jdom:1.1'
-	//compile 'jdom:jdom:0.9'
-	compile 'jdom:jdom:0.7'
-
-    // Spring Framework + SLF4J
-    /*compile ('org.springframework:spring-context:' + project.springVersion) {
-        exclude module: 'commons-logging'
-    }
-    compile 'log4j:log4j:1.2.16'
-    compile 'org.slf4j:jcl-over-slf4j:' + project.slf4jVersion
-    compile 'org.slf4j:slf4j-api:' + project.slf4jVersion
-    compile 'org.slf4j:slf4j-log4j12:' + project.slf4jVersion
-
-    compile 'org.springframework:spring-jdbc:' + project.springVersion
-    compile 'org.springframework:spring-orm:' + project.springVersion
-    compile 'org.springframework:spring-webmvc:' + project.springVersion
-    compile 'org.springframework:spring-parent:' + project.springVersion
-	*/    
-//compile 'mysql:mysql-connector-java:5.1.22'
-
-    // xstream
-    //compile 'com.thoughtworks.xstream:xstream:1.4.4'
-
-    // Hibernate + C3P0
-/*
-    compile 'org.hibernate:hibernate:' + project.hibernateVersion
-    compile 'org.hibernate:hibernate-annotations:' + project.hibernateVersion
-    compile 'org.hibernate:hibernate-c3p0:' + project.hibernateVersion
-    compile 'javassist:javassist:3.9.0.GA'
-*/
-
-    // Apache Commons Libraries
-    //compile 'commons-httpclient:commons-httpclient:3.1'
-    //compile 'commons-lang:commons-lang:2.4'
-
-    // FlexJson
-//    compile 'net.sf.flexjson:flexjson:2.1'
-
-    // Javax Servlet and Mail APIs
-    //providedCompile 'javax.servlet:servlet-api:2.5'
-}
-
-// At the end of day we just need a JAR and a WAR.
-ext.sharedManifest = manifest {
-	
-	attributes(
-		'App-Name' : project.appName,
-		'App-Version' : version,
-		'Build-User' : System.properties['user.name'],
-		'Build-Time' : new Date().format('yyyy-MMMM-dd HH:mm:ss'),
-		'Build-OS' : System.properties['os.name'] + ' - version ' + System.properties['os.version'],
-		'Build-Sys' : System.properties['os.arch'],
-		'Java-Version' : System.properties['java.version'],
-		'Java-Vendor' : System.properties['java.vendor'],
-		'Java-VM' :
-			System.properties['java.vm.vendor'] + ' ' + System.properties['java.vm.name'] + ' v'
-				+ System.properties['java.vm.version'])
-}
-
-// Build the JAR.
-//jar {
-//	enabled = true
-//	includeEmptyDirs = false
-//	manifest = sharedManifest
-//	include '**/**.class'
-//  exclude 'build/**'
-//}
-
-// Build WAR files that include the JAR file.  Add the resources back in.
-/*
-war {
-
-    from 'webapp'
-    exclude 'WEB-INF/lib'
-
-	classpath = project.configurations.runtime - project.configurations.providedRuntime + jar.outputs.files
-	manifest = sharedManifest
-
-    includeEmptyDirs = false
-	into('WEB-INF/classes') {
-		from sourceSets.main.resources
-	}
-}
-
-jettyRun {
-	httpPort = 8080
-	contextPath = project.appBaseName
-	webAppSourceDirectory = new File('webapp')
-}
-*/
-// Run embedded Jetty setup.
-/*jettyRunWar {
-	httpPort = 8080
-	contextPath = project.appBaseName
-}*/
+// TODO Add in extra targets for project setup or a simplified Gradle build API.
\ No newline at end of file
diff --git a/console/build.gradle b/console/build.gradle
new file mode 100755
index 0000000..30a9c04
--- /dev/null
+++ b/console/build.gradle
@@ -0,0 +1,21 @@
+/*
+    Gradle Build for justCheckers - Console
+    ---------------------------------------
+
+    Author: Dorian Pula (dorian.pula@amber-penguin-software.ca)
+    License: AGPL v3.
+
+    Gradle docs:
+        http://www.gradle.org/docs/current/userguide/userguide_single.html
+*/
+
+apply plugin: 'java'
+
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
+
+// Description of the project
+description = 'justCheckers'
+version = '0.3'
+
+// TODO Add in build for the terminal client.
\ No newline at end of file
diff --git a/core/build.gradle b/core/build.gradle
new file mode 100755
index 0000000..22f204a
--- /dev/null
+++ b/core/build.gradle
@@ -0,0 +1,21 @@
+/*
+    Gradle Build for justCheckers - Core
+    ---------------------------------------------
+
+    Author: Dorian Pula (dorian.pula@amber-penguin-software.ca)
+    License: AGPL v3.
+
+    Gradle docs:
+        http://www.gradle.org/docs/current/userguide/userguide_single.html
+*/
+
+apply plugin: 'java'
+
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
+
+// Description of the project
+description = 'justCheckers'
+version = '0.3'
+
+// TODO Add in a separate build for just the core application...
\ No newline at end of file
diff --git a/desktop/build.gradle b/desktop/build.gradle
new file mode 100755
index 0000000..9604fde
--- /dev/null
+++ b/desktop/build.gradle
@@ -0,0 +1,21 @@
+/*
+    Gradle Build for justCheckers - Desktop
+    ---------------------------------------
+
+    Author: Dorian Pula (dorian.pula@amber-penguin-software.ca)
+    License: AGPL v3.
+
+    Gradle docs:
+        http://www.gradle.org/docs/current/userguide/userguide_single.html
+*/
+
+apply plugin: 'java'
+
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
+
+// Description of the project
+description = 'justCheckers'
+version = '0.3'
+
+// TODO Add in build for the desktop client.
\ No newline at end of file
diff --git a/AUTHORS.txt b/doc/AUTHORS.txt
similarity index 100%
rename from AUTHORS.txt
rename to doc/AUTHORS.txt
diff --git a/BUGS.txt b/doc/BUGS.txt
similarity index 100%
rename from BUGS.txt
rename to doc/BUGS.txt
diff --git a/COPYING.txt b/doc/COPYING.txt
similarity index 100%
rename from COPYING.txt
rename to doc/COPYING.txt
diff --git a/Changelog.txt b/doc/Changelog.txt
similarity index 100%
rename from Changelog.txt
rename to doc/Changelog.txt
diff --git a/gen/org/justcheckers/android/BuildConfig.java b/gen/org/justcheckers/android/BuildConfig.java
deleted file mode 100644
index 38bf422..0000000
--- a/gen/org/justcheckers/android/BuildConfig.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Automatically generated file. DO NOT MODIFY */
-package org.justcheckers.android;
-
-public final class BuildConfig {
-    public final static boolean DEBUG = true;
-}
\ No newline at end of file
diff --git a/gen/org/justcheckers/android/R.java b/gen/org/justcheckers/android/R.java
deleted file mode 100644
index 51ff7d9..0000000
--- a/gen/org/justcheckers/android/R.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package org.justcheckers.android;
-
-public final class R {
-    public static final class array {
-        public static final int checkers_variants=0x7f060000;
-    }
-    public static final class attr {
-    }
-    public static final class drawable {
-        public static final int attack_king=0x7f020000;
-        public static final int attack_pawn=0x7f020001;
-        public static final int backdrop=0x7f020002;
-        public static final int defend_king=0x7f020003;
-        public static final int defend_pawn=0x7f020004;
-        public static final int icon=0x7f020005;
-        public static final int idea=0x7f020006;
-        public static final int logo=0x7f020007;
-        public static final int non_play=0x7f020008;
-        public static final int play=0x7f020009;
-        public static final int splash=0x7f02000a;
-    }
-    public static final class id {
-        public static final int about_us_button=0x7f070013;
-        public static final int app_logo=0x7f070001;
-        public static final int current_player_king=0x7f07000b;
-        public static final int current_player_king_captured=0x7f07000c;
-        public static final int current_player_label=0x7f07000a;
-        public static final int current_player_pawn=0x7f07000d;
-        public static final int current_player_pawn_captured=0x7f07000e;
-        public static final int game_board=0x7f070002;
-        public static final int game_button=0x7f070011;
-        public static final int info_text=0x7f07000f;
-        public static final int license_button=0x7f070014;
-        public static final int menu_table=0x7f070010;
-        public static final int opponent_captured_pieces=0x7f070009;
-        public static final int opposing_player_king=0x7f070005;
-        public static final int opposing_player_king_captured=0x7f070006;
-        public static final int opposing_player_label=0x7f070004;
-        public static final int opposing_player_pawn=0x7f070007;
-        public static final int opposing_player_pawn_captured=0x7f070008;
-        public static final int player_captured_pieces=0x7f070003;
-        public static final int quit_button=0x7f070016;
-        public static final int screen_root=0x7f070000;
-        public static final int settings_button=0x7f070015;
-        public static final int website_button=0x7f070012;
-    }
-    public static final class layout {
-        public static final int game_screen_landscape=0x7f030000;
-        public static final int game_screen_portrait=0x7f030001;
-        public static final int info_screen=0x7f030002;
-        public static final int main_menu=0x7f030003;
-        public static final int settings_screen=0x7f030004;
-    }
-    public static final class raw {
-        public static final int gpl_3_license=0x7f040000;
-        public static final int readme=0x7f040001;
-    }
-    public static final class string {
-        public static final int app_name=0x7f050000;
-        public static final int app_version=0x7f050001;
-        public static final int caption_about_us=0x7f050003;
-        public static final int caption_license=0x7f050004;
-        public static final int caption_play_checkers=0x7f050005;
-        public static final int caption_quit=0x7f050008;
-        public static final int caption_settings=0x7f050006;
-        public static final int caption_visit_us=0x7f050007;
-        public static final int project_website=0x7f050002;
-        public static final int template_capture_amounts=0x7f050009;
-        public static final int template_current_player=0x7f05000a;
-        public static final int template_opposing_player=0x7f05000b;
-    }
-}
diff --git a/lib/jdom_0.9.jar b/lib/jdom_0.9.jar
deleted file mode 100644
index 8a967e0..0000000
Binary files a/lib/jdom_0.9.jar and /dev/null differ
diff --git a/settings.gradle b/settings.gradle
index 351da2c..e8c6ab2 100755
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-//include 'core', 'web', 'android'
\ No newline at end of file
+include 'core', 'console', 'web', 'android', 'desktop'
\ No newline at end of file
diff --git a/web/build.gradle b/web/build.gradle
new file mode 100755
index 0000000..0a9f75c
--- /dev/null
+++ b/web/build.gradle
@@ -0,0 +1,149 @@
+/*
+    Gradle Build for justCheckers - Web
+    ---------------------------------------------
+
+    Author: Dorian Pula (dorian.pula@amber-penguin-software.ca)
+    License: AGPL v3.
+
+    Gradle docs:
+        http://www.gradle.org/docs/current/userguide/userguide_single.html
+*/
+
+apply plugin: 'java'
+
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
+
+// Description of the project
+description = 'justCheckers'
+version = '0.3'
+
+apply plugin: 'war'
+apply plugin: 'jetty'
+
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
+
+// Description of the project
+description = 'justCheckers'
+version = '0.3'
+
+
+project.ext {
+	appName = 'justCheckers'
+    appBaseName = "justcheckers"
+
+    hibernateVersion = '3.5.4-Final'
+    slf4jVersion = '1.6.0'
+	springVersion = '3.1.3.RELEASE'
+}
+
+// Setup everything to work with the Eclipse friendly Web setup.
+//sourceSets.main.java.srcDirs = ['src', 'gen']
+//sourceSets.main.resources.srcDirs = ['res']
+//sourceSets.test.java.srcDirs = ['test-src']
+	
+// Setup build script repositories starting with Maven repositories
+repositories {
+	maven {
+	    url 'http://repo1.maven.org/maven2'
+	}
+}
+
+// Dependency management
+dependencies {
+
+	//compile 'org.jdom:jdom:1.1'
+	//compile 'jdom:jdom:0.9'
+	compile 'jdom:jdom:0.7'
+
+    // Spring Framework + SLF4J
+    /*compile ('org.springframework:spring-context:' + project.springVersion) {
+        exclude module: 'commons-logging'
+    }
+    compile 'log4j:log4j:1.2.16'
+    compile 'org.slf4j:jcl-over-slf4j:' + project.slf4jVersion
+    compile 'org.slf4j:slf4j-api:' + project.slf4jVersion
+    compile 'org.slf4j:slf4j-log4j12:' + project.slf4jVersion
+
+    compile 'org.springframework:spring-jdbc:' + project.springVersion
+    compile 'org.springframework:spring-orm:' + project.springVersion
+    compile 'org.springframework:spring-webmvc:' + project.springVersion
+    compile 'org.springframework:spring-parent:' + project.springVersion
+	*/    
+//compile 'mysql:mysql-connector-java:5.1.22'
+
+    // xstream
+    //compile 'com.thoughtworks.xstream:xstream:1.4.4'
+
+    // Hibernate + C3P0
+/*
+    compile 'org.hibernate:hibernate:' + project.hibernateVersion
+    compile 'org.hibernate:hibernate-annotations:' + project.hibernateVersion
+    compile 'org.hibernate:hibernate-c3p0:' + project.hibernateVersion
+    compile 'javassist:javassist:3.9.0.GA'
+*/
+
+    // Apache Commons Libraries
+    //compile 'commons-httpclient:commons-httpclient:3.1'
+    //compile 'commons-lang:commons-lang:2.4'
+
+    // FlexJson
+//    compile 'net.sf.flexjson:flexjson:2.1'
+
+    // Javax Servlet and Mail APIs
+    //providedCompile 'javax.servlet:servlet-api:2.5'
+}
+
+// At the end of day we just need a JAR and a WAR.
+ext.sharedManifest = manifest {
+	
+	attributes(
+		'App-Name' : project.appName,
+		'App-Version' : version,
+		'Build-User' : System.properties['user.name'],
+		'Build-Time' : new Date().format('yyyy-MMMM-dd HH:mm:ss'),
+		'Build-OS' : System.properties['os.name'] + ' - version ' + System.properties['os.version'],
+		'Build-Sys' : System.properties['os.arch'],
+		'Java-Version' : System.properties['java.version'],
+		'Java-Vendor' : System.properties['java.vendor'],
+		'Java-VM' :
+			System.properties['java.vm.vendor'] + ' ' + System.properties['java.vm.name'] + ' v'
+				+ System.properties['java.vm.version'])
+}
+
+// Build the JAR.
+jar {
+	enabled = true
+	includeEmptyDirs = false
+	manifest = sharedManifest
+	include '**/**.class'
+  exclude 'build/**'
+}
+
+// Build WAR files that include the JAR file.  Add the resources back in.
+war {
+
+    from 'webapp'
+    exclude 'WEB-INF/lib'
+
+	classpath = project.configurations.runtime - project.configurations.providedRuntime + jar.outputs.files
+	manifest = sharedManifest
+
+    includeEmptyDirs = false
+	into('WEB-INF/classes') {
+		from sourceSets.main.resources
+	}
+}
+
+jettyRun {
+	httpPort = 8080
+	contextPath = project.appBaseName
+	webAppSourceDirectory = new File('webapp')
+}
+
+// Run embedded Jetty setup.
+jettyRunWar {
+	httpPort = 8080
+	contextPath = project.appBaseName
+}