Refactored several classes
Merge branch 'master' of https://github.com/johlits/geometries