Refactor of some of the util/parsing/geometry classes