Pulling some structure out of directives