Renaming directories.
Fixing conflict error.