Stage 3 of simplification/refactor - introducing databuilders (and uri groups) to existing routes