Complete package class; start work on PackageManager
Cleanup