Code clean up, refactor/re-org the larger classes, Model\Field, Model\FieldValue and Model\Content