Reorganised plugins so xcpd config was separate