PackageController refactoring in preparation for new methods