folder restructure and rename