orchestrator refactor

Change-Id: I1d07405d40b267427a3d376aa668ed8c5b3fc739
Merge "orchestrator refactor"