Re-arrange packages