Add multiple executors

Refactoring / clean up
Adding executors instead of framework messages
Yuck! Please get rid of '*' imports wherever possible.