modularize : separate key server and key management features