Moved classes to the model repository