moved KeyStore impl. into a package
removed duplicated dependency