folder structure update #2