Properly arrange the packages