One of te few things that I dislike during large upgrades, ive stucek to the original folder structure to save manhours.