Add multiple executors

Refactoring / clean up
Adding executors instead of framework messages
Put these java.util imports above with the others.