Cherry pick folder structure commit