improved package organization