Reorganise directory structure to remove version number in path.
Merge branch 'A_Plot_for_Life_v2.34_Stable'
Merge branch 'master' into A_Plot_for_Life_v2.34_Stable