moved some java files into a package.