Moved model to own package