Removed old folder structure