diff --git a/numass-main/src/main/java/inr/numass/tasks/NumassFitScanSummaryTask.java b/numass-main/src/main/java/inr/numass/tasks/NumassFitScanSummaryTask.java
index ab7a3123..a7e6d800 100644
--- a/numass-main/src/main/java/inr/numass/tasks/NumassFitScanSummaryTask.java
+++ b/numass-main/src/main/java/inr/numass/tasks/NumassFitScanSummaryTask.java
@@ -19,8 +19,8 @@ import hep.dataforge.stat.fit.UpperLimitGenerator;
 import hep.dataforge.tables.ListTable;
 import hep.dataforge.tables.Table;
 import hep.dataforge.tables.TableTransform;
-import hep.dataforge.workspace.AbstractTask;
-import hep.dataforge.workspace.TaskModel;
+import hep.dataforge.workspace.tasks.AbstractTask;
+import hep.dataforge.workspace.tasks.TaskModel;
 import inr.numass.utils.NumassUtils;
 
 import java.util.Map;
diff --git a/numass-main/src/main/java/inr/numass/tasks/NumassFitScanTask.java b/numass-main/src/main/java/inr/numass/tasks/NumassFitScanTask.java
index b8f0af46..74a8d87d 100644
--- a/numass-main/src/main/java/inr/numass/tasks/NumassFitScanTask.java
+++ b/numass-main/src/main/java/inr/numass/tasks/NumassFitScanTask.java
@@ -14,8 +14,8 @@ import hep.dataforge.stat.fit.FitAction;
 import hep.dataforge.stat.fit.FitResult;
 import hep.dataforge.tables.Table;
 import hep.dataforge.values.Value;
-import hep.dataforge.workspace.AbstractTask;
-import hep.dataforge.workspace.TaskModel;
+import hep.dataforge.workspace.tasks.AbstractTask;
+import hep.dataforge.workspace.tasks.TaskModel;
 
 import java.util.Objects;
 import java.util.stream.Collectors;
diff --git a/numass-main/src/main/java/inr/numass/tasks/NumassFitSummaryTask.java b/numass-main/src/main/java/inr/numass/tasks/NumassFitSummaryTask.java
index 16795af0..b567fe3e 100644
--- a/numass-main/src/main/java/inr/numass/tasks/NumassFitSummaryTask.java
+++ b/numass-main/src/main/java/inr/numass/tasks/NumassFitSummaryTask.java
@@ -21,8 +21,8 @@ import hep.dataforge.data.DataNode;
 import hep.dataforge.meta.Meta;
 import hep.dataforge.stat.fit.FitState;
 import hep.dataforge.tables.Table;
-import hep.dataforge.workspace.SingleActionTask;
-import hep.dataforge.workspace.TaskModel;
+import hep.dataforge.workspace.tasks.SingleActionTask;
+import hep.dataforge.workspace.tasks.TaskModel;
 import inr.numass.actions.SummaryAction;
 
 /**
diff --git a/numass-main/src/main/java/inr/numass/tasks/NumassFitTask.java b/numass-main/src/main/java/inr/numass/tasks/NumassFitTask.java
index 7f118dda..a2b8fc5d 100644
--- a/numass-main/src/main/java/inr/numass/tasks/NumassFitTask.java
+++ b/numass-main/src/main/java/inr/numass/tasks/NumassFitTask.java
@@ -24,8 +24,8 @@ import hep.dataforge.plotfit.PlotFitResultAction;
 import hep.dataforge.stat.fit.FitAction;
 import hep.dataforge.stat.fit.FitResult;
 import hep.dataforge.tables.Table;
-import hep.dataforge.workspace.SingleActionTask;
-import hep.dataforge.workspace.TaskModel;
+import hep.dataforge.workspace.tasks.SingleActionTask;
+import hep.dataforge.workspace.tasks.TaskModel;
 
 /**
  * Created by darksnake on 16-Sep-16.
diff --git a/numass-main/src/main/java/inr/numass/tasks/NumassPrepareTask.java b/numass-main/src/main/java/inr/numass/tasks/NumassPrepareTask.java
index c7ba2ca9..bc111613 100644
--- a/numass-main/src/main/java/inr/numass/tasks/NumassPrepareTask.java
+++ b/numass-main/src/main/java/inr/numass/tasks/NumassPrepareTask.java
@@ -15,8 +15,8 @@ import hep.dataforge.description.NodeDef;
 import hep.dataforge.meta.Meta;
 import hep.dataforge.meta.Template;
 import hep.dataforge.tables.Table;
-import hep.dataforge.workspace.AbstractTask;
-import hep.dataforge.workspace.TaskModel;
+import hep.dataforge.workspace.tasks.AbstractTask;
+import hep.dataforge.workspace.tasks.TaskModel;
 import inr.numass.actions.AnalyzeDataAction;
 import inr.numass.actions.MergeDataAction;
 import inr.numass.actions.MonitorCorrectAction;
diff --git a/numass-main/src/main/java/inr/numass/tasks/NumassSubstractEmptySourceTask.java b/numass-main/src/main/java/inr/numass/tasks/NumassSubstractEmptySourceTask.java
index 800a6402..72cced99 100644
--- a/numass-main/src/main/java/inr/numass/tasks/NumassSubstractEmptySourceTask.java
+++ b/numass-main/src/main/java/inr/numass/tasks/NumassSubstractEmptySourceTask.java
@@ -27,8 +27,8 @@ import hep.dataforge.tables.ListTable;
 import hep.dataforge.tables.Table;
 import hep.dataforge.tables.ValueMap;
 import hep.dataforge.values.Values;
-import hep.dataforge.workspace.AbstractTask;
-import hep.dataforge.workspace.TaskModel;
+import hep.dataforge.workspace.tasks.AbstractTask;
+import hep.dataforge.workspace.tasks.TaskModel;
 import org.slf4j.LoggerFactory;
 
 import java.io.OutputStream;
diff --git a/numass-main/src/main/java/inr/numass/tasks/NumassTableFilterTask.java b/numass-main/src/main/java/inr/numass/tasks/NumassTableFilterTask.java
index 5b852e98..3c9abdef 100644
--- a/numass-main/src/main/java/inr/numass/tasks/NumassTableFilterTask.java
+++ b/numass-main/src/main/java/inr/numass/tasks/NumassTableFilterTask.java
@@ -11,8 +11,8 @@ import hep.dataforge.tables.Table;
 import hep.dataforge.tables.TableTransform;
 import hep.dataforge.values.Value;
 import hep.dataforge.values.Values;
-import hep.dataforge.workspace.SingleActionTask;
-import hep.dataforge.workspace.TaskModel;
+import hep.dataforge.workspace.tasks.SingleActionTask;
+import hep.dataforge.workspace.tasks.TaskModel;
 import inr.numass.utils.ExpressionUtils;
 
 import java.util.HashMap;