Moved the model to separate project