Changed BasicShapes.h and BasicShapes.cpp to just Shapes.h and Shapes.cpp.