Update import of keystore in consumer.
Rename keystore module to keystores.