Rationalize package structure better