Refactoring workflow and action services

Change-Id: I153b5a09a21be58cb0d2645e9d1d62eb30fb3617
Merge "Refactoring workflow and action services"