executor refactor

Change-Id: I432d80400d67bc43a97d53a2204a3d9857b9f2f1