Renamed java packages to fit with our project