diff --git a/tests/afrouter/suites/test2/test2.go b/tests/afrouter/suites/test2/test2.go
index 258cb64..3661dce 100644
--- a/tests/afrouter/suites/test2/test2.go
+++ b/tests/afrouter/suites/test2/test2.go
@@ -31,7 +31,7 @@
 	//"encoding/json"
 	"text/template"
 	//"github.com/golang/protobuf/proto"
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	//pb "github.com/golang/protobuf/protoc-gen-go/descriptor"
 )
 
diff --git a/tests/afrouter/suites/test3/test3.go b/tests/afrouter/suites/test3/test3.go
index 2fb561c..0738188 100644
--- a/tests/afrouter/suites/test3/test3.go
+++ b/tests/afrouter/suites/test3/test3.go
@@ -31,7 +31,7 @@
 	//"encoding/json"
 	"text/template"
 	//"github.com/golang/protobuf/proto"
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	//pb "github.com/golang/protobuf/protoc-gen-go/descriptor"
 )
 
diff --git a/tests/afrouter/templates/client.go.tmpl b/tests/afrouter/templates/client.go.tmpl
index fe559d6..ba68ed2 100644
--- a/tests/afrouter/templates/client.go.tmpl
+++ b/tests/afrouter/templates/client.go.tmpl
@@ -23,7 +23,7 @@
 	"google.golang.org/grpc"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/metadata"
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	// Values generated by the go template
 	{{range .Imports}}
 	"{{.}}"
diff --git a/tests/afrouter/templates/main.go.tmpl b/tests/afrouter/templates/main.go.tmpl
index 0361460..5328226 100644
--- a/tests/afrouter/templates/main.go.tmpl
+++ b/tests/afrouter/templates/main.go.tmpl
@@ -27,7 +27,7 @@
 	"context"
 	//slog "log"
 	//"google.golang.org/grpc/grpclog"
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 )
 
 func startSut(cmdStr string) (*exec.Cmd, context.CancelFunc, error) {
diff --git a/tests/afrouter/templates/runAll.go.tmpl b/tests/afrouter/templates/runAll.go.tmpl
index 5b02376..9ad8356 100644
--- a/tests/afrouter/templates/runAll.go.tmpl
+++ b/tests/afrouter/templates/runAll.go.tmpl
@@ -25,7 +25,7 @@
 	"fmt"
 	"os/exec"
 	"io/ioutil"
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 )
 
 
diff --git a/tests/afrouter/templates/runTests.go.tmpl b/tests/afrouter/templates/runTests.go.tmpl
index 3aa59ac..9d3fdf5 100644
--- a/tests/afrouter/templates/runTests.go.tmpl
+++ b/tests/afrouter/templates/runTests.go.tmpl
@@ -26,7 +26,7 @@
 	"encoding/json"
 	//"golang.org/x/net/context"
 	"google.golang.org/grpc/metadata"
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 {{end}}
 	{{range .Imports}}
 	{{if .Used}}
diff --git a/tests/afrouter/templates/server.go.tmpl b/tests/afrouter/templates/server.go.tmpl
index 0f9ed48..ea95a01 100644
--- a/tests/afrouter/templates/server.go.tmpl
+++ b/tests/afrouter/templates/server.go.tmpl
@@ -27,7 +27,7 @@
 	"google.golang.org/grpc"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/metadata"
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	// Values generated by the go template
 	{{range .Imports}}
 	"{{.}}"
diff --git a/tests/afrouter/templates/stats.go.tmpl b/tests/afrouter/templates/stats.go.tmpl
index 958bea7..be7d858 100644
--- a/tests/afrouter/templates/stats.go.tmpl
+++ b/tests/afrouter/templates/stats.go.tmpl
@@ -26,7 +26,7 @@
 	"io/ioutil"
 	"encoding/json"
 	//"google.golang.org/grpc/grpclog"
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 )
 
 type TestCase struct {
diff --git a/tests/afrouter/tester.go b/tests/afrouter/tester.go
index 94972ed..f82745d 100644
--- a/tests/afrouter/tester.go
+++ b/tests/afrouter/tester.go
@@ -26,7 +26,7 @@
 	"fmt"
 	"github.com/golang/protobuf/proto"
 	pb "github.com/golang/protobuf/protoc-gen-go/descriptor"
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"io/ioutil"
 	"math"
 	"os"
diff --git a/tests/afrouter/tester/main.go b/tests/afrouter/tester/main.go
index 1037de0..ce07524 100644
--- a/tests/afrouter/tester/main.go
+++ b/tests/afrouter/tester/main.go
@@ -22,7 +22,7 @@
 package main
 
 import (
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 )
 
 func main() {
diff --git a/tests/core/api/grpc_nbi_api_handler_client_test.go b/tests/core/api/grpc_nbi_api_handler_client_test.go
index be197e6..f0e3534 100644
--- a/tests/core/api/grpc_nbi_api_handler_client_test.go
+++ b/tests/core/api/grpc_nbi_api_handler_client_test.go
@@ -22,8 +22,8 @@
 	"context"
 	"fmt"
 	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/opencord/voltha-go/common/log"
 	com "github.com/opencord/voltha-lib-go/pkg/adapters/common"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"github.com/opencord/voltha-protos/go/common"
 	"github.com/opencord/voltha-protos/go/openflow_13"
 	"github.com/opencord/voltha-protos/go/voltha"
diff --git a/tests/core/concurrency/core_concurrency_test.go b/tests/core/concurrency/core_concurrency_test.go
index d183a3a..5a38e8b 100644
--- a/tests/core/concurrency/core_concurrency_test.go
+++ b/tests/core/concurrency/core_concurrency_test.go
@@ -23,8 +23,8 @@
 	"fmt"
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-go/common/log"
 	com "github.com/opencord/voltha-lib-go/pkg/adapters/common"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"github.com/opencord/voltha-protos/go/common"
 	"github.com/opencord/voltha-protos/go/voltha"
 	"github.com/stretchr/testify/assert"
diff --git a/tests/core/flow_management_test.go b/tests/core/flow_management_test.go
index 3a44c19..234eed9 100644
--- a/tests/core/flow_management_test.go
+++ b/tests/core/flow_management_test.go
@@ -21,9 +21,9 @@
 	"context"
 	"fmt"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-go/common/log"
 	fu "github.com/opencord/voltha-go/rw_core/utils"
 	tu "github.com/opencord/voltha-go/tests/utils"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"github.com/opencord/voltha-protos/go/common"
 	ofp "github.com/opencord/voltha-protos/go/openflow_13"
 	"github.com/opencord/voltha-protos/go/voltha"
diff --git a/tests/core/performance_metrics_test.go b/tests/core/performance_metrics_test.go
index 9e074f5..94b5826 100644
--- a/tests/core/performance_metrics_test.go
+++ b/tests/core/performance_metrics_test.go
@@ -21,8 +21,8 @@
 	"context"
 	"fmt"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-go/common/log"
 	tu "github.com/opencord/voltha-go/tests/utils"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"github.com/opencord/voltha-protos/go/common"
 	"github.com/opencord/voltha-protos/go/voltha"
 	"github.com/stretchr/testify/assert"
diff --git a/tests/kafka/kafka_client_test.go b/tests/kafka/kafka_client_test.go
index f6eadff..f1ac1b4 100644
--- a/tests/kafka/kafka_client_test.go
+++ b/tests/kafka/kafka_client_test.go
@@ -22,8 +22,8 @@
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/any"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-go/common/log"
-	kk "github.com/opencord/voltha-go/kafka"
+	kk "github.com/opencord/voltha-lib-go/pkg/kafka"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	ic "github.com/opencord/voltha-protos/go/inter_container"
 	"github.com/stretchr/testify/assert"
 	"os"
diff --git a/tests/kafka/kafka_inter_container_messaging_test.go b/tests/kafka/kafka_inter_container_messaging_test.go
index 6a6dbc2..875d762 100644
--- a/tests/kafka/kafka_inter_container_messaging_test.go
+++ b/tests/kafka/kafka_inter_container_messaging_test.go
@@ -21,9 +21,9 @@
 	"context"
 	"github.com/golang/protobuf/ptypes"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-go/common/log"
-	kk "github.com/opencord/voltha-go/kafka"
 	rhp "github.com/opencord/voltha-go/rw_core/core"
+	kk "github.com/opencord/voltha-lib-go/pkg/kafka"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	ic "github.com/opencord/voltha-protos/go/inter_container"
 	"github.com/opencord/voltha-protos/go/voltha"
 	"github.com/stretchr/testify/assert"
@@ -126,7 +126,7 @@
 //
 //func TestMultipleSubscribeUnsubscribe(t *testing.T) {
 //	// First subscribe to the specific topic
-//	//log.SetPackageLogLevel("github.com/opencord/voltha-go/kafka", log.DebugLevel)
+//	//log.SetPackageLogLevel("github.com/opencord/voltha-lib-go/pkg/kafka", log.DebugLevel)
 //	var err error
 //	var ch1 <-chan *ic.InterContainerMessage
 //	var ch2 <-chan *ic.InterContainerMessage
@@ -165,7 +165,7 @@
 //}
 
 func TestIncorrectAPI(t *testing.T) {
-	log.SetPackageLogLevel("github.com/opencord/voltha-go/kafka", log.ErrorLevel)
+	log.SetPackageLogLevel("github.com/opencord/voltha-lib-go/pkg/kafka", log.ErrorLevel)
 	trnsId := uuid.New().String()
 	protoMsg := &voltha.Device{Id: trnsId}
 	args := make([]*kk.KVArg, 1)