Move last component to its own directive