Core: Refactorization for Quality Management and core code updates

## Ready State: No