Separating directives, reorganizing