Use one layer for packages instead of two