optimize package organization