Remove old folder structure