Fixup password handling and some deprecation warnings
Move java files to src dir