Simplifying package structure.