rearranged packages, better layout