Making package structure more structure-y.