Changes to remove recursive folder.