Refactored geometric objects hierarchy.