A bunch of refactoring, added PackageManager login