Refactor/server side controllers #177