Changed package names to reflect service association (and alos fixed a
typo within the package names)