Moved java source into src/java