Move components to sub directory