clean up routes structure just a bit