Rework Package and layout.