- renamed 'PACKAGE' class to 'Package' to avoid naming-clashes with