Reorganized controller and response relationships
Merge branch 'origin/master'