Reorganize API and remove unused code
Add controller-level helpers