diff --git a/pkg/parser/hashflow_v3/parser.go b/pkg/parser/hashflow_v3/parser.go
index 207f79b..d82a329 100644
--- a/pkg/parser/hashflow_v3/parser.go
+++ b/pkg/parser/hashflow_v3/parser.go
@@ -3,12 +3,12 @@ package hashflowv3
 import (
 	"encoding/json"
 	"errors"
-	"github.com/KyberNetwork/tradelogs/pkg/types"
 	"strings"
 
 	"github.com/KyberNetwork/tradelogs/pkg/decoder"
 	"github.com/KyberNetwork/tradelogs/pkg/parser"
 	"github.com/KyberNetwork/tradelogs/pkg/storage"
+	"github.com/KyberNetwork/tradelogs/pkg/types"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 	ethereumTypes "github.com/ethereum/go-ethereum/core/types"
diff --git a/pkg/parser/kyberswap/parser.go b/pkg/parser/kyberswap/parser.go
index bdf2dfe..ec66391 100644
--- a/pkg/parser/kyberswap/parser.go
+++ b/pkg/parser/kyberswap/parser.go
@@ -1,13 +1,13 @@
 package kyberswap
 
 import (
-	"github.com/KyberNetwork/tradelogs/pkg/types"
 	"strings"
 
 	ethereumTypes "github.com/ethereum/go-ethereum/core/types"
 
 	"github.com/KyberNetwork/tradelogs/pkg/parser"
 	"github.com/KyberNetwork/tradelogs/pkg/storage"
+	"github.com/KyberNetwork/tradelogs/pkg/types"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 )
diff --git a/pkg/parser/kyberswap_rfq/parser.go b/pkg/parser/kyberswap_rfq/parser.go
index 7d68227..b90b8e4 100644
--- a/pkg/parser/kyberswap_rfq/parser.go
+++ b/pkg/parser/kyberswap_rfq/parser.go
@@ -4,12 +4,12 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/KyberNetwork/tradelogs/pkg/types"
 	"strings"
 
 	"github.com/KyberNetwork/tradelogs/pkg/decoder"
 	"github.com/KyberNetwork/tradelogs/pkg/parser"
 	"github.com/KyberNetwork/tradelogs/pkg/storage"
+	"github.com/KyberNetwork/tradelogs/pkg/types"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 
diff --git a/pkg/parser/oneinch/parser.go b/pkg/parser/oneinch/parser.go
index 691c856..f647ba6 100644
--- a/pkg/parser/oneinch/parser.go
+++ b/pkg/parser/oneinch/parser.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/KyberNetwork/tradelogs/pkg/types"
 	"math/big"
 	"strings"
 
@@ -13,6 +12,7 @@ import (
 	"github.com/KyberNetwork/tradelogs/pkg/parser"
 	"github.com/KyberNetwork/tradelogs/pkg/storage"
 	"github.com/KyberNetwork/tradelogs/pkg/tracecall"
+	"github.com/KyberNetwork/tradelogs/pkg/types"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
diff --git a/pkg/parser/oneinchv6/makertraits.go b/pkg/parser/oneinchv6/makertraits.go
index 0743035..b84717d 100644
--- a/pkg/parser/oneinchv6/makertraits.go
+++ b/pkg/parser/oneinchv6/makertraits.go
@@ -3,10 +3,10 @@ package oneinchv6
 import (
 	"bytes"
 	"errors"
-	"github.com/ethereum/go-ethereum/common/math"
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/math"
 )
 
 type MakerTraitsOption struct {
diff --git a/pkg/parser/oneinchv6/makertraits_test.go b/pkg/parser/oneinchv6/makertraits_test.go
index 1cca94e..6078bad 100644
--- a/pkg/parser/oneinchv6/makertraits_test.go
+++ b/pkg/parser/oneinchv6/makertraits_test.go
@@ -1,9 +1,10 @@
 package oneinchv6
 
 import (
-	"github.com/ethereum/go-ethereum/common/math"
 	"math/big"
 	"testing"
+
+	"github.com/ethereum/go-ethereum/common/math"
 )
 
 func TestDecodeTraits(t *testing.T) {
diff --git a/pkg/parser/paraswap/parser.go b/pkg/parser/paraswap/parser.go
index 8f9538e..e275450 100644
--- a/pkg/parser/paraswap/parser.go
+++ b/pkg/parser/paraswap/parser.go
@@ -3,12 +3,12 @@ package paraswap
 import (
 	"encoding/json"
 	"errors"
-	"github.com/KyberNetwork/tradelogs/pkg/types"
 	"strings"
 
 	"github.com/KyberNetwork/tradelogs/pkg/decoder"
 	"github.com/KyberNetwork/tradelogs/pkg/parser"
 	"github.com/KyberNetwork/tradelogs/pkg/storage"
+	"github.com/KyberNetwork/tradelogs/pkg/types"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 	ethereumTypes "github.com/ethereum/go-ethereum/core/types"
diff --git a/pkg/parser/parser.go b/pkg/parser/parser.go
index 8ad3ceb..3d9380b 100644
--- a/pkg/parser/parser.go
+++ b/pkg/parser/parser.go
@@ -2,9 +2,9 @@ package parser
 
 import (
 	"errors"
-	"github.com/KyberNetwork/tradelogs/pkg/types"
 
 	"github.com/KyberNetwork/tradelogs/pkg/storage"
+	"github.com/KyberNetwork/tradelogs/pkg/types"
 	ethereumTypes "github.com/ethereum/go-ethereum/core/types"
 )
 
diff --git a/pkg/parser/zxotc/parser.go b/pkg/parser/zxotc/parser.go
index e2d4360..b7e90c9 100644
--- a/pkg/parser/zxotc/parser.go
+++ b/pkg/parser/zxotc/parser.go
@@ -3,12 +3,12 @@ package zxotc
 import (
 	"encoding/json"
 	"errors"
-	"github.com/KyberNetwork/tradelogs/pkg/types"
 	"strings"
 
 	"github.com/KyberNetwork/tradelogs/pkg/decoder"
 	"github.com/KyberNetwork/tradelogs/pkg/parser"
 	"github.com/KyberNetwork/tradelogs/pkg/storage"
+	"github.com/KyberNetwork/tradelogs/pkg/types"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 	ethereumTypes "github.com/ethereum/go-ethereum/core/types"