change directives to not use classes