restructure folders