moved controller and view to master