Split up ShapeManager.h