Split routes into namespaces and factor common parts
Remove dead code
Namespace cleanup
Remove moved file
Replace dynamic var with with-redefs