Fix package ordering and add class heading showing parameterization