Simplifying Deep Inheritance Chains

Refactor deep hierarchies into compositional patterns for easier mocking.