simplifying package structure