Moving components into sub folder