moved data model to separate solution