Reformatting folder structure