Refactoring manager classes