Rename the service package to services
Rename a bunch of packages