reworked package layout