Add some some java files and packages
fix merge conflict