Removed API nesting from routes
De-nested helpers
De-nested controllers
Merge branch 'un-nest-api'