Start separating each component in its own directive