Move components to new folder