Core: Refactorization for Quality Management

## Ready State: Yes