Resolving conflicts and using new folder structure