continuing work on geom module; renamed calib to camera; gathered more functionality in this new module