Refactoring of the client plugin - no eclipse!