Make API controller mapping both cleaner and simpler
Refactor categories API to conform with new mapping method