Cleaning up folder structure.