Added controller-specific scopes using 'Controller as' syntax and renamed controllers and views to more-accurately reflect their functions.