GEO-23 #time 6m Restructuring the ShapefileObjectProcessor Class and tests