Starting refactor using directives