Removed API nesting from routes
De-nested helpers
De-nested controllers