Refactoring into geom_util module, dependency management
fixes #1