Re #1: move routes in file