Store v2

modify files according to store-v2-sol to practice