Toby - Renaming package module to service-package.