Renamed java packages to fit out project.