Change aperture.py to use geometry sub-package