Moved some stuff to the top of routes