Refactor controller, add Views as object