re-ordered routes file a bit