Moved the custom class object for shapeTypes out to its one class file and updated references