Rename ShapeView to just Shape
Remove old code