Move WatchExpression into separate module