Move components to directives