Refactored current geometry packages