Reorder Executor and callback arguments in API
Rename wrappers to decorators