refactor store to allow embedding of crypto ones

done for [AGIOS-79](https://issues.jboss.org/browse/AGIOS-79)