First take on reorganizing routes