Reformatted folder structure