Simplifying the packages.