Consolidated all "shape" classes into one shape class