Simplifying the structure of the packages.