Moved model process and terms into packages