Edit packages

Renamed packages to apos