More reorganization of the client plugin API.
Reorganizing the worker plugin API.