refactor with versioned KDF...

in prepartion for V2...