Clean up Dependencies

Clean up of dependencies into logical orders and compile/test statuses

Issue-ID: CPS-1873

Signed-off-by: egernug <gerard.nugent@est.tech>
Change-Id: I90ad49b7f1362e8f5b7006b85013c0bdf1b4d4ef
6 files changed