Moved the model and the collection to a separate module.