Tidy up routes
Add json
Merge pull request #1 from theodi/feature-tidy-up-routes

Feature tidy up routes