Moved model in own package.