Refactoring: moved geom package out of ui package