diff --git a/py/plugins/evaluators/src/genkit/plugins/evaluators/constant.py b/py/plugins/evaluators/src/genkit/plugins/evaluators/constant.py
index cc794aeb47..20896dac8a 100644
--- a/py/plugins/evaluators/src/genkit/plugins/evaluators/constant.py
+++ b/py/plugins/evaluators/src/genkit/plugins/evaluators/constant.py
@@ -17,6 +17,8 @@
 
 from collections.abc import Callable
 
+from genkit.blocks.model import ModelReference
+
 try:
     from enum import StrEnum
 except ImportError:
@@ -25,7 +27,6 @@
 
 from pydantic import BaseModel, RootModel
 
-from genkit.core.typing import ModelReference
 from genkit.types import EvalStatusEnum, Score
 
 
diff --git a/py/plugins/evaluators/src/genkit/plugins/evaluators/plugin_api.py b/py/plugins/evaluators/src/genkit/plugins/evaluators/plugin_api.py
index fd9bde03a4..78e1bf201f 100644
--- a/py/plugins/evaluators/src/genkit/plugins/evaluators/plugin_api.py
+++ b/py/plugins/evaluators/src/genkit/plugins/evaluators/plugin_api.py
@@ -24,15 +24,17 @@
 from dotpromptz.typing import DataArgument
 
 from genkit.ai import Genkit, Plugin
-from genkit.plugins.evaluators.constant import GenkitMetricType, MetricConfig, PluginOptions
-from genkit.types import BaseEvalDataPoint, EvalFnResponse, EvalStatusEnum, Score
-from plugins.evaluators.src.genkit.plugins.evaluators.constant import (
+from genkit.plugins.evaluators.constant import (
     AnswerRelevancyResponseSchema,
+    GenkitMetricType,
     LongFormResponseSchema,
     MaliciousnessResponseSchema,
+    MetricConfig,
     NliResponse,
+    PluginOptions,
 )
-from plugins.evaluators.src.metrics.helper import load_prompt_file, render_text
+from genkit.plugins.metrics.helper import load_prompt_file, render_text
+from genkit.types import BaseEvalDataPoint, EvalFnResponse, EvalStatusEnum, Score
 
 
 def evaluators_name(name: str) -> str:
diff --git a/py/plugins/evaluators/src/metrics/__init__.py b/py/plugins/evaluators/src/genkit/plugins/metrics/__init__.py
similarity index 100%
rename from py/plugins/evaluators/src/metrics/__init__.py
rename to py/plugins/evaluators/src/genkit/plugins/metrics/__init__.py
diff --git a/py/plugins/evaluators/src/metrics/helper.py b/py/plugins/evaluators/src/genkit/plugins/metrics/helper.py
similarity index 100%
rename from py/plugins/evaluators/src/metrics/helper.py
rename to py/plugins/evaluators/src/genkit/plugins/metrics/helper.py