Moved the util package to the model.