* refactor controller infrastructure to get rid of inline require calls and better testability