Slight refactoring of packages.