Added persistance store

Various file renaming. Refactoring.