code reorg in Shapes.cpp