Updated controller and directive scaffolding