rearrange; conflate rekeying options
split (external) config for client/server