CRDT: rename struct
CRDT:  change package names in files