Re-organize files into two sub packages: kv and mr