Pro, S/Pro class restructure wanted for 2012