Major refactoring. Make new package "store".