Refactor existing classes in CRED's codebase to improve modularity and extensibility while maintaining current functionality.