moved CommandFactory and KeyMaker into storage-router, so we only ever import that
TODO
got rid of types/client, now it's all in types
TODO