Refactoring
Initial version of data model.
Minor refactoring.
Merge pull request #2 from mboron/master

Initial version of data model