Reformat folder structure