Moving widgets to Directives