Added each component with its own folder