rejigged folder structure