reorganize announceSignedHeartbeat
finish organizational changes