Further restructuring, split up routes