restructure formatting of folders