Several changes to the structure of packages