KRACOEUS-7051: repackage Unit-related components