Satisfying Routes

* Renaming controller files
* Work on user and survey forms