json cleanup/routing nesting change