Database access packages rearranged
Database access packages rearranged
Storing part of the model added with tests, some refactorization