Merge "[SO] move subcharts to components folder"