converted confit.py to new style classes
converted geometry.py to new style classes