refactored controllers, changed nesting and routes
Merge pull request #14 from maryschmidt/refactor

refactored controllers, changed nesting and routes