Moved some of the test code into the test/java folder.
More clean up regarding structure, javadoc
more cleanup