Refactoring controllers.
Merge pull request #13 from cschroed-usgs/master

Refactoring controllers.