Update JavaDoc and move the model.settings package to model.entity.settings