Refactored geometry to mimic inheritance better.
Corrected package names.