Sorting out folder structure