Cleaned up and added java files
Merge branch 'master' of https://github.com/jjatria/bdh