converted geometry.py to new style classes
updated contour.py to use new style classes and extended calling syntax