Moved a few things around.
This should make committing the JavaDocs much easier.
Merge remote-tracking branch 'origin/master'