Initial version of data model

Simple refactoring + testing how GIT works.