Renamed packages to use standard format