diff --git a/numass-main/src/main/groovy/inr/numass/scripts/FindExIonRatio.groovy b/numass-main/src/main/groovy/inr/numass/scripts/FindExIonRatio.groovy
index 45fb8ab6..fa13abcf 100644
--- a/numass-main/src/main/groovy/inr/numass/scripts/FindExIonRatio.groovy
+++ b/numass-main/src/main/groovy/inr/numass/scripts/FindExIonRatio.groovy
@@ -17,7 +17,7 @@ package inr.numass.scripts
 
 import hep.dataforge.maths.integration.UnivariateIntegrator
 import hep.dataforge.plots.PlotFrame
-import hep.dataforge.plots.XYFunctionPlot
+import hep.dataforge.plots.data.XYFunctionPlot
 import hep.dataforge.plots.jfreechart.JFreeChartFrame
 import hep.dataforge.stat.fit.ParamSet
 import inr.numass.models.misc.LossCalculator
diff --git a/numass-main/src/main/groovy/inr/numass/scripts/TestExperimentalVariableLossSpectrum.groovy b/numass-main/src/main/groovy/inr/numass/scripts/TestExperimentalVariableLossSpectrum.groovy
index e8736855..3189e937 100644
--- a/numass-main/src/main/groovy/inr/numass/scripts/TestExperimentalVariableLossSpectrum.groovy
+++ b/numass-main/src/main/groovy/inr/numass/scripts/TestExperimentalVariableLossSpectrum.groovy
@@ -17,7 +17,7 @@ package inr.numass.scripts
 
 import hep.dataforge.io.PrintFunction
 import hep.dataforge.maths.integration.UnivariateIntegrator
-import hep.dataforge.plots.XYFunctionPlot
+import hep.dataforge.plots.data.XYFunctionPlot
 import hep.dataforge.plots.jfreechart.JFreeChartFrame
 import hep.dataforge.stat.fit.ParamSet
 import inr.numass.models.ExperimentalVariableLossSpectrum
diff --git a/numass-main/src/main/groovy/inr/numass/scripts/TheoreticalLossFunction.groovy b/numass-main/src/main/groovy/inr/numass/scripts/TheoreticalLossFunction.groovy
index 72aea34c..be6dfcfd 100644
--- a/numass-main/src/main/groovy/inr/numass/scripts/TheoreticalLossFunction.groovy
+++ b/numass-main/src/main/groovy/inr/numass/scripts/TheoreticalLossFunction.groovy
@@ -15,7 +15,7 @@
  */
 package inr.numass.scripts
 
-import hep.dataforge.plots.XYFunctionPlot
+import hep.dataforge.plots.data.XYFunctionPlot
 import hep.dataforge.plots.jfreechart.JFreeChartFrame
 import org.apache.commons.math3.analysis.UnivariateFunction
 
diff --git a/numass-main/src/main/kotlin/inr/numass/actions/PlotFitResultAction.kt b/numass-main/src/main/kotlin/inr/numass/actions/PlotFitResultAction.kt
index 09aa7e13..70c16740 100644
--- a/numass-main/src/main/kotlin/inr/numass/actions/PlotFitResultAction.kt
+++ b/numass-main/src/main/kotlin/inr/numass/actions/PlotFitResultAction.kt
@@ -21,8 +21,8 @@ import hep.dataforge.description.NodeDef
 import hep.dataforge.description.TypedActionDef
 import hep.dataforge.meta.Laminate
 import hep.dataforge.meta.Meta
-import hep.dataforge.plots.XYFunctionPlot
 import hep.dataforge.plots.data.DataPlot
+import hep.dataforge.plots.data.XYFunctionPlot
 import hep.dataforge.plots.output.plot
 import hep.dataforge.stat.fit.FitResult
 import hep.dataforge.stat.fit.FitState
diff --git a/numass-main/src/main/kotlin/inr/numass/actions/TimeAnalyzerAction.kt b/numass-main/src/main/kotlin/inr/numass/actions/TimeAnalyzerAction.kt
index 8be2059e..30d10325 100644
--- a/numass-main/src/main/kotlin/inr/numass/actions/TimeAnalyzerAction.kt
+++ b/numass-main/src/main/kotlin/inr/numass/actions/TimeAnalyzerAction.kt
@@ -6,8 +6,8 @@ import hep.dataforge.context.Context
 import hep.dataforge.description.*
 import hep.dataforge.maths.histogram.UnivariateHistogram
 import hep.dataforge.meta.Laminate
-import hep.dataforge.plots.XYFunctionPlot
 import hep.dataforge.plots.data.DataPlot
+import hep.dataforge.plots.data.XYFunctionPlot
 import hep.dataforge.plots.output.plot
 import hep.dataforge.tables.Adapters
 import hep.dataforge.tables.Table
diff --git a/numass-main/src/main/kotlin/inr/numass/models/mc/BetaSampler.kt b/numass-main/src/main/kotlin/inr/numass/models/mc/BetaSampler.kt
index 531129ba..a70ab5d2 100644
--- a/numass-main/src/main/kotlin/inr/numass/models/mc/BetaSampler.kt
+++ b/numass-main/src/main/kotlin/inr/numass/models/mc/BetaSampler.kt
@@ -4,7 +4,7 @@ import hep.dataforge.context.Global
 import hep.dataforge.fx.plots.displayPlot
 import hep.dataforge.maths.chain.Chain
 import hep.dataforge.meta.buildMeta
-import hep.dataforge.plots.XYFunctionPlot
+import hep.dataforge.plots.data.XYFunctionPlot
 import hep.dataforge.plots.jfreechart.chart
 import hep.dataforge.stat.PolynomialDistribution
 import hep.dataforge.stat.fit.ParamSet
diff --git a/numass-main/src/main/kotlin/inr/numass/models/misc/LossCalculator.kt b/numass-main/src/main/kotlin/inr/numass/models/misc/LossCalculator.kt
index d399cf48..507e87ea 100644
--- a/numass-main/src/main/kotlin/inr/numass/models/misc/LossCalculator.kt
+++ b/numass-main/src/main/kotlin/inr/numass/models/misc/LossCalculator.kt
@@ -18,7 +18,7 @@ package inr.numass.models.misc
 import hep.dataforge.maths.functions.FunctionCaching
 import hep.dataforge.maths.integration.GaussRuleIntegrator
 import hep.dataforge.plots.PlotFrame
-import hep.dataforge.plots.XYFunctionPlot
+import hep.dataforge.plots.data.XYFunctionPlot
 import hep.dataforge.utils.Misc
 import hep.dataforge.values.Values
 import kotlinx.coroutines.experimental.CompletableDeferred
diff --git a/numass-main/src/main/kotlin/inr/numass/tasks/NumassTasks.kt b/numass-main/src/main/kotlin/inr/numass/tasks/NumassTasks.kt
index 40810147..276bbb0a 100644
--- a/numass-main/src/main/kotlin/inr/numass/tasks/NumassTasks.kt
+++ b/numass-main/src/main/kotlin/inr/numass/tasks/NumassTasks.kt
@@ -11,8 +11,8 @@ import hep.dataforge.meta.Meta
 import hep.dataforge.meta.MetaUtils
 import hep.dataforge.meta.buildMeta
 import hep.dataforge.nullable
-import hep.dataforge.plots.XYFunctionPlot
 import hep.dataforge.plots.data.DataPlot
+import hep.dataforge.plots.data.XYFunctionPlot
 import hep.dataforge.plots.jfreechart.JFreeChartFrame
 import hep.dataforge.plots.output.PlotOutput
 import hep.dataforge.plots.output.plot
diff --git a/numass-main/src/test/java/inr/numass/models/TestNeLossParametrisation.java b/numass-main/src/test/java/inr/numass/models/TestNeLossParametrisation.java
index a9bee707..7752ab1b 100644
--- a/numass-main/src/test/java/inr/numass/models/TestNeLossParametrisation.java
+++ b/numass-main/src/test/java/inr/numass/models/TestNeLossParametrisation.java
@@ -17,7 +17,7 @@ package inr.numass.models;
 
 import hep.dataforge.maths.integration.GaussRuleIntegrator;
 import hep.dataforge.plots.PlotFrame;
-import hep.dataforge.plots.XYFunctionPlot;
+import hep.dataforge.plots.data.XYFunctionPlot;
 import inr.numass.NumassPluginKt;
 import inr.numass.models.misc.LossCalculator;
 import org.apache.commons.math3.analysis.UnivariateFunction;
diff --git a/numass-main/src/test/java/inr/numass/models/TransmissionInterpolatorTest.java b/numass-main/src/test/java/inr/numass/models/TransmissionInterpolatorTest.java
index 50688e2a..45a5b07d 100644
--- a/numass-main/src/test/java/inr/numass/models/TransmissionInterpolatorTest.java
+++ b/numass-main/src/test/java/inr/numass/models/TransmissionInterpolatorTest.java
@@ -16,8 +16,8 @@
 package inr.numass.models;
 
 import hep.dataforge.context.Global;
-import hep.dataforge.plots.XYFunctionPlot;
 import hep.dataforge.plots.data.DataPlot;
+import hep.dataforge.plots.data.XYFunctionPlot;
 import hep.dataforge.plots.jfreechart.JFreeChartFrame;
 import inr.numass.NumassPluginKt;