Renamed packages to fit conventions