routing overhaul, use shallow nested routes