Merge branch '89-move-exercises'

- closes #89

README.md

@@ -102,7 +102,7 @@ If you want more details, check out the [x-api README](https://github.com/exerci
 	git remote add upstream https://github.com/exercism/xjava.git
 	git pull --rebase upstream/master
 	cd ~/workspace/exercism/x-api/tracks
-	rm -rf java
+	mv java java-original
 	ln -s ../../xjava java
 	```
 
@@ -127,6 +127,7 @@ The rootproject is a container for the problem subprojects.
 
 ### The Problem Subprojects
 
+The `exercises` subdirectory contains all of the problem subprojects.
 Each problem/subproject is a subdirectory of the same name as its slug.
 
   * it's `build.gradle` names dependencies required to work that problem.
@@ -142,14 +143,14 @@ Each problem/subproject has three source sets:
 To run all the tests against example code:
 
 ```
-cd ~/workspace/exercism/xjava
+cd ~/workspace/exercism/xjava/exercises
 gradle assemble check
 ```
 
 To run the test against just one problem, run gradle from within that directory:
 
 ```
-cd ~/workspace/exercism/xjava/bob
+cd ~/workspace/exercism/xjava/exercises/bob
 gradle assemble check
 ```
 
@@ -182,9 +183,9 @@ and if you review the logs of your x-api, you'll find:
 This is because some files generated by the build can't be served from the x-api.  That's actually fine.  To fix this, simply make sure you do a clean in your xjava repo before you fetch:
 
 ```
-cd ~/workspace/exercism/xjava
+cd ~/workspace/exercism/xjava/exercises
 gradle clean
-cd ~/worksapce/exercism/exercises
+cd ~/workspace/exercism/exercises
 exercism fetch java bob
 ```
 
@@ -208,7 +209,14 @@ Before you submit a pull request, please ensure:
    ./bin/build.sh
    ```
 
-   verify that the script runs successfully.
+   ...verify that the script runs successfully.
+
+   Then, since your x-api is serving from this directory, make it pristine (see [Tip: gradle clean before exercism fetch](#tip-gradle-clean-before-exercism-fetch) for details):
+
+   ```
+   cd ~/workspace/exercism/xjava/exercises
+   gradle clean
+   ```
 
 2. **Fetch the problem from your local x-api, using the CLI.**
 
@@ -223,7 +231,7 @@ Before you submit a pull request, please ensure:
 
    ```
    cd ~/workspace/exercism/exercises/java/<problem-slug>
-   cp ../../../xjava/<problem-slug>/src/example/java/* src/main/java
+   cp ~/workspace/exercism/xjava/exercises/<problem-slug>/src/example/java/* src/main/java
    gradle check
    ```
 

bin/build.sh

@@ -1,10 +1,11 @@
 #!/bin/bash
 set -e
+pushd exercises
 gradle --version
 echo ""
 echo ">>> Running tests..."
 TERM=dumb gradle check compileStarterSourceJava --continue
-
+popd
 
 echo ""
 echo ">>> Running configlet..."