Tidying up

Removed some extraneous files and moved the Java source file to /java.