diff --git a/numass-control/cryotemp/src/main/java/inr/numass/cryotemp/PKT8Device.java b/numass-control/cryotemp/src/main/java/inr/numass/cryotemp/PKT8Device.java
index 7321f640..b5a22a5a 100644
--- a/numass-control/cryotemp/src/main/java/inr/numass/cryotemp/PKT8Device.java
+++ b/numass-control/cryotemp/src/main/java/inr/numass/cryotemp/PKT8Device.java
@@ -21,7 +21,7 @@ import hep.dataforge.control.collectors.RegularPointCollector;
 import hep.dataforge.control.measurements.DataDevice;
 import hep.dataforge.control.ports.PortHandler;
 import hep.dataforge.control.ports.TcpPortHandler;
-import hep.dataforge.data.FormatBuilder;
+import hep.dataforge.points.FormatBuilder;
 import hep.dataforge.exceptions.ControlException;
 import hep.dataforge.exceptions.PortException;
 import hep.dataforge.exceptions.StorageException;
diff --git a/numass-control/msp/src/main/java/inr/numass/control/msp/MspDevice.java b/numass-control/msp/src/main/java/inr/numass/control/msp/MspDevice.java
index b5afc9c0..a2207ff5 100644
--- a/numass-control/msp/src/main/java/inr/numass/control/msp/MspDevice.java
+++ b/numass-control/msp/src/main/java/inr/numass/control/msp/MspDevice.java
@@ -22,10 +22,10 @@ import hep.dataforge.control.measurements.AbstractMeasurement;
 import hep.dataforge.control.measurements.Measurement;
 import hep.dataforge.control.ports.PortHandler;
 import hep.dataforge.control.ports.TcpPortHandler;
-import hep.dataforge.data.Format;
-import hep.dataforge.data.FormatBuilder;
-import hep.dataforge.data.DataPoint;
-import hep.dataforge.data.MapPoint;
+import hep.dataforge.points.Format;
+import hep.dataforge.points.FormatBuilder;
+import hep.dataforge.points.DataPoint;
+import hep.dataforge.points.MapPoint;
 import hep.dataforge.exceptions.ControlException;
 import hep.dataforge.exceptions.MeasurementException;
 import hep.dataforge.exceptions.PortException;
diff --git a/numass-control/msp/src/main/java/inr/numass/control/msp/fx/MspViewController.java b/numass-control/msp/src/main/java/inr/numass/control/msp/fx/MspViewController.java
index 39af50f9..ab751377 100644
--- a/numass-control/msp/src/main/java/inr/numass/control/msp/fx/MspViewController.java
+++ b/numass-control/msp/src/main/java/inr/numass/control/msp/fx/MspViewController.java
@@ -17,7 +17,7 @@ package inr.numass.control.msp.fx;
 
 import hep.dataforge.context.Context;
 import hep.dataforge.context.GlobalContext;
-import hep.dataforge.data.MapPoint;
+import hep.dataforge.points.MapPoint;
 import hep.dataforge.exceptions.ControlException;
 import hep.dataforge.exceptions.PortException;
 import hep.dataforge.io.MetaFileReader;
diff --git a/numass-control/vac/src/main/java/inr/numass/readvac/VACDeviceReader.java b/numass-control/vac/src/main/java/inr/numass/readvac/VACDeviceReader.java
index 8fcac901..383472cc 100644
--- a/numass-control/vac/src/main/java/inr/numass/readvac/VACDeviceReader.java
+++ b/numass-control/vac/src/main/java/inr/numass/readvac/VACDeviceReader.java
@@ -15,8 +15,8 @@
  */
 package inr.numass.readvac;
 
-import hep.dataforge.data.DataPoint;
-import hep.dataforge.data.MapPoint;
+import hep.dataforge.points.DataPoint;
+import hep.dataforge.points.MapPoint;
 import hep.dataforge.meta.Meta;
 import hep.dataforge.values.Value;
 import java.math.BigDecimal;
diff --git a/numass-control/vac/src/main/java/inr/numass/readvac/VACFileReader.java b/numass-control/vac/src/main/java/inr/numass/readvac/VACFileReader.java
index a390d50f..5f81460e 100644
--- a/numass-control/vac/src/main/java/inr/numass/readvac/VACFileReader.java
+++ b/numass-control/vac/src/main/java/inr/numass/readvac/VACFileReader.java
@@ -15,8 +15,8 @@
  */
 package inr.numass.readvac;
 
-import hep.dataforge.data.DataPoint;
-import hep.dataforge.data.MapPoint;
+import hep.dataforge.points.DataPoint;
+import hep.dataforge.points.MapPoint;
 import hep.dataforge.io.LineIterator;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -30,7 +30,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import hep.dataforge.data.PointParser;
+import hep.dataforge.points.PointParser;
 
 /**
  *
diff --git a/numass-control/vac/src/main/java/inr/numass/readvac/VACFrame.java b/numass-control/vac/src/main/java/inr/numass/readvac/VACFrame.java
index d374f563..47c451e4 100644
--- a/numass-control/vac/src/main/java/inr/numass/readvac/VACFrame.java
+++ b/numass-control/vac/src/main/java/inr/numass/readvac/VACFrame.java
@@ -21,7 +21,7 @@ import ch.qos.logback.core.AppenderBase;
 import ch.qos.logback.core.encoder.EchoEncoder;
 import ch.qos.logback.core.encoder.Encoder;
 import hep.dataforge.context.GlobalContext;
-import hep.dataforge.data.DataPoint;
+import hep.dataforge.points.DataPoint;
 import hep.dataforge.io.BasicIOManager;
 import hep.dataforge.meta.Meta;
 import hep.dataforge.meta.MetaBuilder;
diff --git a/numass-control/vac/src/main/java/inr/numass/readvac/VACManager.java b/numass-control/vac/src/main/java/inr/numass/readvac/VACManager.java
index 8d72de36..209a90f0 100644
--- a/numass-control/vac/src/main/java/inr/numass/readvac/VACManager.java
+++ b/numass-control/vac/src/main/java/inr/numass/readvac/VACManager.java
@@ -15,8 +15,8 @@
  */
 package inr.numass.readvac;
 
-import hep.dataforge.data.FormatBuilder;
-import hep.dataforge.data.DataPoint;
+import hep.dataforge.points.FormatBuilder;
+import hep.dataforge.points.DataPoint;
 import hep.dataforge.exceptions.StorageException;
 import hep.dataforge.meta.Meta;
 import hep.dataforge.storage.api.PointLoader;
diff --git a/numass-control/vac/src/main/java/inr/numass/readvac/devices/VacCollectorDevice.java b/numass-control/vac/src/main/java/inr/numass/readvac/devices/VacCollectorDevice.java
index c73569f7..161d0877 100644
--- a/numass-control/vac/src/main/java/inr/numass/readvac/devices/VacCollectorDevice.java
+++ b/numass-control/vac/src/main/java/inr/numass/readvac/devices/VacCollectorDevice.java
@@ -10,7 +10,7 @@ import hep.dataforge.control.collectors.ValueCollector;
 import hep.dataforge.control.measurements.AbstractMeasurement;
 import hep.dataforge.control.measurements.Measurement;
 import hep.dataforge.control.measurements.Sensor;
-import hep.dataforge.data.DataPoint;
+import hep.dataforge.points.DataPoint;
 import hep.dataforge.exceptions.ControlException;
 import hep.dataforge.exceptions.MeasurementException;
 import hep.dataforge.values.Value;
diff --git a/numass-control/vac/src/main/java/inr/numass/readvac/fx/VacCollectorController.java b/numass-control/vac/src/main/java/inr/numass/readvac/fx/VacCollectorController.java
index d7045773..1fa4669a 100644
--- a/numass-control/vac/src/main/java/inr/numass/readvac/fx/VacCollectorController.java
+++ b/numass-control/vac/src/main/java/inr/numass/readvac/fx/VacCollectorController.java
@@ -11,7 +11,7 @@ import hep.dataforge.control.devices.DeviceListener;
 import hep.dataforge.control.measurements.Measurement;
 import hep.dataforge.control.measurements.MeasurementListener;
 import hep.dataforge.control.measurements.Sensor;
-import hep.dataforge.data.DataPoint;
+import hep.dataforge.points.DataPoint;
 import hep.dataforge.exceptions.ControlException;
 import hep.dataforge.exceptions.MeasurementException;
 import hep.dataforge.meta.Meta;
diff --git a/numass-main/src/main/java/hep/dataforge/plotfit/PlotFitResultAction.java b/numass-main/src/main/java/hep/dataforge/plotfit/PlotFitResultAction.java
index 590b8947..2d69b32b 100644
--- a/numass-main/src/main/java/hep/dataforge/plotfit/PlotFitResultAction.java
+++ b/numass-main/src/main/java/hep/dataforge/plotfit/PlotFitResultAction.java
@@ -17,7 +17,7 @@ package hep.dataforge.plotfit;
 
 import hep.dataforge.actions.OneToOneAction;
 import hep.dataforge.context.Context;
-import hep.dataforge.data.XYAdapter;
+import hep.dataforge.points.XYAdapter;
 import hep.dataforge.datafitter.FitState;
 import hep.dataforge.datafitter.models.XYModel;
 import hep.dataforge.description.NodeDef;
@@ -31,7 +31,7 @@ import hep.dataforge.plots.XYPlotFrame;
 import hep.dataforge.plots.data.PlottableData;
 import hep.dataforge.plots.data.PlottableFunction;
 import org.apache.commons.math3.analysis.UnivariateFunction;
-import hep.dataforge.data.PointSet;
+import hep.dataforge.points.PointSet;
 
 /**
  *
diff --git a/numass-main/src/main/java/inr/numass/NumassIO.java b/numass-main/src/main/java/inr/numass/NumassIO.java
index a512e183..865cf06e 100644
--- a/numass-main/src/main/java/inr/numass/NumassIO.java
+++ b/numass-main/src/main/java/inr/numass/NumassIO.java
@@ -15,8 +15,6 @@
  */
 package inr.numass;
 
-import hep.dataforge.data.BinaryData;
-import hep.dataforge.data.FileData;
 import hep.dataforge.io.BasicIOManager;
 import hep.dataforge.meta.Meta;
 import hep.dataforge.names.Name;
diff --git a/numass-main/src/main/java/inr/numass/NumassPlugin.java b/numass-main/src/main/java/inr/numass/NumassPlugin.java
index f8664ad4..5f33b3c5 100644
--- a/numass-main/src/main/java/inr/numass/NumassPlugin.java
+++ b/numass-main/src/main/java/inr/numass/NumassPlugin.java
@@ -19,7 +19,7 @@ import hep.dataforge.actions.ActionManager;
 import hep.dataforge.context.BasicPlugin;
 import hep.dataforge.context.Context;
 import hep.dataforge.context.PluginDef;
-import hep.dataforge.data.XYAdapter;
+import hep.dataforge.points.XYAdapter;
 import hep.dataforge.datafitter.FitManager;
 import hep.dataforge.datafitter.FitPlugin;
 import hep.dataforge.datafitter.models.Model;
@@ -53,7 +53,7 @@ import inr.numass.models.TransmissionInterpolator;
 import inr.numass.models.VariableLossSpectrum;
 import org.apache.commons.math3.analysis.BivariateFunction;
 import org.apache.commons.math3.analysis.UnivariateFunction;
-import hep.dataforge.data.PointAdapter;
+import hep.dataforge.points.PointAdapter;
 
 /**
  *
@@ -159,7 +159,7 @@ public class NumassPlugin extends BasicPlugin {
 
             double weightReductionFactor = an.getDouble("weightReductionFactor", 2.0);
 
-            Model res = new WeightedXYModel("scatter-variable", spectrum, getAdapter(an), (dp) -> weightReductionFactor);
+            WeightedXYModel res = new WeightedXYModel("scatter-variable", spectrum, getAdapter(an), (dp) -> weightReductionFactor);
             res.setMeta(an);
             return res;
         });
@@ -195,7 +195,8 @@ public class NumassPlugin extends BasicPlugin {
 
             double weightReductionFactor = an.getDouble("weightReductionFactor", 2.0);
 
-            Model res = new WeightedXYModel("scatter-empiric-experimental", spectrum, getAdapter(an), (dp) -> weightReductionFactor);
+            WeightedXYModel res 
+                    = new WeightedXYModel("scatter-empiric-experimental", spectrum, getAdapter(an), (dp) -> weightReductionFactor);
             res.setMeta(an);
             return res;
         });
diff --git a/numass-main/src/main/java/inr/numass/actions/AdjustErrorsAction.java b/numass-main/src/main/java/inr/numass/actions/AdjustErrorsAction.java
index 37a198ad..fac109d0 100644
--- a/numass-main/src/main/java/inr/numass/actions/AdjustErrorsAction.java
+++ b/numass-main/src/main/java/inr/numass/actions/AdjustErrorsAction.java
@@ -7,15 +7,15 @@ package inr.numass.actions;
 
 import hep.dataforge.actions.OneToOneAction;
 import hep.dataforge.context.Context;
-import hep.dataforge.data.DataPoint;
-import hep.dataforge.data.ListPointSet;
-import hep.dataforge.data.MapPoint;
+import hep.dataforge.points.DataPoint;
+import hep.dataforge.points.ListPointSet;
+import hep.dataforge.points.MapPoint;
 import hep.dataforge.description.TypedActionDef;
 import hep.dataforge.io.log.Logable;
 import hep.dataforge.meta.Meta;
 import java.util.ArrayList;
 import java.util.List;
-import hep.dataforge.data.PointSet;
+import hep.dataforge.points.PointSet;
 
 /**
  * Adjust errors for all numass points in the dataset
diff --git a/numass-main/src/main/java/inr/numass/actions/BorderData.java b/numass-main/src/main/java/inr/numass/actions/BorderData.java
index 9bd443fd..57c57a88 100644
--- a/numass-main/src/main/java/inr/numass/actions/BorderData.java
+++ b/numass-main/src/main/java/inr/numass/actions/BorderData.java
@@ -15,8 +15,8 @@
  */
 package inr.numass.actions;
 
-import hep.dataforge.data.ListPointSet;
-import hep.dataforge.data.MapPoint;
+import hep.dataforge.points.ListPointSet;
+import hep.dataforge.points.MapPoint;
 import hep.dataforge.values.Value;
 import inr.numass.data.NMFile;
 import inr.numass.data.NMPoint;
diff --git a/numass-main/src/main/java/inr/numass/actions/MergeDataAction.java b/numass-main/src/main/java/inr/numass/actions/MergeDataAction.java
index 557a4041..fae0f733 100644
--- a/numass-main/src/main/java/inr/numass/actions/MergeDataAction.java
+++ b/numass-main/src/main/java/inr/numass/actions/MergeDataAction.java
@@ -19,9 +19,9 @@ import hep.dataforge.actions.ManyToOneAction;
 import hep.dataforge.actions.GroupBuilder;
 import hep.dataforge.content.NamedGroup;
 import hep.dataforge.context.Context;
-import hep.dataforge.data.DataPoint;
-import hep.dataforge.data.ListPointSet;
-import hep.dataforge.data.MapPoint;
+import hep.dataforge.points.DataPoint;
+import hep.dataforge.points.ListPointSet;
+import hep.dataforge.points.MapPoint;
 import hep.dataforge.description.NodeDef;
 import hep.dataforge.description.TypedActionDef;
 import hep.dataforge.io.ColumnedDataWriter;
@@ -32,7 +32,7 @@ import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import hep.dataforge.data.PointSet;
+import hep.dataforge.points.PointSet;
 
 /**
  *
diff --git a/numass-main/src/main/java/inr/numass/actions/MonitorCorrectAction.java b/numass-main/src/main/java/inr/numass/actions/MonitorCorrectAction.java
index 5ee86741..00299b47 100644
--- a/numass-main/src/main/java/inr/numass/actions/MonitorCorrectAction.java
+++ b/numass-main/src/main/java/inr/numass/actions/MonitorCorrectAction.java
@@ -18,9 +18,9 @@ package inr.numass.actions;
 import hep.dataforge.actions.ActionResult;
 import hep.dataforge.actions.OneToOneAction;
 import hep.dataforge.context.Context;
-import hep.dataforge.data.DataPoint;
-import hep.dataforge.data.ListPointSet;
-import hep.dataforge.data.MapPoint;
+import hep.dataforge.points.DataPoint;
+import hep.dataforge.points.ListPointSet;
+import hep.dataforge.points.MapPoint;
 import hep.dataforge.description.TypedActionDef;
 import hep.dataforge.description.ValueDef;
 import hep.dataforge.exceptions.ContentException;
@@ -36,7 +36,7 @@ import java.util.List;
 import java.util.Map.Entry;
 import java.util.TreeMap;
 import java.util.concurrent.CopyOnWriteArrayList;
-import hep.dataforge.data.PointSet;
+import hep.dataforge.points.PointSet;
 
 /**
  *
diff --git a/numass-main/src/main/java/inr/numass/actions/PrepareDataAction.java b/numass-main/src/main/java/inr/numass/actions/PrepareDataAction.java
index f7fce2b4..b3a54774 100644
--- a/numass-main/src/main/java/inr/numass/actions/PrepareDataAction.java
+++ b/numass-main/src/main/java/inr/numass/actions/PrepareDataAction.java
@@ -17,10 +17,10 @@ package inr.numass.actions;
 
 import hep.dataforge.actions.OneToOneAction;
 import hep.dataforge.context.Context;
-import hep.dataforge.data.Format;
-import hep.dataforge.data.DataPoint;
-import hep.dataforge.data.ListPointSet;
-import hep.dataforge.data.MapPoint;
+import hep.dataforge.points.Format;
+import hep.dataforge.points.DataPoint;
+import hep.dataforge.points.ListPointSet;
+import hep.dataforge.points.MapPoint;
 import hep.dataforge.description.TypedActionDef;
 import hep.dataforge.description.ValueDef;
 import hep.dataforge.exceptions.ContentException;
@@ -35,7 +35,7 @@ import java.io.OutputStream;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
-import hep.dataforge.data.PointSet;
+import hep.dataforge.points.PointSet;
 
 /**
  *
diff --git a/numass-main/src/main/java/inr/numass/actions/ReadNumassDataAction.java b/numass-main/src/main/java/inr/numass/actions/ReadNumassDataAction.java
index 6b61383d..71d862ba 100644
--- a/numass-main/src/main/java/inr/numass/actions/ReadNumassDataAction.java
+++ b/numass-main/src/main/java/inr/numass/actions/ReadNumassDataAction.java
@@ -17,7 +17,7 @@ package inr.numass.actions;
 
 import hep.dataforge.actions.OneToOneAction;
 import hep.dataforge.context.Context;
-import hep.dataforge.data.FileData;
+import hep.dataforge.points.FileData;
 import hep.dataforge.description.NodeDef;
 import hep.dataforge.description.TypedActionDef;
 import hep.dataforge.description.ValueDef;
diff --git a/numass-main/src/main/java/inr/numass/actions/ShowLossSpectrumAction.java b/numass-main/src/main/java/inr/numass/actions/ShowLossSpectrumAction.java
index 58d4999f..450e1c26 100644
--- a/numass-main/src/main/java/inr/numass/actions/ShowLossSpectrumAction.java
+++ b/numass-main/src/main/java/inr/numass/actions/ShowLossSpectrumAction.java
@@ -17,9 +17,9 @@ package inr.numass.actions;
 
 import hep.dataforge.actions.OneToOneAction;
 import hep.dataforge.context.Context;
-import hep.dataforge.data.ListPointSet;
-import hep.dataforge.data.MapPoint;
-import hep.dataforge.data.XYAdapter;
+import hep.dataforge.points.ListPointSet;
+import hep.dataforge.points.MapPoint;
+import hep.dataforge.points.XYAdapter;
 import hep.dataforge.datafitter.FitState;
 import hep.dataforge.datafitter.FitTaskResult;
 import hep.dataforge.datafitter.Param;
@@ -53,7 +53,7 @@ import org.apache.commons.math3.analysis.interpolation.UnivariateInterpolator;
 import org.apache.commons.math3.stat.StatUtils;
 import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
 import org.slf4j.LoggerFactory;
-import hep.dataforge.data.PointSet;
+import hep.dataforge.points.PointSet;
 
 /**
  *
diff --git a/numass-main/src/main/java/inr/numass/actions/SlicedData.java b/numass-main/src/main/java/inr/numass/actions/SlicedData.java
index 8163a021..01d01f2b 100644
--- a/numass-main/src/main/java/inr/numass/actions/SlicedData.java
+++ b/numass-main/src/main/java/inr/numass/actions/SlicedData.java
@@ -15,9 +15,9 @@
  */
 package inr.numass.actions;
 
-import hep.dataforge.data.Format;
-import hep.dataforge.data.ListPointSet;
-import hep.dataforge.data.MapPoint;
+import hep.dataforge.points.Format;
+import hep.dataforge.points.ListPointSet;
+import hep.dataforge.points.MapPoint;
 import hep.dataforge.values.Value;
 import inr.numass.data.NMFile;
 import inr.numass.data.NMPoint;
diff --git a/numass-main/src/main/java/inr/numass/actions/SummaryAction.java b/numass-main/src/main/java/inr/numass/actions/SummaryAction.java
index 4f31c15f..30541039 100644
--- a/numass-main/src/main/java/inr/numass/actions/SummaryAction.java
+++ b/numass-main/src/main/java/inr/numass/actions/SummaryAction.java
@@ -19,10 +19,10 @@ import hep.dataforge.actions.ManyToOneAction;
 import hep.dataforge.actions.GroupBuilder;
 import hep.dataforge.content.NamedGroup;
 import hep.dataforge.context.Context;
-import hep.dataforge.data.Format;
-import hep.dataforge.data.DataPoint;
-import hep.dataforge.data.ListPointSet;
-import hep.dataforge.data.MapPoint;
+import hep.dataforge.points.Format;
+import hep.dataforge.points.DataPoint;
+import hep.dataforge.points.ListPointSet;
+import hep.dataforge.points.MapPoint;
 import hep.dataforge.datafitter.FitState;
 import hep.dataforge.description.TypedActionDef;
 import hep.dataforge.io.ColumnedDataWriter;
@@ -32,7 +32,7 @@ import hep.dataforge.values.Value;
 import java.io.OutputStream;
 import java.util.Arrays;
 import java.util.List;
-import hep.dataforge.data.PointSet;
+import hep.dataforge.points.PointSet;
 
 /**
  *
diff --git a/numass-main/src/main/java/inr/numass/data/ESpectrum.java b/numass-main/src/main/java/inr/numass/data/ESpectrum.java
index 2bcccb57..9be9aa74 100644
--- a/numass-main/src/main/java/inr/numass/data/ESpectrum.java
+++ b/numass-main/src/main/java/inr/numass/data/ESpectrum.java
@@ -15,9 +15,9 @@
  */
 package inr.numass.data;
 
-import hep.dataforge.data.Format;
-import hep.dataforge.data.ListPointSet;
-import hep.dataforge.data.MapPoint;
+import hep.dataforge.points.Format;
+import hep.dataforge.points.ListPointSet;
+import hep.dataforge.points.MapPoint;
 import hep.dataforge.io.ColumnedDataWriter;
 import hep.dataforge.values.Value;
 import hep.dataforge.values.ValueFormat;
diff --git a/numass-main/src/main/java/inr/numass/data/NMPoint.java b/numass-main/src/main/java/inr/numass/data/NMPoint.java
index faee8c4a..9d2226be 100644
--- a/numass-main/src/main/java/inr/numass/data/NMPoint.java
+++ b/numass-main/src/main/java/inr/numass/data/NMPoint.java
@@ -15,8 +15,8 @@
  */
 package inr.numass.data;
 
-import hep.dataforge.data.DataPoint;
-import hep.dataforge.data.MapPoint;
+import hep.dataforge.points.DataPoint;
+import hep.dataforge.points.MapPoint;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/numass-main/src/main/java/inr/numass/data/NumassDataReader.java b/numass-main/src/main/java/inr/numass/data/NumassDataReader.java
index dc531df5..b0239655 100644
--- a/numass-main/src/main/java/inr/numass/data/NumassDataReader.java
+++ b/numass-main/src/main/java/inr/numass/data/NumassDataReader.java
@@ -15,7 +15,7 @@
  */
 package inr.numass.data;
 
-import hep.dataforge.data.BinaryData;
+import hep.dataforge.points.BinaryData;
 import hep.dataforge.meta.MergeRule;
 import hep.dataforge.meta.Meta;
 import java.io.BufferedInputStream;
diff --git a/numass-main/src/main/java/inr/numass/data/SpectrumDataAdapter.java b/numass-main/src/main/java/inr/numass/data/SpectrumDataAdapter.java
index 85fefb99..901e78e2 100644
--- a/numass-main/src/main/java/inr/numass/data/SpectrumDataAdapter.java
+++ b/numass-main/src/main/java/inr/numass/data/SpectrumDataAdapter.java
@@ -15,15 +15,15 @@
  */
 package inr.numass.data;
 
-import hep.dataforge.data.DataPoint;
-import hep.dataforge.data.MapPoint;
-import hep.dataforge.data.XYAdapter;
+import hep.dataforge.points.DataPoint;
+import hep.dataforge.points.MapPoint;
+import hep.dataforge.points.XYAdapter;
 import hep.dataforge.exceptions.DataFormatException;
 import hep.dataforge.exceptions.NameNotFoundException;
 import hep.dataforge.meta.Meta;
 import hep.dataforge.meta.MetaBuilder;
 import hep.dataforge.values.Value;
-import hep.dataforge.data.PointAdapter;
+import hep.dataforge.points.PointAdapter;
 
 /**
  *
diff --git a/numass-main/src/main/java/inr/numass/data/SpectrumGenerator.java b/numass-main/src/main/java/inr/numass/data/SpectrumGenerator.java
index dedca250..06b08cab 100644
--- a/numass-main/src/main/java/inr/numass/data/SpectrumGenerator.java
+++ b/numass-main/src/main/java/inr/numass/data/SpectrumGenerator.java
@@ -15,8 +15,8 @@
  */
 package inr.numass.data;
 
-import hep.dataforge.data.DataPoint;
-import hep.dataforge.data.ListPointSet;
+import hep.dataforge.points.DataPoint;
+import hep.dataforge.points.ListPointSet;
 import hep.dataforge.datafitter.ParamSet;
 import hep.dataforge.datafitter.models.Generator;
 import hep.dataforge.datafitter.models.XYModel;
diff --git a/numass-main/src/main/java/inr/numass/data/SpectrumInformation.java b/numass-main/src/main/java/inr/numass/data/SpectrumInformation.java
index 5b3d99e4..d1667cf7 100644
--- a/numass-main/src/main/java/inr/numass/data/SpectrumInformation.java
+++ b/numass-main/src/main/java/inr/numass/data/SpectrumInformation.java
@@ -15,8 +15,8 @@
  */
 package inr.numass.data;
 
-import hep.dataforge.data.DataPoint;
-import hep.dataforge.data.ListPointSet;
+import hep.dataforge.points.DataPoint;
+import hep.dataforge.points.ListPointSet;
 import hep.dataforge.functions.ParametricFunction;
 import static hep.dataforge.maths.MatrixOperations.inverse;
 import hep.dataforge.maths.NamedDoubleSet;
diff --git a/numass-main/src/main/java/inr/numass/models/FSS.java b/numass-main/src/main/java/inr/numass/models/FSS.java
index 68118de1..8c97e5b7 100644
--- a/numass-main/src/main/java/inr/numass/models/FSS.java
+++ b/numass-main/src/main/java/inr/numass/models/FSS.java
@@ -15,13 +15,13 @@
  */
 package inr.numass.models;
 
-import hep.dataforge.data.DataPoint;
+import hep.dataforge.points.DataPoint;
 import hep.dataforge.io.IOUtils;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
 import org.apache.commons.math3.util.Pair;
-import hep.dataforge.data.PointSet;
+import hep.dataforge.points.PointSet;
 
 /**
  *
diff --git a/numass-main/src/main/java/inr/numass/models/Transmission.java b/numass-main/src/main/java/inr/numass/models/Transmission.java
index 41b56753..125649b1 100644
--- a/numass-main/src/main/java/inr/numass/models/Transmission.java
+++ b/numass-main/src/main/java/inr/numass/models/Transmission.java
@@ -13,32 +13,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package inr.numass.models;
-
-
-import hep.dataforge.functions.ParametricFunction;
-import hep.dataforge.maths.NamedDoubleSet;
-import hep.dataforge.names.NamedSet;
-import org.apache.commons.math3.analysis.BivariateFunction;
-
-/**
- *
- * @author Darksnake
- */
-public interface Transmission extends NamedSet{
-    
-    double getValue(NamedDoubleSet set, double input, double output);
-    double getDeriv(String name, NamedDoubleSet set, double input, double output);
-    boolean providesDeriv(String name);
-    
-    ParametricFunction getConvolutedSpectrum(RangedNamedSetSpectrum bare);
-    
-    
-    default BivariateFunction getBivariateFunction(final NamedDoubleSet params){
-        return (double input, double output) -> getValue(params, input, output);
-    }
-    
-    default BivariateFunction getBivariateDerivFunction(final String name, final NamedDoubleSet params){
-        return (double input, double output) -> getDeriv(name, params, input, output);
-    }    
-}
+package inr.numass.models;
+
+
+import hep.dataforge.functions.ParametricFunction;
+import hep.dataforge.maths.NamedDoubleSet;
+import org.apache.commons.math3.analysis.BivariateFunction;
+import hep.dataforge.names.NameSet;
+
+/**
+ *
+ * @author Darksnake
+ */
+public interface Transmission extends NameSet{
+    
+    double getValue(NamedDoubleSet set, double input, double output);
+    double getDeriv(String name, NamedDoubleSet set, double input, double output);
+    boolean providesDeriv(String name);
+    
+    ParametricFunction getConvolutedSpectrum(RangedNamedSetSpectrum bare);
+    
+    
+    default BivariateFunction getBivariateFunction(final NamedDoubleSet params){
+        return (double input, double output) -> getValue(params, input, output);
+    }
+    
+    default BivariateFunction getBivariateDerivFunction(final String name, final NamedDoubleSet params){
+        return (double input, double output) -> getDeriv(name, params, input, output);
+    }    
+}
diff --git a/numass-main/src/main/java/inr/numass/models/TransmissionInterpolator.java b/numass-main/src/main/java/inr/numass/models/TransmissionInterpolator.java
index 28f51b86..ddbeebb1 100644
--- a/numass-main/src/main/java/inr/numass/models/TransmissionInterpolator.java
+++ b/numass-main/src/main/java/inr/numass/models/TransmissionInterpolator.java
@@ -18,7 +18,7 @@ package inr.numass.models;
 import hep.dataforge.actions.ActionResult;
 import hep.dataforge.actions.RunManager;
 import hep.dataforge.context.Context;
-import hep.dataforge.data.DataPoint;
+import hep.dataforge.points.DataPoint;
 import hep.dataforge.io.ColumnedDataReader;
 import hep.dataforge.meta.Meta;
 import java.io.File;
@@ -27,7 +27,7 @@ import java.util.ArrayList;
 import java.util.List;
 import org.apache.commons.math3.analysis.UnivariateFunction;
 import org.apache.commons.math3.analysis.interpolation.LinearInterpolator;
-import hep.dataforge.data.PointSet;
+import hep.dataforge.points.PointSet;
 
 /**
  *
diff --git a/numass-main/src/main/java/inr/numass/utils/DataModelUtils.java b/numass-main/src/main/java/inr/numass/utils/DataModelUtils.java
index 28987f96..2c312d05 100644
--- a/numass-main/src/main/java/inr/numass/utils/DataModelUtils.java
+++ b/numass-main/src/main/java/inr/numass/utils/DataModelUtils.java
@@ -15,9 +15,9 @@
  */
 package inr.numass.utils;
 
-import hep.dataforge.data.DataPoint;
-import hep.dataforge.data.ListPointSet;
-import hep.dataforge.data.MapPoint;
+import hep.dataforge.points.DataPoint;
+import hep.dataforge.points.ListPointSet;
+import hep.dataforge.points.MapPoint;
 
 
 /**
diff --git a/numass-main/src/main/java/inr/numass/utils/OldDataReader.java b/numass-main/src/main/java/inr/numass/utils/OldDataReader.java
index ed508f4e..f09a6b2b 100644
--- a/numass-main/src/main/java/inr/numass/utils/OldDataReader.java
+++ b/numass-main/src/main/java/inr/numass/utils/OldDataReader.java
@@ -16,9 +16,9 @@
 package inr.numass.utils;
 
 import hep.dataforge.context.GlobalContext;
-import hep.dataforge.data.DataPoint;
-import hep.dataforge.data.ListPointSet;
-import hep.dataforge.data.MapPoint;
+import hep.dataforge.points.DataPoint;
+import hep.dataforge.points.ListPointSet;
+import hep.dataforge.points.MapPoint;
 import inr.numass.data.SpectrumDataAdapter;
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/numass-main/src/main/java/inr/numass/utils/TritiumUtils.java b/numass-main/src/main/java/inr/numass/utils/TritiumUtils.java
index 8723d8a4..8e2f0682 100644
--- a/numass-main/src/main/java/inr/numass/utils/TritiumUtils.java
+++ b/numass-main/src/main/java/inr/numass/utils/TritiumUtils.java
@@ -15,8 +15,8 @@
  */
 package inr.numass.utils;
 
-import hep.dataforge.data.DataPoint;
-import hep.dataforge.data.ListPointSet;
+import hep.dataforge.points.DataPoint;
+import hep.dataforge.points.ListPointSet;
 import inr.numass.data.SpectrumDataAdapter;
 import static java.lang.Math.abs;
 import static java.lang.Math.exp;
@@ -25,6 +25,10 @@ import org.apache.commons.math3.analysis.UnivariateFunction;
 import static java.lang.Math.abs;
 import static java.lang.Math.abs;
 import static java.lang.Math.abs;
+import static java.lang.Math.abs;
+import static java.lang.Math.abs;
+import static java.lang.Math.abs;
+import static java.lang.Math.abs;
 
 /**
  *
diff --git a/numass-prop/src/main/java/inr/numass/prop/PoissonAdapter.java b/numass-prop/src/main/java/inr/numass/prop/PoissonAdapter.java
index 3c2d9fe4..51018d1b 100644
--- a/numass-prop/src/main/java/inr/numass/prop/PoissonAdapter.java
+++ b/numass-prop/src/main/java/inr/numass/prop/PoissonAdapter.java
@@ -15,8 +15,8 @@
  */
 package inr.numass.prop;
 
-import hep.dataforge.data.DataPoint;
-import hep.dataforge.data.XYAdapter;
+import hep.dataforge.points.DataPoint;
+import hep.dataforge.points.XYAdapter;
 import hep.dataforge.exceptions.NameNotFoundException;
 import hep.dataforge.values.Value;
 
diff --git a/numass-prop/src/main/java/inr/numass/prop/PropTest.java b/numass-prop/src/main/java/inr/numass/prop/PropTest.java
index c8cda1b7..93af1e50 100644
--- a/numass-prop/src/main/java/inr/numass/prop/PropTest.java
+++ b/numass-prop/src/main/java/inr/numass/prop/PropTest.java
@@ -17,7 +17,7 @@ package inr.numass.prop;
 
 import hep.dataforge.context.GlobalContext;
 import static hep.dataforge.context.GlobalContext.out;
-import hep.dataforge.data.DataPoint;
+import hep.dataforge.points.DataPoint;
 import hep.dataforge.datafitter.FitManager;
 import hep.dataforge.datafitter.FitState;
 import hep.dataforge.datafitter.ParamSet;
@@ -29,7 +29,7 @@ import hep.dataforge.maths.RandomUtils;
 import inr.numass.models.BetaSpectrum;
 import inr.numass.models.NBkgSpectrum;
 import java.io.FileNotFoundException;
-import hep.dataforge.data.PointSet;
+import hep.dataforge.points.PointSet;
 
 /**
  * Hello world!
diff --git a/numass-prop/src/main/java/inr/numass/prop/ar/FitJNAData.java b/numass-prop/src/main/java/inr/numass/prop/ar/FitJNAData.java
index bbf51963..be0c8d6a 100644
--- a/numass-prop/src/main/java/inr/numass/prop/ar/FitJNAData.java
+++ b/numass-prop/src/main/java/inr/numass/prop/ar/FitJNAData.java
@@ -17,9 +17,9 @@ package inr.numass.prop.ar;
 
 import hep.dataforge.actions.OneToOneAction;
 import hep.dataforge.context.Context;
-import hep.dataforge.data.DataPoint;
-import hep.dataforge.data.ListPointSet;
-import hep.dataforge.data.MapPoint;
+import hep.dataforge.points.DataPoint;
+import hep.dataforge.points.ListPointSet;
+import hep.dataforge.points.MapPoint;
 import hep.dataforge.datafitter.FitManager;
 import hep.dataforge.datafitter.FitPlugin;
 import hep.dataforge.datafitter.FitState;
@@ -37,7 +37,7 @@ import inr.numass.prop.SplitNormalSpectrum;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
-import hep.dataforge.data.PointSet;
+import hep.dataforge.points.PointSet;
 
 /**
  *
diff --git a/numass-prop/src/main/java/inr/numass/prop/ar/JNASpectrum.java b/numass-prop/src/main/java/inr/numass/prop/ar/JNASpectrum.java
index 4bfe5b66..0c005c1e 100644
--- a/numass-prop/src/main/java/inr/numass/prop/ar/JNASpectrum.java
+++ b/numass-prop/src/main/java/inr/numass/prop/ar/JNASpectrum.java
@@ -16,9 +16,9 @@
 package inr.numass.prop.ar;
 
 import hep.dataforge.content.NamedMetaHolder;
-import hep.dataforge.data.DataPoint;
-import hep.dataforge.data.ListPointSet;
-import hep.dataforge.data.MapPoint;
+import hep.dataforge.points.DataPoint;
+import hep.dataforge.points.ListPointSet;
+import hep.dataforge.points.MapPoint;
 import hep.dataforge.description.NodeDef;
 import hep.dataforge.description.ValueDef;
 import hep.dataforge.meta.Meta;
@@ -28,7 +28,7 @@ import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import hep.dataforge.data.PointSet;
+import hep.dataforge.points.PointSet;
 
 /**
  *
diff --git a/numass-prop/src/main/java/inr/numass/prop/ar/ReadJNADataAction.java b/numass-prop/src/main/java/inr/numass/prop/ar/ReadJNADataAction.java
index 3add9c35..eb7cc0c7 100644
--- a/numass-prop/src/main/java/inr/numass/prop/ar/ReadJNADataAction.java
+++ b/numass-prop/src/main/java/inr/numass/prop/ar/ReadJNADataAction.java
@@ -17,8 +17,8 @@ package inr.numass.prop.ar;
 
 import hep.dataforge.actions.OneToOneAction;
 import hep.dataforge.context.Context;
-import hep.dataforge.data.DataPoint;
-import hep.dataforge.data.FileData;
+import hep.dataforge.points.DataPoint;
+import hep.dataforge.points.FileData;
 import hep.dataforge.description.TypedActionDef;
 import hep.dataforge.description.ValueDef;
 import hep.dataforge.exceptions.ContentException;
@@ -38,7 +38,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Scanner;
-import hep.dataforge.data.PointSet;
+import hep.dataforge.points.PointSet;
 
 /**
  *
diff --git a/numass-prop/src/test/java/inr/numass/prop/TestFit.java b/numass-prop/src/test/java/inr/numass/prop/TestFit.java
index c01672ed..531bbafb 100644
--- a/numass-prop/src/test/java/inr/numass/prop/TestFit.java
+++ b/numass-prop/src/test/java/inr/numass/prop/TestFit.java
@@ -16,7 +16,7 @@
 package inr.numass.prop;
 
 import hep.dataforge.context.GlobalContext;
-import hep.dataforge.data.FileData;
+import hep.dataforge.points.FileData;
 import hep.dataforge.datafitter.MINUITPlugin;
 import hep.dataforge.io.ColumnedDataWriter;
 import hep.dataforge.meta.MetaBuilder;
@@ -25,7 +25,7 @@ import inr.numass.prop.ar.JNAEpisode;
 import inr.numass.prop.ar.ReadJNADataAction;
 import java.io.File;
 import java.io.FileNotFoundException;
-import hep.dataforge.data.PointSet;
+import hep.dataforge.points.PointSet;
 
 /**
  *
diff --git a/numass-prop/src/test/java/inr/numass/prop/TestReader.java b/numass-prop/src/test/java/inr/numass/prop/TestReader.java
index 85ed8e5d..4b8ded53 100644
--- a/numass-prop/src/test/java/inr/numass/prop/TestReader.java
+++ b/numass-prop/src/test/java/inr/numass/prop/TestReader.java
@@ -16,8 +16,8 @@
 package inr.numass.prop;
 
 import hep.dataforge.context.GlobalContext;
-import hep.dataforge.data.FileData;
-import hep.dataforge.data.XYAdapter;
+import hep.dataforge.points.FileData;
+import hep.dataforge.points.XYAdapter;
 import hep.dataforge.meta.Meta;
 import hep.dataforge.meta.MetaBuilder;
 import hep.dataforge.plots.PlotFrame;
diff --git a/numass-viewer/src/main/java/inr/numass/viewer/MspViewController.java b/numass-viewer/src/main/java/inr/numass/viewer/MspViewController.java
index d2ff9164..10a1b2f6 100644
--- a/numass-viewer/src/main/java/inr/numass/viewer/MspViewController.java
+++ b/numass-viewer/src/main/java/inr/numass/viewer/MspViewController.java
@@ -20,8 +20,8 @@ package inr.numass.viewer;
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-import hep.dataforge.data.DataPoint;
-import hep.dataforge.data.MapPoint;
+import hep.dataforge.points.DataPoint;
+import hep.dataforge.points.MapPoint;
 import hep.dataforge.plots.PlotUtils;
 import hep.dataforge.plots.data.DynamicPlottable;
 import hep.dataforge.plots.data.DynamicPlottableSet;
diff --git a/numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderViewComponent.java b/numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderViewComponent.java
index 1f7497c6..43df2d72 100644
--- a/numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderViewComponent.java
+++ b/numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderViewComponent.java
@@ -20,10 +20,10 @@ package inr.numass.viewer;
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-import hep.dataforge.data.DataPoint;
-import hep.dataforge.data.ListPointSet;
-import hep.dataforge.data.MapPoint;
-import hep.dataforge.data.XYAdapter;
+import hep.dataforge.points.DataPoint;
+import hep.dataforge.points.ListPointSet;
+import hep.dataforge.points.MapPoint;
+import hep.dataforge.points.XYAdapter;
 import hep.dataforge.io.ColumnedDataWriter;
 import hep.dataforge.meta.Meta;
 import hep.dataforge.meta.MetaBuilder;
@@ -72,7 +72,7 @@ import org.controlsfx.validation.ValidationSupport;
 import org.controlsfx.validation.Validator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import hep.dataforge.data.PointSet;
+import hep.dataforge.points.PointSet;
 
 /**
  * FXML Controller class