Simply moved Shape into the Geo module.

Moved the Shape class into the Geo module. Had to adjust the custom rspec
matcher that checks for superclass to also work when the class is embeded
inside of another module.