Move routes to its own index, cleanup