UIPackageLoader refactoring