Completing refactor to Directives with `scope` property re #1