#1: Big refactoring of package details