reworked package organization