Remove folder from index
Merge folders on rename