Core: Refactorization for Quality Management and core code updates

## Ready State: Yes

Contains some code cleanup for .make files.

## Deployment Instructions

* Merge code.