Cleanup package hierarchy