working on new directives structure