fixes for PackageService module cohesion