Reorganized geometry code.
Pruned imports.
moved test case
Use Polygon
More WIP on Polygon stuff from last week