diff --git a/pkg/core/events.go b/pkg/core/events.go
index 1fbc7cf..ac7042a 100644
--- a/pkg/core/events.go
+++ b/pkg/core/events.go
@@ -5,6 +5,7 @@ import (
 	"reflect"
 	"time"
 
+	. "git.qtrade.icu/coin-quant/trademodel"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/tidwall/gjson"
 )
diff --git a/pkg/ctl/back.go b/pkg/ctl/back.go
index f5f7c69..92fa8ed 100644
--- a/pkg/ctl/back.go
+++ b/pkg/ctl/back.go
@@ -7,11 +7,11 @@ import (
 
 	"git.qtrade.icu/coin-quant/base/common"
 
+	. "git.qtrade.icu/coin-quant/trade/pkg/core"
 	"git.qtrade.icu/coin-quant/trade/pkg/event"
 	"git.qtrade.icu/coin-quant/trade/pkg/process/dbstore"
 	"git.qtrade.icu/coin-quant/trade/pkg/process/rpt"
 	"git.qtrade.icu/coin-quant/trade/pkg/process/vex"
-
 	log "github.com/sirupsen/logrus"
 )
 
diff --git a/pkg/ctl/trade.go b/pkg/ctl/trade.go
index b345263..f2313af 100644
--- a/pkg/ctl/trade.go
+++ b/pkg/ctl/trade.go
@@ -8,9 +8,11 @@ import (
 	"git.qtrade.icu/coin-quant/trade/pkg/process/goscript"
 	"git.qtrade.icu/coin-quant/trade/pkg/process/notify"
 	"git.qtrade.icu/coin-quant/trade/pkg/process/rpt"
+
 	"sync"
 	"time"
 
+	. "git.qtrade.icu/coin-quant/trade/pkg/core"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 )
diff --git a/pkg/helper/helper.go b/pkg/helper/helper.go
index f31432c..336ca11 100644
--- a/pkg/helper/helper.go
+++ b/pkg/helper/helper.go
@@ -3,6 +3,7 @@ package helper
 import (
 	"git.qtrade.icu/coin-quant/base/common"
 	"git.qtrade.icu/coin-quant/base/engine"
+	. "git.qtrade.icu/coin-quant/trademodel"
 )
 
 type CandleFn func(candle Candle)
diff --git a/pkg/helper/strategy.go b/pkg/helper/strategy.go
index 94651d3..1af3bc2 100644
--- a/pkg/helper/strategy.go
+++ b/pkg/helper/strategy.go
@@ -2,6 +2,7 @@ package helper
 
 import (
 	"fmt"
+	. "git.qtrade.icu/coin-quant/trademodel"
 )
 
 type DemoStrategy struct {
diff --git a/pkg/process/dbstore/db.go b/pkg/process/dbstore/db.go
index 07310b7..3d1d504 100644
--- a/pkg/process/dbstore/db.go
+++ b/pkg/process/dbstore/db.go
@@ -3,6 +3,7 @@ package dbstore
 import (
 	"fmt"
 	"git.qtrade.icu/coin-quant/base/common"
+	. "git.qtrade.icu/coin-quant/trade/pkg/core"
 	"reflect"
 	"regexp"
 	"sync"
diff --git a/pkg/process/dbstore/kline.go b/pkg/process/dbstore/kline.go
index 28c5166..54cb0ba 100644
--- a/pkg/process/dbstore/kline.go
+++ b/pkg/process/dbstore/kline.go
@@ -2,7 +2,9 @@ package dbstore
 
 import (
 	"fmt"
-
+	. "git.qtrade.icu/coin-quant/trade/pkg/core"
+	. "git.qtrade.icu/coin-quant/trade/pkg/event"
+	. "git.qtrade.icu/coin-quant/trademodel"
 	log "github.com/sirupsen/logrus"
 )
 
diff --git a/pkg/process/exchange/exchange.go b/pkg/process/exchange/exchange.go
index 530bf97..7009b0a 100644
--- a/pkg/process/exchange/exchange.go
+++ b/pkg/process/exchange/exchange.go
@@ -7,7 +7,10 @@ import (
 	"time"
 
 	"git.qtrade.icu/coin-quant/exchange"
+	. "git.qtrade.icu/coin-quant/trade/pkg/core"
+	. "git.qtrade.icu/coin-quant/trade/pkg/event"
 	"git.qtrade.icu/coin-quant/trademodel"
+	. "git.qtrade.icu/coin-quant/trademodel"
 	log "github.com/sirupsen/logrus"
 )
 
diff --git a/pkg/process/goscript/engine/engine.go b/pkg/process/goscript/engine/engine.go
index 1bf3dde..0e75c33 100644
--- a/pkg/process/goscript/engine/engine.go
+++ b/pkg/process/goscript/engine/engine.go
@@ -8,6 +8,9 @@ import (
 
 	"git.qtrade.icu/coin-quant/base/common"
 	"git.qtrade.icu/coin-quant/indicator"
+	. "git.qtrade.icu/coin-quant/trade/pkg/core"
+	. "git.qtrade.icu/coin-quant/trade/pkg/event"
+	. "git.qtrade.icu/coin-quant/trademodel"
 	log "github.com/sirupsen/logrus"
 )
 
diff --git a/pkg/process/goscript/engine/kline.go b/pkg/process/goscript/engine/kline.go
index 4b6666c..6a71b34 100644
--- a/pkg/process/goscript/engine/kline.go
+++ b/pkg/process/goscript/engine/kline.go
@@ -3,6 +3,7 @@ package engine
 import (
 	"git.qtrade.icu/coin-quant/base/common"
 
+	. "git.qtrade.icu/coin-quant/trademodel"
 	log "github.com/sirupsen/logrus"
 )
 
diff --git a/pkg/process/goscript/engine/runner.go b/pkg/process/goscript/engine/runner.go
index 6e41bcc..48d6b87 100644
--- a/pkg/process/goscript/engine/runner.go
+++ b/pkg/process/goscript/engine/runner.go
@@ -6,6 +6,8 @@ import (
 
 	"git.qtrade.icu/coin-quant/base/common"
 	"git.qtrade.icu/coin-quant/base/engine"
+	. "git.qtrade.icu/coin-quant/trade/pkg/event"
+	. "git.qtrade.icu/coin-quant/trademodel"
 )
 
 type NewRunnerFn func(file string) (r Runner, err error)
diff --git a/pkg/process/goscript/goengine.go b/pkg/process/goscript/goengine.go
index 18a12fe..de4fca9 100644
--- a/pkg/process/goscript/goengine.go
+++ b/pkg/process/goscript/goengine.go
@@ -9,6 +9,9 @@ import (
 	bengine "git.qtrade.icu/coin-quant/base/engine"
 	"git.qtrade.icu/coin-quant/trade/pkg/process/goscript/engine"
 
+	. "git.qtrade.icu/coin-quant/trade/pkg/core"
+	. "git.qtrade.icu/coin-quant/trade/pkg/event"
+	. "git.qtrade.icu/coin-quant/trademodel"
 	log "github.com/sirupsen/logrus"
 )
 
diff --git a/pkg/process/goscript/igo/runner.go b/pkg/process/goscript/igo/runner.go
index 3a368ab..33536b9 100644
--- a/pkg/process/goscript/igo/runner.go
+++ b/pkg/process/goscript/igo/runner.go
@@ -4,6 +4,7 @@ import (
 	"git.qtrade.icu/coin-quant/base/common"
 	"git.qtrade.icu/coin-quant/base/engine"
 
+	. "git.qtrade.icu/coin-quant/trade/pkg/event"
 	. "git.qtrade.icu/coin-quant/trademodel"
 )
 
diff --git a/pkg/process/goscript/plugin/plugin.go b/pkg/process/goscript/plugin/plugin.go
index e1f0607..568d20c 100644
--- a/pkg/process/goscript/plugin/plugin.go
+++ b/pkg/process/goscript/plugin/plugin.go
@@ -8,7 +8,9 @@ import (
 
 	"git.qtrade.icu/coin-quant/base/common"
 	bengine "git.qtrade.icu/coin-quant/base/engine"
+	. "git.qtrade.icu/coin-quant/trade/pkg/event"
 	"git.qtrade.icu/coin-quant/trade/pkg/process/goscript/engine"
+	. "git.qtrade.icu/coin-quant/trademodel"
 )
 
 func init() {
diff --git a/pkg/process/notify/notify.go b/pkg/process/notify/notify.go
index 289fce6..e196301 100644
--- a/pkg/process/notify/notify.go
+++ b/pkg/process/notify/notify.go
@@ -8,6 +8,9 @@ import (
 	"net/http"
 	"text/template"
 
+	. "git.qtrade.icu/coin-quant/trade/pkg/core"
+	. "git.qtrade.icu/coin-quant/trade/pkg/event"
+	. "git.qtrade.icu/coin-quant/trademodel"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 )
diff --git a/pkg/process/notify/notify_test.go b/pkg/process/notify/notify_test.go
index 566def3..aac26b7 100644
--- a/pkg/process/notify/notify_test.go
+++ b/pkg/process/notify/notify_test.go
@@ -5,6 +5,7 @@ import (
 	"path"
 	"testing"
 
+	. "git.qtrade.icu/coin-quant/trade/pkg/core"
 	"github.com/spf13/viper"
 )
 
diff --git a/pkg/process/rpt/rpt.go b/pkg/process/rpt/rpt.go
index 439a23a..fbc161a 100644
--- a/pkg/process/rpt/rpt.go
+++ b/pkg/process/rpt/rpt.go
@@ -3,6 +3,9 @@ package rpt
 import (
 	"fmt"
 
+	. "git.qtrade.icu/coin-quant/trade/pkg/core"
+	. "git.qtrade.icu/coin-quant/trade/pkg/event"
+	. "git.qtrade.icu/coin-quant/trademodel"
 	log "github.com/sirupsen/logrus"
 )
 
diff --git a/pkg/process/vex/vexchange.go b/pkg/process/vex/vexchange.go
index 44e2ff8..4af7c2f 100644
--- a/pkg/process/vex/vexchange.go
+++ b/pkg/process/vex/vexchange.go
@@ -11,6 +11,9 @@ import (
 	"git.qtrade.icu/coin-quant/base/common"
 	"git.qtrade.icu/coin-quant/trademodel"
 
+	. "git.qtrade.icu/coin-quant/trade/pkg/core"
+	. "git.qtrade.icu/coin-quant/trade/pkg/event"
+	. "git.qtrade.icu/coin-quant/trademodel"
 	log "github.com/sirupsen/logrus"
 )
 
diff --git a/pkg/report/report.go b/pkg/report/report.go
index 2b770a1..b2181ae 100644
--- a/pkg/report/report.go
+++ b/pkg/report/report.go
@@ -11,6 +11,8 @@ import (
 	"sort"
 
 	"git.qtrade.icu/coin-quant/base/common"
+	. "git.qtrade.icu/coin-quant/trade/pkg/core"
+	. "git.qtrade.icu/coin-quant/trademodel"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/montanaflynn/stats"
 	"github.com/shopspring/decimal"