diff --git a/ggp-base/.classpath b/.classpath
similarity index 100%
rename from ggp-base/.classpath
rename to .classpath
diff --git a/ggp-base/.gitignore b/.gitignore
similarity index 100%
rename from ggp-base/.gitignore
rename to .gitignore
diff --git a/ggp-base/.project b/.project
similarity index 100%
rename from ggp-base/.project
rename to .project
diff --git a/ggp-base/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from ggp-base/.settings/org.eclipse.jdt.core.prefs
rename to .settings/org.eclipse.jdt.core.prefs
diff --git a/ggp-base/.settings/org.eclipse.ltk.core.refactoring.prefs b/.settings/org.eclipse.ltk.core.refactoring.prefs
similarity index 100%
rename from ggp-base/.settings/org.eclipse.ltk.core.refactoring.prefs
rename to .settings/org.eclipse.ltk.core.refactoring.prefs
diff --git a/ggp-base/README b/README
similarity index 100%
rename from ggp-base/README
rename to README
diff --git a/ggp-base/build.xml b/build.xml
similarity index 100%
rename from ggp-base/build.xml
rename to build.xml
diff --git a/ggp-base/cleanup.sh b/cleanup.sh
similarity index 100%
rename from ggp-base/cleanup.sh
rename to cleanup.sh
diff --git a/ggp-base/games/games/connectFour/METADATA b/games/games/connectFour/METADATA
similarity index 100%
rename from ggp-base/games/games/connectFour/METADATA
rename to games/games/connectFour/METADATA
diff --git a/ggp-base/games/games/connectFour/connectFour.js b/games/games/connectFour/connectFour.js
similarity index 100%
rename from ggp-base/games/games/connectFour/connectFour.js
rename to games/games/connectFour/connectFour.js
diff --git a/ggp-base/games/games/connectFour/connectFour.kif b/games/games/connectFour/connectFour.kif
similarity index 100%
rename from ggp-base/games/games/connectFour/connectFour.kif
rename to games/games/connectFour/connectFour.kif
diff --git a/ggp-base/games/games/connectFour/connectFour.txt b/games/games/connectFour/connectFour.txt
similarity index 100%
rename from ggp-base/games/games/connectFour/connectFour.txt
rename to games/games/connectFour/connectFour.txt
diff --git a/ggp-base/games/games/connectFour/connectFour.xsl b/games/games/connectFour/connectFour.xsl
similarity index 100%
rename from ggp-base/games/games/connectFour/connectFour.xsl
rename to games/games/connectFour/connectFour.xsl
diff --git a/ggp-base/games/games/ticTacToe/METADATA b/games/games/ticTacToe/METADATA
similarity index 100%
rename from ggp-base/games/games/ticTacToe/METADATA
rename to games/games/ticTacToe/METADATA
diff --git a/ggp-base/games/games/ticTacToe/ticTacToe.js b/games/games/ticTacToe/ticTacToe.js
similarity index 100%
rename from ggp-base/games/games/ticTacToe/ticTacToe.js
rename to games/games/ticTacToe/ticTacToe.js
diff --git a/ggp-base/games/games/ticTacToe/ticTacToe.kif b/games/games/ticTacToe/ticTacToe.kif
similarity index 100%
rename from ggp-base/games/games/ticTacToe/ticTacToe.kif
rename to games/games/ticTacToe/ticTacToe.kif
diff --git a/ggp-base/games/games/ticTacToe/ticTacToe.txt b/games/games/ticTacToe/ticTacToe.txt
similarity index 100%
rename from ggp-base/games/games/ticTacToe/ticTacToe.txt
rename to games/games/ticTacToe/ticTacToe.txt
diff --git a/ggp-base/games/games/ticTacToe/ticTacToe.xsl b/games/games/ticTacToe/ticTacToe.xsl
similarity index 100%
rename from ggp-base/games/games/ticTacToe/ticTacToe.xsl
rename to games/games/ticTacToe/ticTacToe.xsl
diff --git a/ggp-base/games/resources/images/checkers/black_king.png b/games/resources/images/checkers/black_king.png
similarity index 100%
rename from ggp-base/games/resources/images/checkers/black_king.png
rename to games/resources/images/checkers/black_king.png
diff --git a/ggp-base/games/resources/images/checkers/crown.png b/games/resources/images/checkers/crown.png
similarity index 100%
rename from ggp-base/games/resources/images/checkers/crown.png
rename to games/resources/images/checkers/crown.png
diff --git a/ggp-base/games/resources/images/checkers/red_king.png b/games/resources/images/checkers/red_king.png
similarity index 100%
rename from ggp-base/games/resources/images/checkers/red_king.png
rename to games/resources/images/checkers/red_king.png
diff --git a/ggp-base/games/resources/images/chess/Black_Bishop.png b/games/resources/images/chess/Black_Bishop.png
similarity index 100%
rename from ggp-base/games/resources/images/chess/Black_Bishop.png
rename to games/resources/images/chess/Black_Bishop.png
diff --git a/ggp-base/games/resources/images/chess/Black_King.png b/games/resources/images/chess/Black_King.png
similarity index 100%
rename from ggp-base/games/resources/images/chess/Black_King.png
rename to games/resources/images/chess/Black_King.png
diff --git a/ggp-base/games/resources/images/chess/Black_Knight.png b/games/resources/images/chess/Black_Knight.png
similarity index 100%
rename from ggp-base/games/resources/images/chess/Black_Knight.png
rename to games/resources/images/chess/Black_Knight.png
diff --git a/ggp-base/games/resources/images/chess/Black_Pawn.png b/games/resources/images/chess/Black_Pawn.png
similarity index 100%
rename from ggp-base/games/resources/images/chess/Black_Pawn.png
rename to games/resources/images/chess/Black_Pawn.png
diff --git a/ggp-base/games/resources/images/chess/Black_Queen.png b/games/resources/images/chess/Black_Queen.png
similarity index 100%
rename from ggp-base/games/resources/images/chess/Black_Queen.png
rename to games/resources/images/chess/Black_Queen.png
diff --git a/ggp-base/games/resources/images/chess/Black_Rook.png b/games/resources/images/chess/Black_Rook.png
similarity index 100%
rename from ggp-base/games/resources/images/chess/Black_Rook.png
rename to games/resources/images/chess/Black_Rook.png
diff --git a/ggp-base/games/resources/images/chess/White_Bishop.png b/games/resources/images/chess/White_Bishop.png
similarity index 100%
rename from ggp-base/games/resources/images/chess/White_Bishop.png
rename to games/resources/images/chess/White_Bishop.png
diff --git a/ggp-base/games/resources/images/chess/White_King.png b/games/resources/images/chess/White_King.png
similarity index 100%
rename from ggp-base/games/resources/images/chess/White_King.png
rename to games/resources/images/chess/White_King.png
diff --git a/ggp-base/games/resources/images/chess/White_Knight.png b/games/resources/images/chess/White_Knight.png
similarity index 100%
rename from ggp-base/games/resources/images/chess/White_Knight.png
rename to games/resources/images/chess/White_Knight.png
diff --git a/ggp-base/games/resources/images/chess/White_Pawn.png b/games/resources/images/chess/White_Pawn.png
similarity index 100%
rename from ggp-base/games/resources/images/chess/White_Pawn.png
rename to games/resources/images/chess/White_Pawn.png
diff --git a/ggp-base/games/resources/images/chess/White_Queen.png b/games/resources/images/chess/White_Queen.png
similarity index 100%
rename from ggp-base/games/resources/images/chess/White_Queen.png
rename to games/resources/images/chess/White_Queen.png
diff --git a/ggp-base/games/resources/images/chess/White_Rook.png b/games/resources/images/chess/White_Rook.png
similarity index 100%
rename from ggp-base/games/resources/images/chess/White_Rook.png
rename to games/resources/images/chess/White_Rook.png
diff --git a/ggp-base/games/resources/images/discs/black.png b/games/resources/images/discs/black.png
similarity index 100%
rename from ggp-base/games/resources/images/discs/black.png
rename to games/resources/images/discs/black.png
diff --git a/ggp-base/games/resources/images/discs/blue.png b/games/resources/images/discs/blue.png
similarity index 100%
rename from ggp-base/games/resources/images/discs/blue.png
rename to games/resources/images/discs/blue.png
diff --git a/ggp-base/games/resources/images/discs/green.png b/games/resources/images/discs/green.png
similarity index 100%
rename from ggp-base/games/resources/images/discs/green.png
rename to games/resources/images/discs/green.png
diff --git a/ggp-base/games/resources/images/discs/grey.png b/games/resources/images/discs/grey.png
similarity index 100%
rename from ggp-base/games/resources/images/discs/grey.png
rename to games/resources/images/discs/grey.png
diff --git a/ggp-base/games/resources/images/discs/orange.png b/games/resources/images/discs/orange.png
similarity index 100%
rename from ggp-base/games/resources/images/discs/orange.png
rename to games/resources/images/discs/orange.png
diff --git a/ggp-base/games/resources/images/discs/purple.png b/games/resources/images/discs/purple.png
similarity index 100%
rename from ggp-base/games/resources/images/discs/purple.png
rename to games/resources/images/discs/purple.png
diff --git a/ggp-base/games/resources/images/discs/red.png b/games/resources/images/discs/red.png
similarity index 100%
rename from ggp-base/games/resources/images/discs/red.png
rename to games/resources/images/discs/red.png
diff --git a/ggp-base/games/resources/images/discs/teal.png b/games/resources/images/discs/teal.png
similarity index 100%
rename from ggp-base/games/resources/images/discs/teal.png
rename to games/resources/images/discs/teal.png
diff --git a/ggp-base/games/resources/images/discs/white.png b/games/resources/images/discs/white.png
similarity index 100%
rename from ggp-base/games/resources/images/discs/white.png
rename to games/resources/images/discs/white.png
diff --git a/ggp-base/games/resources/images/discs/yellow.png b/games/resources/images/discs/yellow.png
similarity index 100%
rename from ggp-base/games/resources/images/discs/yellow.png
rename to games/resources/images/discs/yellow.png
diff --git a/ggp-base/games/resources/images/pentago/BlueCircleArrowCCW.png b/games/resources/images/pentago/BlueCircleArrowCCW.png
similarity index 100%
rename from ggp-base/games/resources/images/pentago/BlueCircleArrowCCW.png
rename to games/resources/images/pentago/BlueCircleArrowCCW.png
diff --git a/ggp-base/games/resources/images/pentago/BlueCircleArrowCW.png b/games/resources/images/pentago/BlueCircleArrowCW.png
similarity index 100%
rename from ggp-base/games/resources/images/pentago/BlueCircleArrowCW.png
rename to games/resources/images/pentago/BlueCircleArrowCW.png
diff --git a/ggp-base/games/test/connectFour.kif b/games/test/connectFour.kif
similarity index 100%
rename from ggp-base/games/test/connectFour.kif
rename to games/test/connectFour.kif
diff --git a/ggp-base/games/test/simpleMutex.kif b/games/test/simpleMutex.kif
similarity index 100%
rename from ggp-base/games/test/simpleMutex.kif
rename to games/test/simpleMutex.kif
diff --git a/ggp-base/games/test/test_case_1a.kif b/games/test/test_case_1a.kif
similarity index 100%
rename from ggp-base/games/test/test_case_1a.kif
rename to games/test/test_case_1a.kif
diff --git a/ggp-base/games/test/test_case_1b.kif b/games/test/test_case_1b.kif
similarity index 100%
rename from ggp-base/games/test/test_case_1b.kif
rename to games/test/test_case_1b.kif
diff --git a/ggp-base/games/test/test_case_2a.kif b/games/test/test_case_2a.kif
similarity index 100%
rename from ggp-base/games/test/test_case_2a.kif
rename to games/test/test_case_2a.kif
diff --git a/ggp-base/games/test/test_case_2b.kif b/games/test/test_case_2b.kif
similarity index 100%
rename from ggp-base/games/test/test_case_2b.kif
rename to games/test/test_case_2b.kif
diff --git a/ggp-base/games/test/test_case_2c.kif b/games/test/test_case_2c.kif
similarity index 100%
rename from ggp-base/games/test/test_case_2c.kif
rename to games/test/test_case_2c.kif
diff --git a/ggp-base/games/test/test_case_3a.kif b/games/test/test_case_3a.kif
similarity index 100%
rename from ggp-base/games/test/test_case_3a.kif
rename to games/test/test_case_3a.kif
diff --git a/ggp-base/games/test/test_case_3b.kif b/games/test/test_case_3b.kif
similarity index 100%
rename from ggp-base/games/test/test_case_3b.kif
rename to games/test/test_case_3b.kif
diff --git a/ggp-base/games/test/test_case_3c.kif b/games/test/test_case_3c.kif
similarity index 100%
rename from ggp-base/games/test/test_case_3c.kif
rename to games/test/test_case_3c.kif
diff --git a/ggp-base/games/test/test_case_3d.kif b/games/test/test_case_3d.kif
similarity index 100%
rename from ggp-base/games/test/test_case_3d.kif
rename to games/test/test_case_3d.kif
diff --git a/ggp-base/games/test/test_case_3e.kif b/games/test/test_case_3e.kif
similarity index 100%
rename from ggp-base/games/test/test_case_3e.kif
rename to games/test/test_case_3e.kif
diff --git a/ggp-base/games/test/test_case_3f.kif b/games/test/test_case_3f.kif
similarity index 100%
rename from ggp-base/games/test/test_case_3f.kif
rename to games/test/test_case_3f.kif
diff --git a/ggp-base/games/test/test_case_4a.kif b/games/test/test_case_4a.kif
similarity index 100%
rename from ggp-base/games/test/test_case_4a.kif
rename to games/test/test_case_4a.kif
diff --git a/ggp-base/games/test/test_case_5a.kif b/games/test/test_case_5a.kif
similarity index 100%
rename from ggp-base/games/test/test_case_5a.kif
rename to games/test/test_case_5a.kif
diff --git a/ggp-base/games/test/test_case_5b.kif b/games/test/test_case_5b.kif
similarity index 100%
rename from ggp-base/games/test/test_case_5b.kif
rename to games/test/test_case_5b.kif
diff --git a/ggp-base/games/test/test_case_5c.kif b/games/test/test_case_5c.kif
similarity index 100%
rename from ggp-base/games/test/test_case_5c.kif
rename to games/test/test_case_5c.kif
diff --git a/ggp-base/games/test/test_clean_not_distinct.kif b/games/test/test_clean_not_distinct.kif
similarity index 100%
rename from ggp-base/games/test/test_clean_not_distinct.kif
rename to games/test/test_clean_not_distinct.kif
diff --git a/ggp-base/games/test/test_distinct_beginning_rule.kif b/games/test/test_distinct_beginning_rule.kif
similarity index 100%
rename from ggp-base/games/test/test_distinct_beginning_rule.kif
rename to games/test/test_distinct_beginning_rule.kif
diff --git a/ggp-base/games/test/test_invalid_function_arities_differ.kif b/games/test/test_invalid_function_arities_differ.kif
similarity index 100%
rename from ggp-base/games/test/test_invalid_function_arities_differ.kif
rename to games/test/test_invalid_function_arities_differ.kif
diff --git a/ggp-base/games/test/test_invalid_sentence_arities_differ.kif b/games/test/test_invalid_sentence_arities_differ.kif
similarity index 100%
rename from ggp-base/games/test/test_invalid_sentence_arities_differ.kif
rename to games/test/test_invalid_sentence_arities_differ.kif
diff --git a/ggp-base/games/test/ticTacToe.kif b/games/test/ticTacToe.kif
similarity index 100%
rename from ggp-base/games/test/ticTacToe.kif
rename to games/test/ticTacToe.kif
diff --git a/ggp-base/licences/FlyingSaucer/LICENSE b/licences/FlyingSaucer/LICENSE
similarity index 100%
rename from ggp-base/licences/FlyingSaucer/LICENSE
rename to licences/FlyingSaucer/LICENSE
diff --git a/ggp-base/licences/FlyingSaucer/LICENSE-LGPL-2.1.txt b/licences/FlyingSaucer/LICENSE-LGPL-2.1.txt
similarity index 100%
rename from ggp-base/licences/FlyingSaucer/LICENSE-LGPL-2.1.txt
rename to licences/FlyingSaucer/LICENSE-LGPL-2.1.txt
diff --git a/ggp-base/licences/FlyingSaucer/LICENSE-W3C-TEST b/licences/FlyingSaucer/LICENSE-W3C-TEST
similarity index 100%
rename from ggp-base/licences/FlyingSaucer/LICENSE-W3C-TEST
rename to licences/FlyingSaucer/LICENSE-W3C-TEST
diff --git a/ggp-base/licences/JSON/LICENSE b/licences/JSON/LICENSE
similarity index 100%
rename from ggp-base/licences/JSON/LICENSE
rename to licences/JSON/LICENSE
diff --git a/ggp-base/licences/JTidy/LICENSE b/licences/JTidy/LICENSE
similarity index 100%
rename from ggp-base/licences/JTidy/LICENSE
rename to licences/JTidy/LICENSE
diff --git a/ggp-base/licences/Jython/LICENSE b/licences/Jython/LICENSE
similarity index 100%
rename from ggp-base/licences/Jython/LICENSE
rename to licences/Jython/LICENSE
diff --git a/ggp-base/licences/JythonConsole/COPYING.txt b/licences/JythonConsole/COPYING.txt
similarity index 100%
rename from ggp-base/licences/JythonConsole/COPYING.txt
rename to licences/JythonConsole/COPYING.txt
diff --git a/ggp-base/licences/LICENSE b/licences/LICENSE
similarity index 100%
rename from ggp-base/licences/LICENSE
rename to licences/LICENSE
diff --git a/ggp-base/overview.html b/overview.html
similarity index 100%
rename from ggp-base/overview.html
rename to overview.html
diff --git a/ggp-base/src/external/Base64Coder/Base64Coder.java b/src/external/Base64Coder/Base64Coder.java
similarity index 100%
rename from ggp-base/src/external/Base64Coder/Base64Coder.java
rename to src/external/Base64Coder/Base64Coder.java
diff --git a/ggp-base/src/external/Clojure/clojure.jar b/src/external/Clojure/clojure.jar
similarity index 100%
rename from ggp-base/src/external/Clojure/clojure.jar
rename to src/external/Clojure/clojure.jar
diff --git a/ggp-base/src/external/FlyingSaucer/core-renderer.jar b/src/external/FlyingSaucer/core-renderer.jar
similarity index 100%
rename from ggp-base/src/external/FlyingSaucer/core-renderer.jar
rename to src/external/FlyingSaucer/core-renderer.jar
diff --git a/ggp-base/src/external/Guava/guava-14.0.1.jar b/src/external/Guava/guava-14.0.1.jar
similarity index 100%
rename from ggp-base/src/external/Guava/guava-14.0.1.jar
rename to src/external/Guava/guava-14.0.1.jar
diff --git a/ggp-base/src/external/JFreeChart/jcommon-1.0.17.jar b/src/external/JFreeChart/jcommon-1.0.17.jar
similarity index 100%
rename from ggp-base/src/external/JFreeChart/jcommon-1.0.17.jar
rename to src/external/JFreeChart/jcommon-1.0.17.jar
diff --git a/ggp-base/src/external/JFreeChart/jfreechart-1.0.14.jar b/src/external/JFreeChart/jfreechart-1.0.14.jar
similarity index 100%
rename from ggp-base/src/external/JFreeChart/jfreechart-1.0.14.jar
rename to src/external/JFreeChart/jfreechart-1.0.14.jar
diff --git a/ggp-base/src/external/JGoodiesForms/forms-1.2.1.jar b/src/external/JGoodiesForms/forms-1.2.1.jar
similarity index 100%
rename from ggp-base/src/external/JGoodiesForms/forms-1.2.1.jar
rename to src/external/JGoodiesForms/forms-1.2.1.jar
diff --git a/ggp-base/src/external/JSON/JSONArray.java b/src/external/JSON/JSONArray.java
similarity index 100%
rename from ggp-base/src/external/JSON/JSONArray.java
rename to src/external/JSON/JSONArray.java
diff --git a/ggp-base/src/external/JSON/JSONException.java b/src/external/JSON/JSONException.java
similarity index 100%
rename from ggp-base/src/external/JSON/JSONException.java
rename to src/external/JSON/JSONException.java
diff --git a/ggp-base/src/external/JSON/JSONObject.java b/src/external/JSON/JSONObject.java
similarity index 100%
rename from ggp-base/src/external/JSON/JSONObject.java
rename to src/external/JSON/JSONObject.java
diff --git a/ggp-base/src/external/JSON/JSONString.java b/src/external/JSON/JSONString.java
similarity index 100%
rename from ggp-base/src/external/JSON/JSONString.java
rename to src/external/JSON/JSONString.java
diff --git a/ggp-base/src/external/JSON/JSONTokener.java b/src/external/JSON/JSONTokener.java
similarity index 100%
rename from ggp-base/src/external/JSON/JSONTokener.java
rename to src/external/JSON/JSONTokener.java
diff --git a/ggp-base/src/external/JSON/README b/src/external/JSON/README
similarity index 100%
rename from ggp-base/src/external/JSON/README
rename to src/external/JSON/README
diff --git a/ggp-base/src/external/JTidy/Tidy.jar b/src/external/JTidy/Tidy.jar
similarity index 100%
rename from ggp-base/src/external/JTidy/Tidy.jar
rename to src/external/JTidy/Tidy.jar
diff --git a/ggp-base/src/external/Jython/jython.jar b/src/external/Jython/jython.jar
similarity index 100%
rename from ggp-base/src/external/Jython/jython.jar
rename to src/external/Jython/jython.jar
diff --git a/ggp-base/src/org/ggp/base/apps/consoles/ClojureConsole.java b/src/org/ggp/base/apps/consoles/ClojureConsole.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/consoles/ClojureConsole.java
rename to src/org/ggp/base/apps/consoles/ClojureConsole.java
diff --git a/ggp-base/src/org/ggp/base/apps/consoles/PythonConsole.java b/src/org/ggp/base/apps/consoles/PythonConsole.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/consoles/PythonConsole.java
rename to src/org/ggp/base/apps/consoles/PythonConsole.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/GameCanvas.java b/src/org/ggp/base/apps/kiosk/GameCanvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/GameCanvas.java
rename to src/org/ggp/base/apps/kiosk/GameCanvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/GameGUI.java b/src/org/ggp/base/apps/kiosk/GameGUI.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/GameGUI.java
rename to src/org/ggp/base/apps/kiosk/GameGUI.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/Kiosk.java b/src/org/ggp/base/apps/kiosk/Kiosk.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/Kiosk.java
rename to src/org/ggp/base/apps/kiosk/Kiosk.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/KioskGamer.java b/src/org/ggp/base/apps/kiosk/KioskGamer.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/KioskGamer.java
rename to src/org/ggp/base/apps/kiosk/KioskGamer.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/MoveSelectedEvent.java b/src/org/ggp/base/apps/kiosk/MoveSelectedEvent.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/MoveSelectedEvent.java
rename to src/org/ggp/base/apps/kiosk/MoveSelectedEvent.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/BattleCanvas.java b/src/org/ggp/base/apps/kiosk/games/BattleCanvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/BattleCanvas.java
rename to src/org/ggp/base/apps/kiosk/games/BattleCanvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/BiddingTicTacToeCanvas.java b/src/org/ggp/base/apps/kiosk/games/BiddingTicTacToeCanvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/BiddingTicTacToeCanvas.java
rename to src/org/ggp/base/apps/kiosk/games/BiddingTicTacToeCanvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/BlockerCanvas.java b/src/org/ggp/base/apps/kiosk/games/BlockerCanvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/BlockerCanvas.java
rename to src/org/ggp/base/apps/kiosk/games/BlockerCanvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/BlokboxSimpleCanvas.java b/src/org/ggp/base/apps/kiosk/games/BlokboxSimpleCanvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/BlokboxSimpleCanvas.java
rename to src/org/ggp/base/apps/kiosk/games/BlokboxSimpleCanvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/BreakthroughCanvas.java b/src/org/ggp/base/apps/kiosk/games/BreakthroughCanvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/BreakthroughCanvas.java
rename to src/org/ggp/base/apps/kiosk/games/BreakthroughCanvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/BreakthroughHolesCanvas.java b/src/org/ggp/base/apps/kiosk/games/BreakthroughHolesCanvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/BreakthroughHolesCanvas.java
rename to src/org/ggp/base/apps/kiosk/games/BreakthroughHolesCanvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/BreakthroughSmallCanvas.java b/src/org/ggp/base/apps/kiosk/games/BreakthroughSmallCanvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/BreakthroughSmallCanvas.java
rename to src/org/ggp/base/apps/kiosk/games/BreakthroughSmallCanvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/CephalopodCanvas.java b/src/org/ggp/base/apps/kiosk/games/CephalopodCanvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/CephalopodCanvas.java
rename to src/org/ggp/base/apps/kiosk/games/CephalopodCanvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/CheckersCanvas.java b/src/org/ggp/base/apps/kiosk/games/CheckersCanvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/CheckersCanvas.java
rename to src/org/ggp/base/apps/kiosk/games/CheckersCanvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/CheckersSmallCanvas.java b/src/org/ggp/base/apps/kiosk/games/CheckersSmallCanvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/CheckersSmallCanvas.java
rename to src/org/ggp/base/apps/kiosk/games/CheckersSmallCanvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/CheckersTinyCanvas.java b/src/org/ggp/base/apps/kiosk/games/CheckersTinyCanvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/CheckersTinyCanvas.java
rename to src/org/ggp/base/apps/kiosk/games/CheckersTinyCanvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/ChessCanvas.java b/src/org/ggp/base/apps/kiosk/games/ChessCanvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/ChessCanvas.java
rename to src/org/ggp/base/apps/kiosk/games/ChessCanvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/ChickenTicTacToeCanvas.java b/src/org/ggp/base/apps/kiosk/games/ChickenTicTacToeCanvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/ChickenTicTacToeCanvas.java
rename to src/org/ggp/base/apps/kiosk/games/ChickenTicTacToeCanvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/ConnectFiveCanvas.java b/src/org/ggp/base/apps/kiosk/games/ConnectFiveCanvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/ConnectFiveCanvas.java
rename to src/org/ggp/base/apps/kiosk/games/ConnectFiveCanvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/ConnectFourCanvas.java b/src/org/ggp/base/apps/kiosk/games/ConnectFourCanvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/ConnectFourCanvas.java
rename to src/org/ggp/base/apps/kiosk/games/ConnectFourCanvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/FFACanvas.java b/src/org/ggp/base/apps/kiosk/games/FFACanvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/FFACanvas.java
rename to src/org/ggp/base/apps/kiosk/games/FFACanvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/GoldenRectangleCanvas.java b/src/org/ggp/base/apps/kiosk/games/GoldenRectangleCanvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/GoldenRectangleCanvas.java
rename to src/org/ggp/base/apps/kiosk/games/GoldenRectangleCanvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/KnightFightCanvas.java b/src/org/ggp/base/apps/kiosk/games/KnightFightCanvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/KnightFightCanvas.java
rename to src/org/ggp/base/apps/kiosk/games/KnightFightCanvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/KnightthroughCanvas.java b/src/org/ggp/base/apps/kiosk/games/KnightthroughCanvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/KnightthroughCanvas.java
rename to src/org/ggp/base/apps/kiosk/games/KnightthroughCanvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/NumberTicTacToeCanvas.java b/src/org/ggp/base/apps/kiosk/games/NumberTicTacToeCanvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/NumberTicTacToeCanvas.java
rename to src/org/ggp/base/apps/kiosk/games/NumberTicTacToeCanvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/PawnWhoppingCanvas.java b/src/org/ggp/base/apps/kiosk/games/PawnWhoppingCanvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/PawnWhoppingCanvas.java
rename to src/org/ggp/base/apps/kiosk/games/PawnWhoppingCanvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/PentagoCanvas.java b/src/org/ggp/base/apps/kiosk/games/PentagoCanvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/PentagoCanvas.java
rename to src/org/ggp/base/apps/kiosk/games/PentagoCanvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/TTCC4Canvas.java b/src/org/ggp/base/apps/kiosk/games/TTCC4Canvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/TTCC4Canvas.java
rename to src/org/ggp/base/apps/kiosk/games/TTCC4Canvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/TTCC4SmallCanvas.java b/src/org/ggp/base/apps/kiosk/games/TTCC4SmallCanvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/TTCC4SmallCanvas.java
rename to src/org/ggp/base/apps/kiosk/games/TTCC4SmallCanvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/TTCCanvas.java b/src/org/ggp/base/apps/kiosk/games/TTCCanvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/TTCCanvas.java
rename to src/org/ggp/base/apps/kiosk/games/TTCCanvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/TTTxNineCanvas.java b/src/org/ggp/base/apps/kiosk/games/TTTxNineCanvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/TTTxNineCanvas.java
rename to src/org/ggp/base/apps/kiosk/games/TTTxNineCanvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/TicTacToeCanvas.java b/src/org/ggp/base/apps/kiosk/games/TicTacToeCanvas.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/TicTacToeCanvas.java
rename to src/org/ggp/base/apps/kiosk/games/TicTacToeCanvas.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/games/TicTacToeCanvas_Reference.java b/src/org/ggp/base/apps/kiosk/games/TicTacToeCanvas_Reference.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/games/TicTacToeCanvas_Reference.java
rename to src/org/ggp/base/apps/kiosk/games/TicTacToeCanvas_Reference.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/templates/CommonGraphics.java b/src/org/ggp/base/apps/kiosk/templates/CommonGraphics.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/templates/CommonGraphics.java
rename to src/org/ggp/base/apps/kiosk/templates/CommonGraphics.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/templates/GameCanvas_Chessboard.java b/src/org/ggp/base/apps/kiosk/templates/GameCanvas_Chessboard.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/templates/GameCanvas_Chessboard.java
rename to src/org/ggp/base/apps/kiosk/templates/GameCanvas_Chessboard.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/templates/GameCanvas_FancyGrid.java b/src/org/ggp/base/apps/kiosk/templates/GameCanvas_FancyGrid.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/templates/GameCanvas_FancyGrid.java
rename to src/org/ggp/base/apps/kiosk/templates/GameCanvas_FancyGrid.java
diff --git a/ggp-base/src/org/ggp/base/apps/kiosk/templates/GameCanvas_SimpleGrid.java b/src/org/ggp/base/apps/kiosk/templates/GameCanvas_SimpleGrid.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/kiosk/templates/GameCanvas_SimpleGrid.java
rename to src/org/ggp/base/apps/kiosk/templates/GameCanvas_SimpleGrid.java
diff --git a/ggp-base/src/org/ggp/base/apps/logging/LogSummarizer.java b/src/org/ggp/base/apps/logging/LogSummarizer.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/logging/LogSummarizer.java
rename to src/org/ggp/base/apps/logging/LogSummarizer.java
diff --git a/ggp-base/src/org/ggp/base/apps/player/Player.java b/src/org/ggp/base/apps/player/Player.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/player/Player.java
rename to src/org/ggp/base/apps/player/Player.java
diff --git a/ggp-base/src/org/ggp/base/apps/player/PlayerRunner.java b/src/org/ggp/base/apps/player/PlayerRunner.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/player/PlayerRunner.java
rename to src/org/ggp/base/apps/player/PlayerRunner.java
diff --git a/ggp-base/src/org/ggp/base/apps/player/ProxiedPlayerRunner.java b/src/org/ggp/base/apps/player/ProxiedPlayerRunner.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/player/ProxiedPlayerRunner.java
rename to src/org/ggp/base/apps/player/ProxiedPlayerRunner.java
diff --git a/ggp-base/src/org/ggp/base/apps/player/config/ConfigPanel.java b/src/org/ggp/base/apps/player/config/ConfigPanel.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/player/config/ConfigPanel.java
rename to src/org/ggp/base/apps/player/config/ConfigPanel.java
diff --git a/ggp-base/src/org/ggp/base/apps/player/config/EmptyConfigPanel.java b/src/org/ggp/base/apps/player/config/EmptyConfigPanel.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/player/config/EmptyConfigPanel.java
rename to src/org/ggp/base/apps/player/config/EmptyConfigPanel.java
diff --git a/ggp-base/src/org/ggp/base/apps/player/detail/DetailPanel.java b/src/org/ggp/base/apps/player/detail/DetailPanel.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/player/detail/DetailPanel.java
rename to src/org/ggp/base/apps/player/detail/DetailPanel.java
diff --git a/ggp-base/src/org/ggp/base/apps/player/detail/EmptyDetailPanel.java b/src/org/ggp/base/apps/player/detail/EmptyDetailPanel.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/player/detail/EmptyDetailPanel.java
rename to src/org/ggp/base/apps/player/detail/EmptyDetailPanel.java
diff --git a/ggp-base/src/org/ggp/base/apps/player/detail/SimpleDetailPanel.java b/src/org/ggp/base/apps/player/detail/SimpleDetailPanel.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/player/detail/SimpleDetailPanel.java
rename to src/org/ggp/base/apps/player/detail/SimpleDetailPanel.java
diff --git a/ggp-base/src/org/ggp/base/apps/player/match/MatchPanel.java b/src/org/ggp/base/apps/player/match/MatchPanel.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/player/match/MatchPanel.java
rename to src/org/ggp/base/apps/player/match/MatchPanel.java
diff --git a/ggp-base/src/org/ggp/base/apps/player/network/NetworkPanel.java b/src/org/ggp/base/apps/player/network/NetworkPanel.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/player/network/NetworkPanel.java
rename to src/org/ggp/base/apps/player/network/NetworkPanel.java
diff --git a/ggp-base/src/org/ggp/base/apps/server/Server.java b/src/org/ggp/base/apps/server/Server.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/server/Server.java
rename to src/org/ggp/base/apps/server/Server.java
diff --git a/ggp-base/src/org/ggp/base/apps/server/error/ErrorPanel.java b/src/org/ggp/base/apps/server/error/ErrorPanel.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/server/error/ErrorPanel.java
rename to src/org/ggp/base/apps/server/error/ErrorPanel.java
diff --git a/ggp-base/src/org/ggp/base/apps/server/history/HistoryPanel.java b/src/org/ggp/base/apps/server/history/HistoryPanel.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/server/history/HistoryPanel.java
rename to src/org/ggp/base/apps/server/history/HistoryPanel.java
diff --git a/ggp-base/src/org/ggp/base/apps/server/leaderboard/LeaderboardPanel.java b/src/org/ggp/base/apps/server/leaderboard/LeaderboardPanel.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/server/leaderboard/LeaderboardPanel.java
rename to src/org/ggp/base/apps/server/leaderboard/LeaderboardPanel.java
diff --git a/ggp-base/src/org/ggp/base/apps/server/scheduling/PendingMatch.java b/src/org/ggp/base/apps/server/scheduling/PendingMatch.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/server/scheduling/PendingMatch.java
rename to src/org/ggp/base/apps/server/scheduling/PendingMatch.java
diff --git a/ggp-base/src/org/ggp/base/apps/server/scheduling/Scheduler.java b/src/org/ggp/base/apps/server/scheduling/Scheduler.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/server/scheduling/Scheduler.java
rename to src/org/ggp/base/apps/server/scheduling/Scheduler.java
diff --git a/ggp-base/src/org/ggp/base/apps/server/scheduling/SchedulingPanel.java b/src/org/ggp/base/apps/server/scheduling/SchedulingPanel.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/server/scheduling/SchedulingPanel.java
rename to src/org/ggp/base/apps/server/scheduling/SchedulingPanel.java
diff --git a/ggp-base/src/org/ggp/base/apps/server/states/StatesPanel.java b/src/org/ggp/base/apps/server/states/StatesPanel.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/server/states/StatesPanel.java
rename to src/org/ggp/base/apps/server/states/StatesPanel.java
diff --git a/ggp-base/src/org/ggp/base/apps/server/visualization/VisualizationPanel.java b/src/org/ggp/base/apps/server/visualization/VisualizationPanel.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/server/visualization/VisualizationPanel.java
rename to src/org/ggp/base/apps/server/visualization/VisualizationPanel.java
diff --git a/ggp-base/src/org/ggp/base/apps/server/visualization/VizContainerPanel.java b/src/org/ggp/base/apps/server/visualization/VizContainerPanel.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/server/visualization/VizContainerPanel.java
rename to src/org/ggp/base/apps/server/visualization/VizContainerPanel.java
diff --git a/ggp-base/src/org/ggp/base/apps/tiltyard/TiltyardRequestFarm.java b/src/org/ggp/base/apps/tiltyard/TiltyardRequestFarm.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/tiltyard/TiltyardRequestFarm.java
rename to src/org/ggp/base/apps/tiltyard/TiltyardRequestFarm.java
diff --git a/ggp-base/src/org/ggp/base/apps/tiltyard/TiltyardRequestFarm_Test.java b/src/org/ggp/base/apps/tiltyard/TiltyardRequestFarm_Test.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/tiltyard/TiltyardRequestFarm_Test.java
rename to src/org/ggp/base/apps/tiltyard/TiltyardRequestFarm_Test.java
diff --git a/ggp-base/src/org/ggp/base/apps/utilities/GameServerRunner.java b/src/org/ggp/base/apps/utilities/GameServerRunner.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/utilities/GameServerRunner.java
rename to src/org/ggp/base/apps/utilities/GameServerRunner.java
diff --git a/ggp-base/src/org/ggp/base/apps/utilities/SampleKeys.json b/src/org/ggp/base/apps/utilities/SampleKeys.json
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/utilities/SampleKeys.json
rename to src/org/ggp/base/apps/utilities/SampleKeys.json
diff --git a/ggp-base/src/org/ggp/base/apps/utilities/SimpleGameSim.java b/src/org/ggp/base/apps/utilities/SimpleGameSim.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/utilities/SimpleGameSim.java
rename to src/org/ggp/base/apps/utilities/SimpleGameSim.java
diff --git a/ggp-base/src/org/ggp/base/apps/validator/BatchValidator.java b/src/org/ggp/base/apps/validator/BatchValidator.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/validator/BatchValidator.java
rename to src/org/ggp/base/apps/validator/BatchValidator.java
diff --git a/ggp-base/src/org/ggp/base/apps/validator/OutcomePanel.java b/src/org/ggp/base/apps/validator/OutcomePanel.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/validator/OutcomePanel.java
rename to src/org/ggp/base/apps/validator/OutcomePanel.java
diff --git a/ggp-base/src/org/ggp/base/apps/validator/Validator.java b/src/org/ggp/base/apps/validator/Validator.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/validator/Validator.java
rename to src/org/ggp/base/apps/validator/Validator.java
diff --git a/ggp-base/src/org/ggp/base/apps/validator/ValidatorThread.java b/src/org/ggp/base/apps/validator/ValidatorThread.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/validator/ValidatorThread.java
rename to src/org/ggp/base/apps/validator/ValidatorThread.java
diff --git a/ggp-base/src/org/ggp/base/apps/validator/event/ValidatorFailureEvent.java b/src/org/ggp/base/apps/validator/event/ValidatorFailureEvent.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/validator/event/ValidatorFailureEvent.java
rename to src/org/ggp/base/apps/validator/event/ValidatorFailureEvent.java
diff --git a/ggp-base/src/org/ggp/base/apps/validator/event/ValidatorSuccessEvent.java b/src/org/ggp/base/apps/validator/event/ValidatorSuccessEvent.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/apps/validator/event/ValidatorSuccessEvent.java
rename to src/org/ggp/base/apps/validator/event/ValidatorSuccessEvent.java
diff --git a/ggp-base/src/org/ggp/base/player/GamePlayer.java b/src/org/ggp/base/player/GamePlayer.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/GamePlayer.java
rename to src/org/ggp/base/player/GamePlayer.java
diff --git a/ggp-base/src/org/ggp/base/player/event/PlayerDroppedPacketEvent.java b/src/org/ggp/base/player/event/PlayerDroppedPacketEvent.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/event/PlayerDroppedPacketEvent.java
rename to src/org/ggp/base/player/event/PlayerDroppedPacketEvent.java
diff --git a/ggp-base/src/org/ggp/base/player/event/PlayerReceivedMessageEvent.java b/src/org/ggp/base/player/event/PlayerReceivedMessageEvent.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/event/PlayerReceivedMessageEvent.java
rename to src/org/ggp/base/player/event/PlayerReceivedMessageEvent.java
diff --git a/ggp-base/src/org/ggp/base/player/event/PlayerSentMessageEvent.java b/src/org/ggp/base/player/event/PlayerSentMessageEvent.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/event/PlayerSentMessageEvent.java
rename to src/org/ggp/base/player/event/PlayerSentMessageEvent.java
diff --git a/ggp-base/src/org/ggp/base/player/event/PlayerTimeEvent.java b/src/org/ggp/base/player/event/PlayerTimeEvent.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/event/PlayerTimeEvent.java
rename to src/org/ggp/base/player/event/PlayerTimeEvent.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/Gamer.java b/src/org/ggp/base/player/gamer/Gamer.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/Gamer.java
rename to src/org/ggp/base/player/gamer/Gamer.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/clojure/ClojureGamer.java b/src/org/ggp/base/player/gamer/clojure/ClojureGamer.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/clojure/ClojureGamer.java
rename to src/org/ggp/base/player/gamer/clojure/ClojureGamer.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/clojure/ClojureGamer_Test.java b/src/org/ggp/base/player/gamer/clojure/ClojureGamer_Test.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/clojure/ClojureGamer_Test.java
rename to src/org/ggp/base/player/gamer/clojure/ClojureGamer_Test.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/clojure/stubs/SampleClojureGamerStub.java b/src/org/ggp/base/player/gamer/clojure/stubs/SampleClojureGamerStub.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/clojure/stubs/SampleClojureGamerStub.java
rename to src/org/ggp/base/player/gamer/clojure/stubs/SampleClojureGamerStub.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/event/GamerAbortedMatchEvent.java b/src/org/ggp/base/player/gamer/event/GamerAbortedMatchEvent.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/event/GamerAbortedMatchEvent.java
rename to src/org/ggp/base/player/gamer/event/GamerAbortedMatchEvent.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/event/GamerCompletedMatchEvent.java b/src/org/ggp/base/player/gamer/event/GamerCompletedMatchEvent.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/event/GamerCompletedMatchEvent.java
rename to src/org/ggp/base/player/gamer/event/GamerCompletedMatchEvent.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/event/GamerNewMatchEvent.java b/src/org/ggp/base/player/gamer/event/GamerNewMatchEvent.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/event/GamerNewMatchEvent.java
rename to src/org/ggp/base/player/gamer/event/GamerNewMatchEvent.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/event/GamerSelectedMoveEvent.java b/src/org/ggp/base/player/gamer/event/GamerSelectedMoveEvent.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/event/GamerSelectedMoveEvent.java
rename to src/org/ggp/base/player/gamer/event/GamerSelectedMoveEvent.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/event/GamerUnrecognizedMatchEvent.java b/src/org/ggp/base/player/gamer/event/GamerUnrecognizedMatchEvent.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/event/GamerUnrecognizedMatchEvent.java
rename to src/org/ggp/base/player/gamer/event/GamerUnrecognizedMatchEvent.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/exception/AbortingException.java b/src/org/ggp/base/player/gamer/exception/AbortingException.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/exception/AbortingException.java
rename to src/org/ggp/base/player/gamer/exception/AbortingException.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/exception/GamePreviewException.java b/src/org/ggp/base/player/gamer/exception/GamePreviewException.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/exception/GamePreviewException.java
rename to src/org/ggp/base/player/gamer/exception/GamePreviewException.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/exception/MetaGamingException.java b/src/org/ggp/base/player/gamer/exception/MetaGamingException.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/exception/MetaGamingException.java
rename to src/org/ggp/base/player/gamer/exception/MetaGamingException.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/exception/MoveSelectionException.java b/src/org/ggp/base/player/gamer/exception/MoveSelectionException.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/exception/MoveSelectionException.java
rename to src/org/ggp/base/player/gamer/exception/MoveSelectionException.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/exception/StoppingException.java b/src/org/ggp/base/player/gamer/exception/StoppingException.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/exception/StoppingException.java
rename to src/org/ggp/base/player/gamer/exception/StoppingException.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/python/PythonGamer.java b/src/org/ggp/base/player/gamer/python/PythonGamer.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/python/PythonGamer.java
rename to src/org/ggp/base/player/gamer/python/PythonGamer.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/python/PythonGamer_Test.java b/src/org/ggp/base/player/gamer/python/PythonGamer_Test.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/python/PythonGamer_Test.java
rename to src/org/ggp/base/player/gamer/python/PythonGamer_Test.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/python/stubs/SamplePythonGamerStub.java b/src/org/ggp/base/player/gamer/python/stubs/SamplePythonGamerStub.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/python/stubs/SamplePythonGamerStub.java
rename to src/org/ggp/base/player/gamer/python/stubs/SamplePythonGamerStub.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/statemachine/StateMachineGamer.java b/src/org/ggp/base/player/gamer/statemachine/StateMachineGamer.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/statemachine/StateMachineGamer.java
rename to src/org/ggp/base/player/gamer/statemachine/StateMachineGamer.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/statemachine/human/HumanGamer.java b/src/org/ggp/base/player/gamer/statemachine/human/HumanGamer.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/statemachine/human/HumanGamer.java
rename to src/org/ggp/base/player/gamer/statemachine/human/HumanGamer.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/statemachine/human/event/HumanNewMovesEvent.java b/src/org/ggp/base/player/gamer/statemachine/human/event/HumanNewMovesEvent.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/statemachine/human/event/HumanNewMovesEvent.java
rename to src/org/ggp/base/player/gamer/statemachine/human/event/HumanNewMovesEvent.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/statemachine/human/event/HumanTimeoutEvent.java b/src/org/ggp/base/player/gamer/statemachine/human/event/HumanTimeoutEvent.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/statemachine/human/event/HumanTimeoutEvent.java
rename to src/org/ggp/base/player/gamer/statemachine/human/event/HumanTimeoutEvent.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/statemachine/human/gui/HumanDetailPanel.java b/src/org/ggp/base/player/gamer/statemachine/human/gui/HumanDetailPanel.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/statemachine/human/gui/HumanDetailPanel.java
rename to src/org/ggp/base/player/gamer/statemachine/human/gui/HumanDetailPanel.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/statemachine/random/RandomGamer.java b/src/org/ggp/base/player/gamer/statemachine/random/RandomGamer.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/statemachine/random/RandomGamer.java
rename to src/org/ggp/base/player/gamer/statemachine/random/RandomGamer.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/statemachine/sample/SampleGamer.java b/src/org/ggp/base/player/gamer/statemachine/sample/SampleGamer.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/statemachine/sample/SampleGamer.java
rename to src/org/ggp/base/player/gamer/statemachine/sample/SampleGamer.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/statemachine/sample/SampleLegalGamer.java b/src/org/ggp/base/player/gamer/statemachine/sample/SampleLegalGamer.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/statemachine/sample/SampleLegalGamer.java
rename to src/org/ggp/base/player/gamer/statemachine/sample/SampleLegalGamer.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/statemachine/sample/SampleMonteCarloGamer.java b/src/org/ggp/base/player/gamer/statemachine/sample/SampleMonteCarloGamer.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/statemachine/sample/SampleMonteCarloGamer.java
rename to src/org/ggp/base/player/gamer/statemachine/sample/SampleMonteCarloGamer.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/statemachine/sample/SampleNoopGamer.java b/src/org/ggp/base/player/gamer/statemachine/sample/SampleNoopGamer.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/statemachine/sample/SampleNoopGamer.java
rename to src/org/ggp/base/player/gamer/statemachine/sample/SampleNoopGamer.java
diff --git a/ggp-base/src/org/ggp/base/player/gamer/statemachine/sample/SampleSearchLightGamer.java b/src/org/ggp/base/player/gamer/statemachine/sample/SampleSearchLightGamer.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/gamer/statemachine/sample/SampleSearchLightGamer.java
rename to src/org/ggp/base/player/gamer/statemachine/sample/SampleSearchLightGamer.java
diff --git a/ggp-base/src/org/ggp/base/player/proxy/ProxyGamePlayer.java b/src/org/ggp/base/player/proxy/ProxyGamePlayer.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/proxy/ProxyGamePlayer.java
rename to src/org/ggp/base/player/proxy/ProxyGamePlayer.java
diff --git a/ggp-base/src/org/ggp/base/player/proxy/ProxyGamePlayerClient.java b/src/org/ggp/base/player/proxy/ProxyGamePlayerClient.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/proxy/ProxyGamePlayerClient.java
rename to src/org/ggp/base/player/proxy/ProxyGamePlayerClient.java
diff --git a/ggp-base/src/org/ggp/base/player/proxy/ProxyMessage.java b/src/org/ggp/base/player/proxy/ProxyMessage.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/proxy/ProxyMessage.java
rename to src/org/ggp/base/player/proxy/ProxyMessage.java
diff --git a/ggp-base/src/org/ggp/base/player/proxy/WorkingResponseSelectedEvent.java b/src/org/ggp/base/player/proxy/WorkingResponseSelectedEvent.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/proxy/WorkingResponseSelectedEvent.java
rename to src/org/ggp/base/player/proxy/WorkingResponseSelectedEvent.java
diff --git a/ggp-base/src/org/ggp/base/player/request/factory/RequestFactory.java b/src/org/ggp/base/player/request/factory/RequestFactory.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/request/factory/RequestFactory.java
rename to src/org/ggp/base/player/request/factory/RequestFactory.java
diff --git a/ggp-base/src/org/ggp/base/player/request/factory/exceptions/RequestFormatException.java b/src/org/ggp/base/player/request/factory/exceptions/RequestFormatException.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/request/factory/exceptions/RequestFormatException.java
rename to src/org/ggp/base/player/request/factory/exceptions/RequestFormatException.java
diff --git a/ggp-base/src/org/ggp/base/player/request/grammar/AbortRequest.java b/src/org/ggp/base/player/request/grammar/AbortRequest.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/request/grammar/AbortRequest.java
rename to src/org/ggp/base/player/request/grammar/AbortRequest.java
diff --git a/ggp-base/src/org/ggp/base/player/request/grammar/InfoRequest.java b/src/org/ggp/base/player/request/grammar/InfoRequest.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/request/grammar/InfoRequest.java
rename to src/org/ggp/base/player/request/grammar/InfoRequest.java
diff --git a/ggp-base/src/org/ggp/base/player/request/grammar/PlayRequest.java b/src/org/ggp/base/player/request/grammar/PlayRequest.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/request/grammar/PlayRequest.java
rename to src/org/ggp/base/player/request/grammar/PlayRequest.java
diff --git a/ggp-base/src/org/ggp/base/player/request/grammar/PreviewRequest.java b/src/org/ggp/base/player/request/grammar/PreviewRequest.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/request/grammar/PreviewRequest.java
rename to src/org/ggp/base/player/request/grammar/PreviewRequest.java
diff --git a/ggp-base/src/org/ggp/base/player/request/grammar/Request.java b/src/org/ggp/base/player/request/grammar/Request.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/request/grammar/Request.java
rename to src/org/ggp/base/player/request/grammar/Request.java
diff --git a/ggp-base/src/org/ggp/base/player/request/grammar/StartRequest.java b/src/org/ggp/base/player/request/grammar/StartRequest.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/request/grammar/StartRequest.java
rename to src/org/ggp/base/player/request/grammar/StartRequest.java
diff --git a/ggp-base/src/org/ggp/base/player/request/grammar/StopRequest.java b/src/org/ggp/base/player/request/grammar/StopRequest.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/player/request/grammar/StopRequest.java
rename to src/org/ggp/base/player/request/grammar/StopRequest.java
diff --git a/ggp-base/src/org/ggp/base/server/GameServer.java b/src/org/ggp/base/server/GameServer.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/server/GameServer.java
rename to src/org/ggp/base/server/GameServer.java
diff --git a/ggp-base/src/org/ggp/base/server/event/ServerAbortedMatchEvent.java b/src/org/ggp/base/server/event/ServerAbortedMatchEvent.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/server/event/ServerAbortedMatchEvent.java
rename to src/org/ggp/base/server/event/ServerAbortedMatchEvent.java
diff --git a/ggp-base/src/org/ggp/base/server/event/ServerCompletedMatchEvent.java b/src/org/ggp/base/server/event/ServerCompletedMatchEvent.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/server/event/ServerCompletedMatchEvent.java
rename to src/org/ggp/base/server/event/ServerCompletedMatchEvent.java
diff --git a/ggp-base/src/org/ggp/base/server/event/ServerConnectionErrorEvent.java b/src/org/ggp/base/server/event/ServerConnectionErrorEvent.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/server/event/ServerConnectionErrorEvent.java
rename to src/org/ggp/base/server/event/ServerConnectionErrorEvent.java
diff --git a/ggp-base/src/org/ggp/base/server/event/ServerIllegalMoveEvent.java b/src/org/ggp/base/server/event/ServerIllegalMoveEvent.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/server/event/ServerIllegalMoveEvent.java
rename to src/org/ggp/base/server/event/ServerIllegalMoveEvent.java
diff --git a/ggp-base/src/org/ggp/base/server/event/ServerMatchUpdatedEvent.java b/src/org/ggp/base/server/event/ServerMatchUpdatedEvent.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/server/event/ServerMatchUpdatedEvent.java
rename to src/org/ggp/base/server/event/ServerMatchUpdatedEvent.java
diff --git a/ggp-base/src/org/ggp/base/server/event/ServerNewGameStateEvent.java b/src/org/ggp/base/server/event/ServerNewGameStateEvent.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/server/event/ServerNewGameStateEvent.java
rename to src/org/ggp/base/server/event/ServerNewGameStateEvent.java
diff --git a/ggp-base/src/org/ggp/base/server/event/ServerNewMatchEvent.java b/src/org/ggp/base/server/event/ServerNewMatchEvent.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/server/event/ServerNewMatchEvent.java
rename to src/org/ggp/base/server/event/ServerNewMatchEvent.java
diff --git a/ggp-base/src/org/ggp/base/server/event/ServerNewMovesEvent.java b/src/org/ggp/base/server/event/ServerNewMovesEvent.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/server/event/ServerNewMovesEvent.java
rename to src/org/ggp/base/server/event/ServerNewMovesEvent.java
diff --git a/ggp-base/src/org/ggp/base/server/event/ServerTimeEvent.java b/src/org/ggp/base/server/event/ServerTimeEvent.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/server/event/ServerTimeEvent.java
rename to src/org/ggp/base/server/event/ServerTimeEvent.java
diff --git a/ggp-base/src/org/ggp/base/server/event/ServerTimeoutEvent.java b/src/org/ggp/base/server/event/ServerTimeoutEvent.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/server/event/ServerTimeoutEvent.java
rename to src/org/ggp/base/server/event/ServerTimeoutEvent.java
diff --git a/ggp-base/src/org/ggp/base/server/request/RequestBuilder.java b/src/org/ggp/base/server/request/RequestBuilder.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/server/request/RequestBuilder.java
rename to src/org/ggp/base/server/request/RequestBuilder.java
diff --git a/ggp-base/src/org/ggp/base/server/threads/AbortRequestThread.java b/src/org/ggp/base/server/threads/AbortRequestThread.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/server/threads/AbortRequestThread.java
rename to src/org/ggp/base/server/threads/AbortRequestThread.java
diff --git a/ggp-base/src/org/ggp/base/server/threads/PlayRequestThread.java b/src/org/ggp/base/server/threads/PlayRequestThread.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/server/threads/PlayRequestThread.java
rename to src/org/ggp/base/server/threads/PlayRequestThread.java
diff --git a/ggp-base/src/org/ggp/base/server/threads/PreviewRequestThread.java b/src/org/ggp/base/server/threads/PreviewRequestThread.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/server/threads/PreviewRequestThread.java
rename to src/org/ggp/base/server/threads/PreviewRequestThread.java
diff --git a/ggp-base/src/org/ggp/base/server/threads/RandomPlayRequestThread.java b/src/org/ggp/base/server/threads/RandomPlayRequestThread.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/server/threads/RandomPlayRequestThread.java
rename to src/org/ggp/base/server/threads/RandomPlayRequestThread.java
diff --git a/ggp-base/src/org/ggp/base/server/threads/RequestThread.java b/src/org/ggp/base/server/threads/RequestThread.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/server/threads/RequestThread.java
rename to src/org/ggp/base/server/threads/RequestThread.java
diff --git a/ggp-base/src/org/ggp/base/server/threads/StartRequestThread.java b/src/org/ggp/base/server/threads/StartRequestThread.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/server/threads/StartRequestThread.java
rename to src/org/ggp/base/server/threads/StartRequestThread.java
diff --git a/ggp-base/src/org/ggp/base/server/threads/StopRequestThread.java b/src/org/ggp/base/server/threads/StopRequestThread.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/server/threads/StopRequestThread.java
rename to src/org/ggp/base/server/threads/StopRequestThread.java
diff --git a/ggp-base/src/org/ggp/base/test/AllTests.java b/src/org/ggp/base/test/AllTests.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/test/AllTests.java
rename to src/org/ggp/base/test/AllTests.java
diff --git a/ggp-base/src/org/ggp/base/test/GameParsingTests.java b/src/org/ggp/base/test/GameParsingTests.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/test/GameParsingTests.java
rename to src/org/ggp/base/test/GameParsingTests.java
diff --git a/ggp-base/src/org/ggp/base/test/GdlCleanerTests.java b/src/org/ggp/base/test/GdlCleanerTests.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/test/GdlCleanerTests.java
rename to src/org/ggp/base/test/GdlCleanerTests.java
diff --git a/ggp-base/src/org/ggp/base/test/NoTabsInRulesheetsTest.java b/src/org/ggp/base/test/NoTabsInRulesheetsTest.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/test/NoTabsInRulesheetsTest.java
rename to src/org/ggp/base/test/NoTabsInRulesheetsTest.java
diff --git a/ggp-base/src/org/ggp/base/test/ProverStateMachineTests.java b/src/org/ggp/base/test/ProverStateMachineTests.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/test/ProverStateMachineTests.java
rename to src/org/ggp/base/test/ProverStateMachineTests.java
diff --git a/ggp-base/src/org/ggp/base/test/StaticValidationTests.java b/src/org/ggp/base/test/StaticValidationTests.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/test/StaticValidationTests.java
rename to src/org/ggp/base/test/StaticValidationTests.java
diff --git a/ggp-base/src/org/ggp/base/util/concurrency/ConcurrencyUtils.java b/src/org/ggp/base/util/concurrency/ConcurrencyUtils.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/concurrency/ConcurrencyUtils.java
rename to src/org/ggp/base/util/concurrency/ConcurrencyUtils.java
diff --git a/ggp-base/src/org/ggp/base/util/configuration/GamerConfiguration.java b/src/org/ggp/base/util/configuration/GamerConfiguration.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/configuration/GamerConfiguration.java
rename to src/org/ggp/base/util/configuration/GamerConfiguration.java
diff --git a/ggp-base/src/org/ggp/base/util/configuration/ProjectConfiguration.java b/src/org/ggp/base/util/configuration/ProjectConfiguration.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/configuration/ProjectConfiguration.java
rename to src/org/ggp/base/util/configuration/ProjectConfiguration.java
diff --git a/ggp-base/src/org/ggp/base/util/crypto/BaseCryptography.java b/src/org/ggp/base/util/crypto/BaseCryptography.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/crypto/BaseCryptography.java
rename to src/org/ggp/base/util/crypto/BaseCryptography.java
diff --git a/ggp-base/src/org/ggp/base/util/crypto/BaseHashing.java b/src/org/ggp/base/util/crypto/BaseHashing.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/crypto/BaseHashing.java
rename to src/org/ggp/base/util/crypto/BaseHashing.java
diff --git a/ggp-base/src/org/ggp/base/util/crypto/CanonicalJSON.java b/src/org/ggp/base/util/crypto/CanonicalJSON.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/crypto/CanonicalJSON.java
rename to src/org/ggp/base/util/crypto/CanonicalJSON.java
diff --git a/ggp-base/src/org/ggp/base/util/crypto/SignableJSON.java b/src/org/ggp/base/util/crypto/SignableJSON.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/crypto/SignableJSON.java
rename to src/org/ggp/base/util/crypto/SignableJSON.java
diff --git a/ggp-base/src/org/ggp/base/util/crypto/Test_BaseCryptography.java b/src/org/ggp/base/util/crypto/Test_BaseCryptography.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/crypto/Test_BaseCryptography.java
rename to src/org/ggp/base/util/crypto/Test_BaseCryptography.java
diff --git a/ggp-base/src/org/ggp/base/util/crypto/Test_CanonicalJSON.java b/src/org/ggp/base/util/crypto/Test_CanonicalJSON.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/crypto/Test_CanonicalJSON.java
rename to src/org/ggp/base/util/crypto/Test_CanonicalJSON.java
diff --git a/ggp-base/src/org/ggp/base/util/crypto/Test_SignableJSON.java b/src/org/ggp/base/util/crypto/Test_SignableJSON.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/crypto/Test_SignableJSON.java
rename to src/org/ggp/base/util/crypto/Test_SignableJSON.java
diff --git a/ggp-base/src/org/ggp/base/util/files/FileUtils.java b/src/org/ggp/base/util/files/FileUtils.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/files/FileUtils.java
rename to src/org/ggp/base/util/files/FileUtils.java
diff --git a/ggp-base/src/org/ggp/base/util/game/CloudGameRepository.java b/src/org/ggp/base/util/game/CloudGameRepository.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/game/CloudGameRepository.java
rename to src/org/ggp/base/util/game/CloudGameRepository.java
diff --git a/ggp-base/src/org/ggp/base/util/game/Game.java b/src/org/ggp/base/util/game/Game.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/game/Game.java
rename to src/org/ggp/base/util/game/Game.java
diff --git a/ggp-base/src/org/ggp/base/util/game/GameRepository.java b/src/org/ggp/base/util/game/GameRepository.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/game/GameRepository.java
rename to src/org/ggp/base/util/game/GameRepository.java
diff --git a/ggp-base/src/org/ggp/base/util/game/LocalGameRepository.java b/src/org/ggp/base/util/game/LocalGameRepository.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/game/LocalGameRepository.java
rename to src/org/ggp/base/util/game/LocalGameRepository.java
diff --git a/ggp-base/src/org/ggp/base/util/game/RemoteGameRepository.java b/src/org/ggp/base/util/game/RemoteGameRepository.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/game/RemoteGameRepository.java
rename to src/org/ggp/base/util/game/RemoteGameRepository.java
diff --git a/ggp-base/src/org/ggp/base/util/game/TestGameRepository.java b/src/org/ggp/base/util/game/TestGameRepository.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/game/TestGameRepository.java
rename to src/org/ggp/base/util/game/TestGameRepository.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/GdlUtils.java b/src/org/ggp/base/util/gdl/GdlUtils.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/GdlUtils.java
rename to src/org/ggp/base/util/gdl/GdlUtils.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/GdlValidator.java b/src/org/ggp/base/util/gdl/GdlValidator.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/GdlValidator.java
rename to src/org/ggp/base/util/gdl/GdlValidator.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/GdlVisitor.java b/src/org/ggp/base/util/gdl/GdlVisitor.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/GdlVisitor.java
rename to src/org/ggp/base/util/gdl/GdlVisitor.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/GdlVisitors.java b/src/org/ggp/base/util/gdl/GdlVisitors.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/GdlVisitors.java
rename to src/org/ggp/base/util/gdl/GdlVisitors.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/factory/GdlFactory.java b/src/org/ggp/base/util/gdl/factory/GdlFactory.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/factory/GdlFactory.java
rename to src/org/ggp/base/util/gdl/factory/GdlFactory.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/factory/exceptions/GdlFormatException.java b/src/org/ggp/base/util/gdl/factory/exceptions/GdlFormatException.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/factory/exceptions/GdlFormatException.java
rename to src/org/ggp/base/util/gdl/factory/exceptions/GdlFormatException.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/grammar/Gdl.java b/src/org/ggp/base/util/gdl/grammar/Gdl.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/grammar/Gdl.java
rename to src/org/ggp/base/util/gdl/grammar/Gdl.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/grammar/GdlConstant.java b/src/org/ggp/base/util/gdl/grammar/GdlConstant.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/grammar/GdlConstant.java
rename to src/org/ggp/base/util/gdl/grammar/GdlConstant.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/grammar/GdlDistinct.java b/src/org/ggp/base/util/gdl/grammar/GdlDistinct.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/grammar/GdlDistinct.java
rename to src/org/ggp/base/util/gdl/grammar/GdlDistinct.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/grammar/GdlFunction.java b/src/org/ggp/base/util/gdl/grammar/GdlFunction.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/grammar/GdlFunction.java
rename to src/org/ggp/base/util/gdl/grammar/GdlFunction.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/grammar/GdlLiteral.java b/src/org/ggp/base/util/gdl/grammar/GdlLiteral.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/grammar/GdlLiteral.java
rename to src/org/ggp/base/util/gdl/grammar/GdlLiteral.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/grammar/GdlNot.java b/src/org/ggp/base/util/gdl/grammar/GdlNot.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/grammar/GdlNot.java
rename to src/org/ggp/base/util/gdl/grammar/GdlNot.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/grammar/GdlOr.java b/src/org/ggp/base/util/gdl/grammar/GdlOr.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/grammar/GdlOr.java
rename to src/org/ggp/base/util/gdl/grammar/GdlOr.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/grammar/GdlPool.java b/src/org/ggp/base/util/gdl/grammar/GdlPool.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/grammar/GdlPool.java
rename to src/org/ggp/base/util/gdl/grammar/GdlPool.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/grammar/GdlProposition.java b/src/org/ggp/base/util/gdl/grammar/GdlProposition.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/grammar/GdlProposition.java
rename to src/org/ggp/base/util/gdl/grammar/GdlProposition.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/grammar/GdlRelation.java b/src/org/ggp/base/util/gdl/grammar/GdlRelation.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/grammar/GdlRelation.java
rename to src/org/ggp/base/util/gdl/grammar/GdlRelation.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/grammar/GdlRule.java b/src/org/ggp/base/util/gdl/grammar/GdlRule.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/grammar/GdlRule.java
rename to src/org/ggp/base/util/gdl/grammar/GdlRule.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/grammar/GdlSentence.java b/src/org/ggp/base/util/gdl/grammar/GdlSentence.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/grammar/GdlSentence.java
rename to src/org/ggp/base/util/gdl/grammar/GdlSentence.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/grammar/GdlTerm.java b/src/org/ggp/base/util/gdl/grammar/GdlTerm.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/grammar/GdlTerm.java
rename to src/org/ggp/base/util/gdl/grammar/GdlTerm.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/grammar/GdlVariable.java b/src/org/ggp/base/util/gdl/grammar/GdlVariable.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/grammar/GdlVariable.java
rename to src/org/ggp/base/util/gdl/grammar/GdlVariable.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/AbstractSentenceDomainModel.java b/src/org/ggp/base/util/gdl/model/AbstractSentenceDomainModel.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/AbstractSentenceDomainModel.java
rename to src/org/ggp/base/util/gdl/model/AbstractSentenceDomainModel.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/AbstractSentenceForm.java b/src/org/ggp/base/util/gdl/model/AbstractSentenceForm.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/AbstractSentenceForm.java
rename to src/org/ggp/base/util/gdl/model/AbstractSentenceForm.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/CartesianSentenceFormDomain.java b/src/org/ggp/base/util/gdl/model/CartesianSentenceFormDomain.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/CartesianSentenceFormDomain.java
rename to src/org/ggp/base/util/gdl/model/CartesianSentenceFormDomain.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/DependencyGraphs.java b/src/org/ggp/base/util/gdl/model/DependencyGraphs.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/DependencyGraphs.java
rename to src/org/ggp/base/util/gdl/model/DependencyGraphs.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/DependencyGraphsTest.java b/src/org/ggp/base/util/gdl/model/DependencyGraphsTest.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/DependencyGraphsTest.java
rename to src/org/ggp/base/util/gdl/model/DependencyGraphsTest.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/FullSentenceFormDomain.java b/src/org/ggp/base/util/gdl/model/FullSentenceFormDomain.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/FullSentenceFormDomain.java
rename to src/org/ggp/base/util/gdl/model/FullSentenceFormDomain.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/GameFlow.java b/src/org/ggp/base/util/gdl/model/GameFlow.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/GameFlow.java
rename to src/org/ggp/base/util/gdl/model/GameFlow.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/GameFlowTester.java b/src/org/ggp/base/util/gdl/model/GameFlowTester.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/GameFlowTester.java
rename to src/org/ggp/base/util/gdl/model/GameFlowTester.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/ImmutableSentenceDomainModel.java b/src/org/ggp/base/util/gdl/model/ImmutableSentenceDomainModel.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/ImmutableSentenceDomainModel.java
rename to src/org/ggp/base/util/gdl/model/ImmutableSentenceDomainModel.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/ImmutableSentenceFormModel.java b/src/org/ggp/base/util/gdl/model/ImmutableSentenceFormModel.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/ImmutableSentenceFormModel.java
rename to src/org/ggp/base/util/gdl/model/ImmutableSentenceFormModel.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/SentenceDomainModel.java b/src/org/ggp/base/util/gdl/model/SentenceDomainModel.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/SentenceDomainModel.java
rename to src/org/ggp/base/util/gdl/model/SentenceDomainModel.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/SentenceDomainModelFactory.java b/src/org/ggp/base/util/gdl/model/SentenceDomainModelFactory.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/SentenceDomainModelFactory.java
rename to src/org/ggp/base/util/gdl/model/SentenceDomainModelFactory.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/SentenceDomainModelOptimizer.java b/src/org/ggp/base/util/gdl/model/SentenceDomainModelOptimizer.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/SentenceDomainModelOptimizer.java
rename to src/org/ggp/base/util/gdl/model/SentenceDomainModelOptimizer.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/SentenceDomainModels.java b/src/org/ggp/base/util/gdl/model/SentenceDomainModels.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/SentenceDomainModels.java
rename to src/org/ggp/base/util/gdl/model/SentenceDomainModels.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/SentenceForm.java b/src/org/ggp/base/util/gdl/model/SentenceForm.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/SentenceForm.java
rename to src/org/ggp/base/util/gdl/model/SentenceForm.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/SentenceFormDomain.java b/src/org/ggp/base/util/gdl/model/SentenceFormDomain.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/SentenceFormDomain.java
rename to src/org/ggp/base/util/gdl/model/SentenceFormDomain.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/SentenceFormModel.java b/src/org/ggp/base/util/gdl/model/SentenceFormModel.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/SentenceFormModel.java
rename to src/org/ggp/base/util/gdl/model/SentenceFormModel.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/SentenceFormModelFactory.java b/src/org/ggp/base/util/gdl/model/SentenceFormModelFactory.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/SentenceFormModelFactory.java
rename to src/org/ggp/base/util/gdl/model/SentenceFormModelFactory.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/SentenceForms.java b/src/org/ggp/base/util/gdl/model/SentenceForms.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/SentenceForms.java
rename to src/org/ggp/base/util/gdl/model/SentenceForms.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/SentenceFormsFinder.java b/src/org/ggp/base/util/gdl/model/SentenceFormsFinder.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/SentenceFormsFinder.java
rename to src/org/ggp/base/util/gdl/model/SentenceFormsFinder.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/SentenceModelUtils.java b/src/org/ggp/base/util/gdl/model/SentenceModelUtils.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/SentenceModelUtils.java
rename to src/org/ggp/base/util/gdl/model/SentenceModelUtils.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/SimpleSentenceForm.java b/src/org/ggp/base/util/gdl/model/SimpleSentenceForm.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/SimpleSentenceForm.java
rename to src/org/ggp/base/util/gdl/model/SimpleSentenceForm.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/assignments/AddibleFunctionInfo.java b/src/org/ggp/base/util/gdl/model/assignments/AddibleFunctionInfo.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/assignments/AddibleFunctionInfo.java
rename to src/org/ggp/base/util/gdl/model/assignments/AddibleFunctionInfo.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/assignments/AssignmentFunction.java b/src/org/ggp/base/util/gdl/model/assignments/AssignmentFunction.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/assignments/AssignmentFunction.java
rename to src/org/ggp/base/util/gdl/model/assignments/AssignmentFunction.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/assignments/AssignmentIterationPlan.java b/src/org/ggp/base/util/gdl/model/assignments/AssignmentIterationPlan.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/assignments/AssignmentIterationPlan.java
rename to src/org/ggp/base/util/gdl/model/assignments/AssignmentIterationPlan.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/assignments/AssignmentIterator.java b/src/org/ggp/base/util/gdl/model/assignments/AssignmentIterator.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/assignments/AssignmentIterator.java
rename to src/org/ggp/base/util/gdl/model/assignments/AssignmentIterator.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/assignments/AssignmentIteratorImpl.java b/src/org/ggp/base/util/gdl/model/assignments/AssignmentIteratorImpl.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/assignments/AssignmentIteratorImpl.java
rename to src/org/ggp/base/util/gdl/model/assignments/AssignmentIteratorImpl.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/assignments/Assignments.java b/src/org/ggp/base/util/gdl/model/assignments/Assignments.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/assignments/Assignments.java
rename to src/org/ggp/base/util/gdl/model/assignments/Assignments.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/assignments/AssignmentsFactory.java b/src/org/ggp/base/util/gdl/model/assignments/AssignmentsFactory.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/assignments/AssignmentsFactory.java
rename to src/org/ggp/base/util/gdl/model/assignments/AssignmentsFactory.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/assignments/AssignmentsImpl.java b/src/org/ggp/base/util/gdl/model/assignments/AssignmentsImpl.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/assignments/AssignmentsImpl.java
rename to src/org/ggp/base/util/gdl/model/assignments/AssignmentsImpl.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/assignments/FunctionInfo.java b/src/org/ggp/base/util/gdl/model/assignments/FunctionInfo.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/assignments/FunctionInfo.java
rename to src/org/ggp/base/util/gdl/model/assignments/FunctionInfo.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/assignments/FunctionInfoImpl.java b/src/org/ggp/base/util/gdl/model/assignments/FunctionInfoImpl.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/assignments/FunctionInfoImpl.java
rename to src/org/ggp/base/util/gdl/model/assignments/FunctionInfoImpl.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/assignments/FunctionInfos.java b/src/org/ggp/base/util/gdl/model/assignments/FunctionInfos.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/assignments/FunctionInfos.java
rename to src/org/ggp/base/util/gdl/model/assignments/FunctionInfos.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/assignments/IterationOrderCandidate.java b/src/org/ggp/base/util/gdl/model/assignments/IterationOrderCandidate.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/assignments/IterationOrderCandidate.java
rename to src/org/ggp/base/util/gdl/model/assignments/IterationOrderCandidate.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/model/assignments/MutableFunctionInfo.java b/src/org/ggp/base/util/gdl/model/assignments/MutableFunctionInfo.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/model/assignments/MutableFunctionInfo.java
rename to src/org/ggp/base/util/gdl/model/assignments/MutableFunctionInfo.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/scrambler/GdlRenderer.java b/src/org/ggp/base/util/gdl/scrambler/GdlRenderer.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/scrambler/GdlRenderer.java
rename to src/org/ggp/base/util/gdl/scrambler/GdlRenderer.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/scrambler/GdlRenderer_Test.java b/src/org/ggp/base/util/gdl/scrambler/GdlRenderer_Test.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/scrambler/GdlRenderer_Test.java
rename to src/org/ggp/base/util/gdl/scrambler/GdlRenderer_Test.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/scrambler/GdlScrambler.java b/src/org/ggp/base/util/gdl/scrambler/GdlScrambler.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/scrambler/GdlScrambler.java
rename to src/org/ggp/base/util/gdl/scrambler/GdlScrambler.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/scrambler/GdlScrambler_Test.java b/src/org/ggp/base/util/gdl/scrambler/GdlScrambler_Test.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/scrambler/GdlScrambler_Test.java
rename to src/org/ggp/base/util/gdl/scrambler/GdlScrambler_Test.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/scrambler/MappingGdlScrambler.java b/src/org/ggp/base/util/gdl/scrambler/MappingGdlScrambler.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/scrambler/MappingGdlScrambler.java
rename to src/org/ggp/base/util/gdl/scrambler/MappingGdlScrambler.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/scrambler/NoOpGdlScrambler.java b/src/org/ggp/base/util/gdl/scrambler/NoOpGdlScrambler.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/scrambler/NoOpGdlScrambler.java
rename to src/org/ggp/base/util/gdl/scrambler/NoOpGdlScrambler.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/scrambler/WordList.java b/src/org/ggp/base/util/gdl/scrambler/WordList.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/scrambler/WordList.java
rename to src/org/ggp/base/util/gdl/scrambler/WordList.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/transforms/CommonTransforms.java b/src/org/ggp/base/util/gdl/transforms/CommonTransforms.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/transforms/CommonTransforms.java
rename to src/org/ggp/base/util/gdl/transforms/CommonTransforms.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/transforms/CondensationIsolator.java b/src/org/ggp/base/util/gdl/transforms/CondensationIsolator.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/transforms/CondensationIsolator.java
rename to src/org/ggp/base/util/gdl/transforms/CondensationIsolator.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/transforms/ConstantChecker.java b/src/org/ggp/base/util/gdl/transforms/ConstantChecker.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/transforms/ConstantChecker.java
rename to src/org/ggp/base/util/gdl/transforms/ConstantChecker.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/transforms/ConstantCheckerFactory.java b/src/org/ggp/base/util/gdl/transforms/ConstantCheckerFactory.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/transforms/ConstantCheckerFactory.java
rename to src/org/ggp/base/util/gdl/transforms/ConstantCheckerFactory.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/transforms/DeORer.java b/src/org/ggp/base/util/gdl/transforms/DeORer.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/transforms/DeORer.java
rename to src/org/ggp/base/util/gdl/transforms/DeORer.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/transforms/DistinctAndNotMover.java b/src/org/ggp/base/util/gdl/transforms/DistinctAndNotMover.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/transforms/DistinctAndNotMover.java
rename to src/org/ggp/base/util/gdl/transforms/DistinctAndNotMover.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/transforms/GdlCleaner.java b/src/org/ggp/base/util/gdl/transforms/GdlCleaner.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/transforms/GdlCleaner.java
rename to src/org/ggp/base/util/gdl/transforms/GdlCleaner.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/transforms/ImmutableConstantChecker.java b/src/org/ggp/base/util/gdl/transforms/ImmutableConstantChecker.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/transforms/ImmutableConstantChecker.java
rename to src/org/ggp/base/util/gdl/transforms/ImmutableConstantChecker.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/transforms/Relationizer.java b/src/org/ggp/base/util/gdl/transforms/Relationizer.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/transforms/Relationizer.java
rename to src/org/ggp/base/util/gdl/transforms/Relationizer.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/transforms/TransformTester.java b/src/org/ggp/base/util/gdl/transforms/TransformTester.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/transforms/TransformTester.java
rename to src/org/ggp/base/util/gdl/transforms/TransformTester.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/transforms/VariableConstrainer.java b/src/org/ggp/base/util/gdl/transforms/VariableConstrainer.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/transforms/VariableConstrainer.java
rename to src/org/ggp/base/util/gdl/transforms/VariableConstrainer.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/transforms/standalone/StandaloneDeORer.java b/src/org/ggp/base/util/gdl/transforms/standalone/StandaloneDeORer.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/transforms/standalone/StandaloneDeORer.java
rename to src/org/ggp/base/util/gdl/transforms/standalone/StandaloneDeORer.java
diff --git a/ggp-base/src/org/ggp/base/util/gdl/transforms/standalone/StandaloneVariableConstrainer.java b/src/org/ggp/base/util/gdl/transforms/standalone/StandaloneVariableConstrainer.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/gdl/transforms/standalone/StandaloneVariableConstrainer.java
rename to src/org/ggp/base/util/gdl/transforms/standalone/StandaloneVariableConstrainer.java
diff --git a/ggp-base/src/org/ggp/base/util/http/HttpReader.java b/src/org/ggp/base/util/http/HttpReader.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/http/HttpReader.java
rename to src/org/ggp/base/util/http/HttpReader.java
diff --git a/ggp-base/src/org/ggp/base/util/http/HttpRequest.java b/src/org/ggp/base/util/http/HttpRequest.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/http/HttpRequest.java
rename to src/org/ggp/base/util/http/HttpRequest.java
diff --git a/ggp-base/src/org/ggp/base/util/http/HttpWriter.java b/src/org/ggp/base/util/http/HttpWriter.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/http/HttpWriter.java
rename to src/org/ggp/base/util/http/HttpWriter.java
diff --git a/ggp-base/src/org/ggp/base/util/http/Test_Http.java b/src/org/ggp/base/util/http/Test_Http.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/http/Test_Http.java
rename to src/org/ggp/base/util/http/Test_Http.java
diff --git a/ggp-base/src/org/ggp/base/util/loader/RemoteResourceLoader.java b/src/org/ggp/base/util/loader/RemoteResourceLoader.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/loader/RemoteResourceLoader.java
rename to src/org/ggp/base/util/loader/RemoteResourceLoader.java
diff --git a/ggp-base/src/org/ggp/base/util/logging/GamerLogger.java b/src/org/ggp/base/util/logging/GamerLogger.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/logging/GamerLogger.java
rename to src/org/ggp/base/util/logging/GamerLogger.java
diff --git a/ggp-base/src/org/ggp/base/util/logging/LogSummaryGenerator.java b/src/org/ggp/base/util/logging/LogSummaryGenerator.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/logging/LogSummaryGenerator.java
rename to src/org/ggp/base/util/logging/LogSummaryGenerator.java
diff --git a/ggp-base/src/org/ggp/base/util/match/Match.java b/src/org/ggp/base/util/match/Match.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/match/Match.java
rename to src/org/ggp/base/util/match/Match.java
diff --git a/ggp-base/src/org/ggp/base/util/match/MatchPublisher.java b/src/org/ggp/base/util/match/MatchPublisher.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/match/MatchPublisher.java
rename to src/org/ggp/base/util/match/MatchPublisher.java
diff --git a/ggp-base/src/org/ggp/base/util/observer/Event.java b/src/org/ggp/base/util/observer/Event.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/observer/Event.java
rename to src/org/ggp/base/util/observer/Event.java
diff --git a/ggp-base/src/org/ggp/base/util/observer/Observer.java b/src/org/ggp/base/util/observer/Observer.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/observer/Observer.java
rename to src/org/ggp/base/util/observer/Observer.java
diff --git a/ggp-base/src/org/ggp/base/util/observer/Subject.java b/src/org/ggp/base/util/observer/Subject.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/observer/Subject.java
rename to src/org/ggp/base/util/observer/Subject.java
diff --git a/ggp-base/src/org/ggp/base/util/presence/InfoResponse.java b/src/org/ggp/base/util/presence/InfoResponse.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/presence/InfoResponse.java
rename to src/org/ggp/base/util/presence/InfoResponse.java
diff --git a/ggp-base/src/org/ggp/base/util/presence/PlayerPresence.java b/src/org/ggp/base/util/presence/PlayerPresence.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/presence/PlayerPresence.java
rename to src/org/ggp/base/util/presence/PlayerPresence.java
diff --git a/ggp-base/src/org/ggp/base/util/presence/PlayerPresenceManager.java b/src/org/ggp/base/util/presence/PlayerPresenceManager.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/presence/PlayerPresenceManager.java
rename to src/org/ggp/base/util/presence/PlayerPresenceManager.java
diff --git a/ggp-base/src/org/ggp/base/util/presence/Test_InfoResponse.java b/src/org/ggp/base/util/presence/Test_InfoResponse.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/presence/Test_InfoResponse.java
rename to src/org/ggp/base/util/presence/Test_InfoResponse.java
diff --git a/ggp-base/src/org/ggp/base/util/propnet/architecture/Component.java b/src/org/ggp/base/util/propnet/architecture/Component.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/propnet/architecture/Component.java
rename to src/org/ggp/base/util/propnet/architecture/Component.java
diff --git a/ggp-base/src/org/ggp/base/util/propnet/architecture/PropNet.java b/src/org/ggp/base/util/propnet/architecture/PropNet.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/propnet/architecture/PropNet.java
rename to src/org/ggp/base/util/propnet/architecture/PropNet.java
diff --git a/ggp-base/src/org/ggp/base/util/propnet/architecture/components/And.java b/src/org/ggp/base/util/propnet/architecture/components/And.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/propnet/architecture/components/And.java
rename to src/org/ggp/base/util/propnet/architecture/components/And.java
diff --git a/ggp-base/src/org/ggp/base/util/propnet/architecture/components/Constant.java b/src/org/ggp/base/util/propnet/architecture/components/Constant.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/propnet/architecture/components/Constant.java
rename to src/org/ggp/base/util/propnet/architecture/components/Constant.java
diff --git a/ggp-base/src/org/ggp/base/util/propnet/architecture/components/Not.java b/src/org/ggp/base/util/propnet/architecture/components/Not.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/propnet/architecture/components/Not.java
rename to src/org/ggp/base/util/propnet/architecture/components/Not.java
diff --git a/ggp-base/src/org/ggp/base/util/propnet/architecture/components/Or.java b/src/org/ggp/base/util/propnet/architecture/components/Or.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/propnet/architecture/components/Or.java
rename to src/org/ggp/base/util/propnet/architecture/components/Or.java
diff --git a/ggp-base/src/org/ggp/base/util/propnet/architecture/components/Proposition.java b/src/org/ggp/base/util/propnet/architecture/components/Proposition.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/propnet/architecture/components/Proposition.java
rename to src/org/ggp/base/util/propnet/architecture/components/Proposition.java
diff --git a/ggp-base/src/org/ggp/base/util/propnet/architecture/components/Transition.java b/src/org/ggp/base/util/propnet/architecture/components/Transition.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/propnet/architecture/components/Transition.java
rename to src/org/ggp/base/util/propnet/architecture/components/Transition.java
diff --git a/ggp-base/src/org/ggp/base/util/propnet/factory/OptimizingPropNetFactory.java b/src/org/ggp/base/util/propnet/factory/OptimizingPropNetFactory.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/propnet/factory/OptimizingPropNetFactory.java
rename to src/org/ggp/base/util/propnet/factory/OptimizingPropNetFactory.java
diff --git a/ggp-base/src/org/ggp/base/util/propnet/factory/PropNetFactory.java b/src/org/ggp/base/util/propnet/factory/PropNetFactory.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/propnet/factory/PropNetFactory.java
rename to src/org/ggp/base/util/propnet/factory/PropNetFactory.java
diff --git a/ggp-base/src/org/ggp/base/util/propnet/factory/annotater/PropNetAnnotater.java b/src/org/ggp/base/util/propnet/factory/annotater/PropNetAnnotater.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/propnet/factory/annotater/PropNetAnnotater.java
rename to src/org/ggp/base/util/propnet/factory/annotater/PropNetAnnotater.java
diff --git a/ggp-base/src/org/ggp/base/util/propnet/factory/converter/PropNetConverter.java b/src/org/ggp/base/util/propnet/factory/converter/PropNetConverter.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/propnet/factory/converter/PropNetConverter.java
rename to src/org/ggp/base/util/propnet/factory/converter/PropNetConverter.java
diff --git a/ggp-base/src/org/ggp/base/util/propnet/factory/flattener/PropNetAnnotatedFlattener.java b/src/org/ggp/base/util/propnet/factory/flattener/PropNetAnnotatedFlattener.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/propnet/factory/flattener/PropNetAnnotatedFlattener.java
rename to src/org/ggp/base/util/propnet/factory/flattener/PropNetAnnotatedFlattener.java
diff --git a/ggp-base/src/org/ggp/base/util/propnet/factory/flattener/PropNetFlattener.java b/src/org/ggp/base/util/propnet/factory/flattener/PropNetFlattener.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/propnet/factory/flattener/PropNetFlattener.java
rename to src/org/ggp/base/util/propnet/factory/flattener/PropNetFlattener.java
diff --git a/ggp-base/src/org/ggp/base/util/prover/Prover.java b/src/org/ggp/base/util/prover/Prover.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/prover/Prover.java
rename to src/org/ggp/base/util/prover/Prover.java
diff --git a/ggp-base/src/org/ggp/base/util/prover/aima/AimaProver.java b/src/org/ggp/base/util/prover/aima/AimaProver.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/prover/aima/AimaProver.java
rename to src/org/ggp/base/util/prover/aima/AimaProver.java
diff --git a/ggp-base/src/org/ggp/base/util/prover/aima/cache/ProverCache.java b/src/org/ggp/base/util/prover/aima/cache/ProverCache.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/prover/aima/cache/ProverCache.java
rename to src/org/ggp/base/util/prover/aima/cache/ProverCache.java
diff --git a/ggp-base/src/org/ggp/base/util/prover/aima/knowledge/KnowledgeBase.java b/src/org/ggp/base/util/prover/aima/knowledge/KnowledgeBase.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/prover/aima/knowledge/KnowledgeBase.java
rename to src/org/ggp/base/util/prover/aima/knowledge/KnowledgeBase.java
diff --git a/ggp-base/src/org/ggp/base/util/prover/aima/renamer/VariableRenamer.java b/src/org/ggp/base/util/prover/aima/renamer/VariableRenamer.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/prover/aima/renamer/VariableRenamer.java
rename to src/org/ggp/base/util/prover/aima/renamer/VariableRenamer.java
diff --git a/ggp-base/src/org/ggp/base/util/prover/aima/substituter/Substituter.java b/src/org/ggp/base/util/prover/aima/substituter/Substituter.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/prover/aima/substituter/Substituter.java
rename to src/org/ggp/base/util/prover/aima/substituter/Substituter.java
diff --git a/ggp-base/src/org/ggp/base/util/prover/aima/substitution/Substitution.java b/src/org/ggp/base/util/prover/aima/substitution/Substitution.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/prover/aima/substitution/Substitution.java
rename to src/org/ggp/base/util/prover/aima/substitution/Substitution.java
diff --git a/ggp-base/src/org/ggp/base/util/prover/aima/unifier/Unifier.java b/src/org/ggp/base/util/prover/aima/unifier/Unifier.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/prover/aima/unifier/Unifier.java
rename to src/org/ggp/base/util/prover/aima/unifier/Unifier.java
diff --git a/ggp-base/src/org/ggp/base/util/reasoner/DifferentialForwardChainingReasoner.java b/src/org/ggp/base/util/reasoner/DifferentialForwardChainingReasoner.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/reasoner/DifferentialForwardChainingReasoner.java
rename to src/org/ggp/base/util/reasoner/DifferentialForwardChainingReasoner.java
diff --git a/ggp-base/src/org/ggp/base/util/reasoner/ForwardChainingReasoner.java b/src/org/ggp/base/util/reasoner/ForwardChainingReasoner.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/reasoner/ForwardChainingReasoner.java
rename to src/org/ggp/base/util/reasoner/ForwardChainingReasoner.java
diff --git a/ggp-base/src/org/ggp/base/util/reasoner/gdl/GdlChainingReasoner.java b/src/org/ggp/base/util/reasoner/gdl/GdlChainingReasoner.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/reasoner/gdl/GdlChainingReasoner.java
rename to src/org/ggp/base/util/reasoner/gdl/GdlChainingReasoner.java
diff --git a/ggp-base/src/org/ggp/base/util/reasoner/gdl/GdlSentenceSet.java b/src/org/ggp/base/util/reasoner/gdl/GdlSentenceSet.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/reasoner/gdl/GdlSentenceSet.java
rename to src/org/ggp/base/util/reasoner/gdl/GdlSentenceSet.java
diff --git a/ggp-base/src/org/ggp/base/util/reflection/ProjectSearcher.java b/src/org/ggp/base/util/reflection/ProjectSearcher.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/reflection/ProjectSearcher.java
rename to src/org/ggp/base/util/reflection/ProjectSearcher.java
diff --git a/ggp-base/src/org/ggp/base/util/statemachine/FailsafeStateMachine.java b/src/org/ggp/base/util/statemachine/FailsafeStateMachine.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/statemachine/FailsafeStateMachine.java
rename to src/org/ggp/base/util/statemachine/FailsafeStateMachine.java
diff --git a/ggp-base/src/org/ggp/base/util/statemachine/MachineState.java b/src/org/ggp/base/util/statemachine/MachineState.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/statemachine/MachineState.java
rename to src/org/ggp/base/util/statemachine/MachineState.java
diff --git a/ggp-base/src/org/ggp/base/util/statemachine/Move.java b/src/org/ggp/base/util/statemachine/Move.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/statemachine/Move.java
rename to src/org/ggp/base/util/statemachine/Move.java
diff --git a/ggp-base/src/org/ggp/base/util/statemachine/Role.java b/src/org/ggp/base/util/statemachine/Role.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/statemachine/Role.java
rename to src/org/ggp/base/util/statemachine/Role.java
diff --git a/ggp-base/src/org/ggp/base/util/statemachine/StateMachine.java b/src/org/ggp/base/util/statemachine/StateMachine.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/statemachine/StateMachine.java
rename to src/org/ggp/base/util/statemachine/StateMachine.java
diff --git a/ggp-base/src/org/ggp/base/util/statemachine/cache/CachedStateMachine.java b/src/org/ggp/base/util/statemachine/cache/CachedStateMachine.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/statemachine/cache/CachedStateMachine.java
rename to src/org/ggp/base/util/statemachine/cache/CachedStateMachine.java
diff --git a/ggp-base/src/org/ggp/base/util/statemachine/cache/TtlCache.java b/src/org/ggp/base/util/statemachine/cache/TtlCache.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/statemachine/cache/TtlCache.java
rename to src/org/ggp/base/util/statemachine/cache/TtlCache.java
diff --git a/ggp-base/src/org/ggp/base/util/statemachine/exceptions/GoalDefinitionException.java b/src/org/ggp/base/util/statemachine/exceptions/GoalDefinitionException.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/statemachine/exceptions/GoalDefinitionException.java
rename to src/org/ggp/base/util/statemachine/exceptions/GoalDefinitionException.java
diff --git a/ggp-base/src/org/ggp/base/util/statemachine/exceptions/MoveDefinitionException.java b/src/org/ggp/base/util/statemachine/exceptions/MoveDefinitionException.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/statemachine/exceptions/MoveDefinitionException.java
rename to src/org/ggp/base/util/statemachine/exceptions/MoveDefinitionException.java
diff --git a/ggp-base/src/org/ggp/base/util/statemachine/exceptions/TransitionDefinitionException.java b/src/org/ggp/base/util/statemachine/exceptions/TransitionDefinitionException.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/statemachine/exceptions/TransitionDefinitionException.java
rename to src/org/ggp/base/util/statemachine/exceptions/TransitionDefinitionException.java
diff --git a/ggp-base/src/org/ggp/base/util/statemachine/implementation/propnet/SamplePropNetStateMachine.java b/src/org/ggp/base/util/statemachine/implementation/propnet/SamplePropNetStateMachine.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/statemachine/implementation/propnet/SamplePropNetStateMachine.java
rename to src/org/ggp/base/util/statemachine/implementation/propnet/SamplePropNetStateMachine.java
diff --git a/ggp-base/src/org/ggp/base/util/statemachine/implementation/prover/ProverStateMachine.java b/src/org/ggp/base/util/statemachine/implementation/prover/ProverStateMachine.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/statemachine/implementation/prover/ProverStateMachine.java
rename to src/org/ggp/base/util/statemachine/implementation/prover/ProverStateMachine.java
diff --git a/ggp-base/src/org/ggp/base/util/statemachine/implementation/prover/query/ProverQueryBuilder.java b/src/org/ggp/base/util/statemachine/implementation/prover/query/ProverQueryBuilder.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/statemachine/implementation/prover/query/ProverQueryBuilder.java
rename to src/org/ggp/base/util/statemachine/implementation/prover/query/ProverQueryBuilder.java
diff --git a/ggp-base/src/org/ggp/base/util/statemachine/implementation/prover/result/ProverResultParser.java b/src/org/ggp/base/util/statemachine/implementation/prover/result/ProverResultParser.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/statemachine/implementation/prover/result/ProverResultParser.java
rename to src/org/ggp/base/util/statemachine/implementation/prover/result/ProverResultParser.java
diff --git a/ggp-base/src/org/ggp/base/util/statemachine/verifier/StateMachineVerifier.java b/src/org/ggp/base/util/statemachine/verifier/StateMachineVerifier.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/statemachine/verifier/StateMachineVerifier.java
rename to src/org/ggp/base/util/statemachine/verifier/StateMachineVerifier.java
diff --git a/ggp-base/src/org/ggp/base/util/symbol/factory/SymbolFactory.java b/src/org/ggp/base/util/symbol/factory/SymbolFactory.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/symbol/factory/SymbolFactory.java
rename to src/org/ggp/base/util/symbol/factory/SymbolFactory.java
diff --git a/ggp-base/src/org/ggp/base/util/symbol/factory/exceptions/SymbolFormatException.java b/src/org/ggp/base/util/symbol/factory/exceptions/SymbolFormatException.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/symbol/factory/exceptions/SymbolFormatException.java
rename to src/org/ggp/base/util/symbol/factory/exceptions/SymbolFormatException.java
diff --git a/ggp-base/src/org/ggp/base/util/symbol/grammar/Symbol.java b/src/org/ggp/base/util/symbol/grammar/Symbol.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/symbol/grammar/Symbol.java
rename to src/org/ggp/base/util/symbol/grammar/Symbol.java
diff --git a/ggp-base/src/org/ggp/base/util/symbol/grammar/SymbolAtom.java b/src/org/ggp/base/util/symbol/grammar/SymbolAtom.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/symbol/grammar/SymbolAtom.java
rename to src/org/ggp/base/util/symbol/grammar/SymbolAtom.java
diff --git a/ggp-base/src/org/ggp/base/util/symbol/grammar/SymbolList.java b/src/org/ggp/base/util/symbol/grammar/SymbolList.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/symbol/grammar/SymbolList.java
rename to src/org/ggp/base/util/symbol/grammar/SymbolList.java
diff --git a/ggp-base/src/org/ggp/base/util/symbol/grammar/SymbolPool.java b/src/org/ggp/base/util/symbol/grammar/SymbolPool.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/symbol/grammar/SymbolPool.java
rename to src/org/ggp/base/util/symbol/grammar/SymbolPool.java
diff --git a/ggp-base/src/org/ggp/base/util/ui/CloseableTabs.java b/src/org/ggp/base/util/ui/CloseableTabs.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/ui/CloseableTabs.java
rename to src/org/ggp/base/util/ui/CloseableTabs.java
diff --git a/ggp-base/src/org/ggp/base/util/ui/ConsolePanel.java b/src/org/ggp/base/util/ui/ConsolePanel.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/ui/ConsolePanel.java
rename to src/org/ggp/base/util/ui/ConsolePanel.java
diff --git a/ggp-base/src/org/ggp/base/util/ui/GameSelector.java b/src/org/ggp/base/util/ui/GameSelector.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/ui/GameSelector.java
rename to src/org/ggp/base/util/ui/GameSelector.java
diff --git a/ggp-base/src/org/ggp/base/util/ui/GameStateRenderer.java b/src/org/ggp/base/util/ui/GameStateRenderer.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/ui/GameStateRenderer.java
rename to src/org/ggp/base/util/ui/GameStateRenderer.java
diff --git a/ggp-base/src/org/ggp/base/util/ui/JLabelBold.java b/src/org/ggp/base/util/ui/JLabelBold.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/ui/JLabelBold.java
rename to src/org/ggp/base/util/ui/JLabelBold.java
diff --git a/ggp-base/src/org/ggp/base/util/ui/JLabelHyperlink.java b/src/org/ggp/base/util/ui/JLabelHyperlink.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/ui/JLabelHyperlink.java
rename to src/org/ggp/base/util/ui/JLabelHyperlink.java
diff --git a/ggp-base/src/org/ggp/base/util/ui/NativeUI.java b/src/org/ggp/base/util/ui/NativeUI.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/ui/NativeUI.java
rename to src/org/ggp/base/util/ui/NativeUI.java
diff --git a/ggp-base/src/org/ggp/base/util/ui/PlayerSelector.java b/src/org/ggp/base/util/ui/PlayerSelector.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/ui/PlayerSelector.java
rename to src/org/ggp/base/util/ui/PlayerSelector.java
diff --git a/ggp-base/src/org/ggp/base/util/ui/PublishButton.java b/src/org/ggp/base/util/ui/PublishButton.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/ui/PublishButton.java
rename to src/org/ggp/base/util/ui/PublishButton.java
diff --git a/ggp-base/src/org/ggp/base/util/ui/table/JZebraTable.java b/src/org/ggp/base/util/ui/table/JZebraTable.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/ui/table/JZebraTable.java
rename to src/org/ggp/base/util/ui/table/JZebraTable.java
diff --git a/ggp-base/src/org/ggp/base/util/ui/timer/JTimerBar.java b/src/org/ggp/base/util/ui/timer/JTimerBar.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/util/ui/timer/JTimerBar.java
rename to src/org/ggp/base/util/ui/timer/JTimerBar.java
diff --git a/ggp-base/src/org/ggp/base/validator/BasesInputsValidator.java b/src/org/ggp/base/validator/BasesInputsValidator.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/validator/BasesInputsValidator.java
rename to src/org/ggp/base/validator/BasesInputsValidator.java
diff --git a/ggp-base/src/org/ggp/base/validator/GameValidator.java b/src/org/ggp/base/validator/GameValidator.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/validator/GameValidator.java
rename to src/org/ggp/base/validator/GameValidator.java
diff --git a/ggp-base/src/org/ggp/base/validator/OPNFValidator.java b/src/org/ggp/base/validator/OPNFValidator.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/validator/OPNFValidator.java
rename to src/org/ggp/base/validator/OPNFValidator.java
diff --git a/ggp-base/src/org/ggp/base/validator/SimulationValidator.java b/src/org/ggp/base/validator/SimulationValidator.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/validator/SimulationValidator.java
rename to src/org/ggp/base/validator/SimulationValidator.java
diff --git a/ggp-base/src/org/ggp/base/validator/StaticValidator.java b/src/org/ggp/base/validator/StaticValidator.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/validator/StaticValidator.java
rename to src/org/ggp/base/validator/StaticValidator.java
diff --git a/ggp-base/src/org/ggp/base/validator/ValidatorException.java b/src/org/ggp/base/validator/ValidatorException.java
similarity index 100%
rename from ggp-base/src/org/ggp/base/validator/ValidatorException.java
rename to src/org/ggp/base/validator/ValidatorException.java
diff --git a/ggp-base/src_clj/sample_gamer.clj b/src_clj/sample_gamer.clj
similarity index 100%
rename from ggp-base/src_clj/sample_gamer.clj
rename to src_clj/sample_gamer.clj
diff --git a/ggp-base/src_py/external/JythonConsole/__init__.py b/src_py/external/JythonConsole/__init__.py
similarity index 100%
rename from ggp-base/src_py/external/JythonConsole/__init__.py
rename to src_py/external/JythonConsole/__init__.py
diff --git a/ggp-base/src_py/external/JythonConsole/console.py b/src_py/external/JythonConsole/console.py
similarity index 100%
rename from ggp-base/src_py/external/JythonConsole/console.py
rename to src_py/external/JythonConsole/console.py
diff --git a/ggp-base/src_py/external/JythonConsole/history.py b/src_py/external/JythonConsole/history.py
similarity index 100%
rename from ggp-base/src_py/external/JythonConsole/history.py
rename to src_py/external/JythonConsole/history.py
diff --git a/ggp-base/src_py/external/JythonConsole/introspect.py b/src_py/external/JythonConsole/introspect.py
similarity index 100%
rename from ggp-base/src_py/external/JythonConsole/introspect.py
rename to src_py/external/JythonConsole/introspect.py
diff --git a/ggp-base/src_py/external/JythonConsole/jintrospect.py b/src_py/external/JythonConsole/jintrospect.py
similarity index 100%
rename from ggp-base/src_py/external/JythonConsole/jintrospect.py
rename to src_py/external/JythonConsole/jintrospect.py
diff --git a/ggp-base/src_py/external/JythonConsole/popup.py b/src_py/external/JythonConsole/popup.py
similarity index 100%
rename from ggp-base/src_py/external/JythonConsole/popup.py
rename to src_py/external/JythonConsole/popup.py
diff --git a/ggp-base/src_py/external/JythonConsole/tip.py b/src_py/external/JythonConsole/tip.py
similarity index 100%
rename from ggp-base/src_py/external/JythonConsole/tip.py
rename to src_py/external/JythonConsole/tip.py
diff --git a/ggp-base/src_py/external/__init__.py b/src_py/external/__init__.py
similarity index 100%
rename from ggp-base/src_py/external/__init__.py
rename to src_py/external/__init__.py
diff --git a/ggp-base/src_py/sample_gamer.py b/src_py/sample_gamer.py
similarity index 100%
rename from ggp-base/src_py/sample_gamer.py
rename to src_py/sample_gamer.py
diff --git a/ggp-base/src_py/scripts.py b/src_py/scripts.py
similarity index 100%
rename from ggp-base/src_py/scripts.py
rename to src_py/scripts.py