Refactoring Monolithic Classes into Services

Break down god-objects into distinct, manageable service entities.