Reorg in Directives adapters