reformat folder structure