Reorganise structure to remove version number from folder name.