moved HeartbeatClient in dedicated sources