deployer plugin: minor reorg