correct package organization