diff --git a/Gopkg.lock b/Gopkg.lock
index dd1ecc7..ade3532 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -227,22 +227,29 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:955257b92eafddae06807b037b66c0bbe34f3eb828dce0b7424e85d1270719ba"
+  digest = "1:7c2b93269405c7edbc221391416fcaf46453d94a611ae40029fd83b4ad52d39d"
   name = "github.com/opencord/voltha-go"
+  packages = ["rw_core/utils"]
+  pruneopts = "UT"
+  revision = "cb7c88a83125b0324452d2f4db3e50d2923c13c1"
+
+[[projects]]
+  digest = "1:608c31948048d9057aa75e54adadf817c76794074c711dc3c9c982bb3c58553e"
+  name = "github.com/opencord/voltha-lib-go"
   packages = [
-    "adapters",
-    "adapters/adapterif",
-    "adapters/common",
-    "common/log",
-    "common/ponresourcemanager",
-    "common/techprofile",
-    "db/kvstore",
-    "db/model",
-    "kafka",
-    "rw_core/utils",
+    "pkg/adapters",
+    "pkg/adapters/adapterif",
+    "pkg/adapters/common",
+    "pkg/db/kvstore",
+    "pkg/db/model",
+    "pkg/kafka",
+    "pkg/log",
+    "pkg/ponresourcemanager",
+    "pkg/techprofile",
   ]
   pruneopts = "UT"
-  revision = "676f0ddf24b3d5be9bdcadd89f2c8cc503468df8"
+  revision = "e73f91e306e9942a744829c74b304d2c063a8d61"
+  version = "v2.2.2"
 
 [[projects]]
   digest = "1:bc21a70b7c12a8d8c2b008d2d61a313bf4ed8f021be84d815f744a869e69c96f"
@@ -527,16 +534,16 @@
     "github.com/golang/protobuf/proto",
     "github.com/golang/protobuf/ptypes",
     "github.com/golang/protobuf/ptypes/any",
-    "github.com/opencord/voltha-go/adapters",
-    "github.com/opencord/voltha-go/adapters/adapterif",
-    "github.com/opencord/voltha-go/adapters/common",
-    "github.com/opencord/voltha-go/common/log",
-    "github.com/opencord/voltha-go/common/ponresourcemanager",
-    "github.com/opencord/voltha-go/common/techprofile",
-    "github.com/opencord/voltha-go/db/kvstore",
-    "github.com/opencord/voltha-go/db/model",
-    "github.com/opencord/voltha-go/kafka",
     "github.com/opencord/voltha-go/rw_core/utils",
+    "github.com/opencord/voltha-lib-go/pkg/adapters",
+    "github.com/opencord/voltha-lib-go/pkg/adapters/adapterif",
+    "github.com/opencord/voltha-lib-go/pkg/adapters/common",
+    "github.com/opencord/voltha-lib-go/pkg/db/kvstore",
+    "github.com/opencord/voltha-lib-go/pkg/db/model",
+    "github.com/opencord/voltha-lib-go/pkg/kafka",
+    "github.com/opencord/voltha-lib-go/pkg/log",
+    "github.com/opencord/voltha-lib-go/pkg/ponresourcemanager",
+    "github.com/opencord/voltha-lib-go/pkg/techprofile",
     "github.com/opencord/voltha-protos/go/common",
     "github.com/opencord/voltha-protos/go/inter_container",
     "github.com/opencord/voltha-protos/go/openflow_13",
diff --git a/Gopkg.toml b/Gopkg.toml
index b400baf..e9b2c71 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -38,6 +38,10 @@
   name = "github.com/opencord/voltha-go"
 
 [[constraint]]
+  version = "2.2.2"
+  name = "github.com/opencord/voltha-lib-go"
+
+[[constraint]]
   version = "1.0.0"
   name = "github.com/opencord/voltha-protos"
 
diff --git a/adaptercore/device_handler.go b/adaptercore/device_handler.go
index fb0d6d7..4908c59 100644
--- a/adaptercore/device_handler.go
+++ b/adaptercore/device_handler.go
@@ -33,8 +33,8 @@
 
 	"github.com/gogo/protobuf/proto"
 	"github.com/golang/protobuf/ptypes"
-	"github.com/opencord/voltha-go/adapters/adapterif"
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/adapters/adapterif"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	rsrcMgr "github.com/opencord/voltha-openolt-adapter/adaptercore/resourcemanager"
 	"github.com/opencord/voltha-protos/go/common"
 	ic "github.com/opencord/voltha-protos/go/inter_container"
diff --git a/adaptercore/device_handler_test.go b/adaptercore/device_handler_test.go
index d5facd5..9f189cf 100644
--- a/adaptercore/device_handler_test.go
+++ b/adaptercore/device_handler_test.go
@@ -25,8 +25,8 @@
 
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/any"
-	"github.com/opencord/voltha-go/common/log"
 	fu "github.com/opencord/voltha-go/rw_core/utils"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"github.com/opencord/voltha-openolt-adapter/adaptercore/resourcemanager"
 	"github.com/opencord/voltha-openolt-adapter/mocks"
 	ic "github.com/opencord/voltha-protos/go/inter_container"
diff --git a/adaptercore/olt_platform.go b/adaptercore/olt_platform.go
index a75c25d..4077e05 100644
--- a/adaptercore/olt_platform.go
+++ b/adaptercore/olt_platform.go
@@ -19,8 +19,8 @@
 
 import (
 	"errors"
-	"github.com/opencord/voltha-go/common/log"
 	"github.com/opencord/voltha-go/rw_core/utils"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	ofp "github.com/opencord/voltha-protos/go/openflow_13"
 	"github.com/opencord/voltha-protos/go/voltha"
 )
diff --git a/adaptercore/olt_state_transitions.go b/adaptercore/olt_state_transitions.go
index bd410d3..d5edb63 100644
--- a/adaptercore/olt_state_transitions.go
+++ b/adaptercore/olt_state_transitions.go
@@ -21,7 +21,7 @@
 	"reflect"
 	"runtime"
 
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 )
 
 // DeviceState OLT Device state
diff --git a/adaptercore/openolt.go b/adaptercore/openolt.go
index 33ac5d5..eb0a038 100644
--- a/adaptercore/openolt.go
+++ b/adaptercore/openolt.go
@@ -23,9 +23,9 @@
 	"fmt"
 	"sync"
 
-	"github.com/opencord/voltha-go/adapters/adapterif"
-	"github.com/opencord/voltha-go/common/log"
-	"github.com/opencord/voltha-go/kafka"
+	"github.com/opencord/voltha-lib-go/pkg/adapters/adapterif"
+	"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/openflow_13"
 	"github.com/opencord/voltha-protos/go/voltha"
diff --git a/adaptercore/openolt_eventmgr.go b/adaptercore/openolt_eventmgr.go
index 0d1432c..43c64dc 100644
--- a/adaptercore/openolt_eventmgr.go
+++ b/adaptercore/openolt_eventmgr.go
@@ -19,8 +19,8 @@
 
 import (
 	"fmt"
-	"github.com/opencord/voltha-go/adapters/adapterif"
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/adapters/adapterif"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	oop "github.com/opencord/voltha-protos/go/openolt"
 	"github.com/opencord/voltha-protos/go/voltha"
 )
diff --git a/adaptercore/openolt_flowmgr.go b/adaptercore/openolt_flowmgr.go
index 692def3..ca874d3 100644
--- a/adaptercore/openolt_flowmgr.go
+++ b/adaptercore/openolt_flowmgr.go
@@ -25,9 +25,9 @@
 	"fmt"
 	"math/big"
 
-	"github.com/opencord/voltha-go/common/log"
-	tp "github.com/opencord/voltha-go/common/techprofile"
 	"github.com/opencord/voltha-go/rw_core/utils"
+	"github.com/opencord/voltha-lib-go/pkg/log"
+	tp "github.com/opencord/voltha-lib-go/pkg/techprofile"
 	rsrcMgr "github.com/opencord/voltha-openolt-adapter/adaptercore/resourcemanager"
 	"github.com/opencord/voltha-protos/go/common"
 	ic "github.com/opencord/voltha-protos/go/inter_container"
diff --git a/adaptercore/openolt_flowmgr_test.go b/adaptercore/openolt_flowmgr_test.go
index ee25250..d730ec1 100644
--- a/adaptercore/openolt_flowmgr_test.go
+++ b/adaptercore/openolt_flowmgr_test.go
@@ -22,10 +22,10 @@
 
 	"github.com/opencord/voltha-protos/go/voltha"
 
-	"github.com/opencord/voltha-go/common/log"
-	tp "github.com/opencord/voltha-go/common/techprofile"
-	"github.com/opencord/voltha-go/db/model"
 	fu "github.com/opencord/voltha-go/rw_core/utils"
+	"github.com/opencord/voltha-lib-go/pkg/db/model"
+	"github.com/opencord/voltha-lib-go/pkg/log"
+	tp "github.com/opencord/voltha-lib-go/pkg/techprofile"
 	"github.com/opencord/voltha-openolt-adapter/adaptercore/resourcemanager"
 	rsrcMgr "github.com/opencord/voltha-openolt-adapter/adaptercore/resourcemanager"
 	"github.com/opencord/voltha-openolt-adapter/mocks"
diff --git a/adaptercore/openolt_test.go b/adaptercore/openolt_test.go
index 3ae765a..bac94a3 100644
--- a/adaptercore/openolt_test.go
+++ b/adaptercore/openolt_test.go
@@ -23,9 +23,9 @@
 	"sync"
 	"testing"
 
-	com "github.com/opencord/voltha-go/adapters/common"
-	"github.com/opencord/voltha-go/kafka"
 	fu "github.com/opencord/voltha-go/rw_core/utils"
+	com "github.com/opencord/voltha-lib-go/pkg/adapters/common"
+	"github.com/opencord/voltha-lib-go/pkg/kafka"
 	ic "github.com/opencord/voltha-protos/go/inter_container"
 	"github.com/opencord/voltha-protos/go/openflow_13"
 	ofp "github.com/opencord/voltha-protos/go/openflow_13"
diff --git a/adaptercore/resourcemanager/resourcemanager.go b/adaptercore/resourcemanager/resourcemanager.go
index 5f5d150..57aea46 100755
--- a/adaptercore/resourcemanager/resourcemanager.go
+++ b/adaptercore/resourcemanager/resourcemanager.go
@@ -24,10 +24,10 @@
 	"strconv"
 	"strings"
 
-	"github.com/opencord/voltha-go/common/log"
-	ponrmgr "github.com/opencord/voltha-go/common/ponresourcemanager"
-	"github.com/opencord/voltha-go/db/kvstore"
-	"github.com/opencord/voltha-go/db/model"
+	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
+	"github.com/opencord/voltha-lib-go/pkg/db/model"
+	"github.com/opencord/voltha-lib-go/pkg/log"
+	ponrmgr "github.com/opencord/voltha-lib-go/pkg/ponresourcemanager"
 	ofp "github.com/opencord/voltha-protos/go/openflow_13"
 	"github.com/opencord/voltha-protos/go/openolt"
 )
diff --git a/adaptercore/resourcemanager/resourcemanager_test.go b/adaptercore/resourcemanager/resourcemanager_test.go
index a8c12af..1373a54 100644
--- a/adaptercore/resourcemanager/resourcemanager_test.go
+++ b/adaptercore/resourcemanager/resourcemanager_test.go
@@ -19,10 +19,10 @@
 import (
 	"encoding/json"
 	"errors"
-	"github.com/opencord/voltha-go/common/log"
-	ponrmgr "github.com/opencord/voltha-go/common/ponresourcemanager"
-	"github.com/opencord/voltha-go/db/kvstore"
-	"github.com/opencord/voltha-go/db/model"
+	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
+	"github.com/opencord/voltha-lib-go/pkg/db/model"
+	"github.com/opencord/voltha-lib-go/pkg/log"
+	ponrmgr "github.com/opencord/voltha-lib-go/pkg/ponresourcemanager"
 	ofp "github.com/opencord/voltha-protos/go/openflow_13"
 	"github.com/opencord/voltha-protos/go/openolt"
 	"reflect"
diff --git a/adaptercore/statsmanager.go b/adaptercore/statsmanager.go
index 0e207fb..9235b85 100755
--- a/adaptercore/statsmanager.go
+++ b/adaptercore/statsmanager.go
@@ -21,7 +21,7 @@
 	"errors"
 	"fmt"
 
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"github.com/opencord/voltha-protos/go/openolt"
 	"github.com/opencord/voltha-protos/go/voltha"
 )
diff --git a/adaptercore/statsmanager_test.go b/adaptercore/statsmanager_test.go
index e6ef321..a923226 100644
--- a/adaptercore/statsmanager_test.go
+++ b/adaptercore/statsmanager_test.go
@@ -20,7 +20,7 @@
 import (
 	"testing"
 
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"github.com/opencord/voltha-protos/go/openolt"
 	"github.com/opencord/voltha-protos/go/voltha"
 )
diff --git a/config/config.go b/config/config.go
index 5850a03..ad81762 100644
--- a/config/config.go
+++ b/config/config.go
@@ -20,7 +20,7 @@
 import (
 	"flag"
 	"fmt"
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"os"
 )
 
diff --git a/main.go b/main.go
index e357e2e..760fbe4 100644
--- a/main.go
+++ b/main.go
@@ -27,13 +27,13 @@
 	"syscall"
 	"time"
 
-	"github.com/opencord/voltha-go/adapters/adapterif"
+	"github.com/opencord/voltha-lib-go/pkg/adapters/adapterif"
 
-	"github.com/opencord/voltha-go/adapters"
-	com "github.com/opencord/voltha-go/adapters/common"
-	"github.com/opencord/voltha-go/common/log"
-	"github.com/opencord/voltha-go/db/kvstore"
-	"github.com/opencord/voltha-go/kafka"
+	"github.com/opencord/voltha-lib-go/pkg/adapters"
+	com "github.com/opencord/voltha-lib-go/pkg/adapters/common"
+	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
+	"github.com/opencord/voltha-lib-go/pkg/kafka"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	ac "github.com/opencord/voltha-openolt-adapter/adaptercore"
 	"github.com/opencord/voltha-openolt-adapter/config"
 	"github.com/opencord/voltha-openolt-adapter/config/version"
@@ -331,7 +331,7 @@
 		log.With(log.Fields{"error": err}).Fatal("Cannot setup logging")
 	}
 
-	log.SetPackageLogLevel("github.com/opencord/voltha-go/adapters/common", log.DebugLevel)
+	log.SetPackageLogLevel("github.com/opencord/voltha-lib-go/pkg/adapters/common", log.DebugLevel)
 
 	defer log.CleanUp()
 
diff --git a/main_test.go b/main_test.go
index a8034dd..8e74cc8 100644
--- a/main_test.go
+++ b/main_test.go
@@ -20,8 +20,8 @@
 	"errors"
 	"testing"
 
-	"github.com/opencord/voltha-go/common/log"
-	"github.com/opencord/voltha-go/kafka"
+	"github.com/opencord/voltha-lib-go/pkg/kafka"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"github.com/opencord/voltha-openolt-adapter/config"
 	"github.com/opencord/voltha-openolt-adapter/mocks"
 	ca "github.com/opencord/voltha-protos/go/inter_container"
diff --git a/mocks/mockCoreProxy.go b/mocks/mockCoreProxy.go
index 77b4c08..08bf2ac 100644
--- a/mocks/mockCoreProxy.go
+++ b/mocks/mockCoreProxy.go
@@ -22,7 +22,7 @@
 	"errors"
 	"fmt"
 
-	"github.com/opencord/voltha-go/kafka"
+	"github.com/opencord/voltha-lib-go/pkg/kafka"
 	"github.com/opencord/voltha-protos/go/voltha"
 )
 
diff --git a/mocks/mockKVClient.go b/mocks/mockKVClient.go
index 2417f51..4ec2802 100644
--- a/mocks/mockKVClient.go
+++ b/mocks/mockKVClient.go
@@ -23,10 +23,10 @@
 	"strconv"
 	"strings"
 
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"github.com/opencord/voltha-openolt-adapter/adaptercore/resourcemanager"
 
-	"github.com/opencord/voltha-go/db/kvstore"
+	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
 	ofp "github.com/opencord/voltha-protos/go/openflow_13"
 	openolt "github.com/opencord/voltha-protos/go/openolt"
 )
diff --git a/mocks/mockTechprofile.go b/mocks/mockTechprofile.go
index 138e7ea..a06b51b 100644
--- a/mocks/mockTechprofile.go
+++ b/mocks/mockTechprofile.go
@@ -18,9 +18,9 @@
 package mocks
 
 import (
-	"github.com/opencord/voltha-go/common/log"
-	tp "github.com/opencord/voltha-go/common/techprofile"
-	"github.com/opencord/voltha-go/db/model"
+	"github.com/opencord/voltha-lib-go/pkg/db/model"
+	"github.com/opencord/voltha-lib-go/pkg/log"
+	tp "github.com/opencord/voltha-lib-go/pkg/techprofile"
 	tp_pb "github.com/opencord/voltha-protos/go/tech_profile"
 )
 
diff --git a/vendor/github.com/opencord/voltha-go/rw_core/utils/flow_utils.go b/vendor/github.com/opencord/voltha-go/rw_core/utils/flow_utils.go
index 4293126..7ead52d 100644
--- a/vendor/github.com/opencord/voltha-go/rw_core/utils/flow_utils.go
+++ b/vendor/github.com/opencord/voltha-go/rw_core/utils/flow_utils.go
@@ -21,7 +21,7 @@
 	"fmt"
 	"github.com/cevaris/ordered_map"
 	"github.com/gogo/protobuf/proto"
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	ofp "github.com/opencord/voltha-protos/go/openflow_13"
 	"math/big"
 	"strings"
diff --git a/vendor/github.com/opencord/voltha-go/adapters/README.md b/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/README.md
similarity index 100%
rename from vendor/github.com/opencord/voltha-go/adapters/README.md
rename to vendor/github.com/opencord/voltha-lib-go/pkg/adapters/README.md
diff --git a/vendor/github.com/opencord/voltha-go/adapters/adapterif/adapter_proxy_if.go b/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/adapterif/adapter_proxy_if.go
similarity index 100%
rename from vendor/github.com/opencord/voltha-go/adapters/adapterif/adapter_proxy_if.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/adapters/adapterif/adapter_proxy_if.go
diff --git a/vendor/github.com/opencord/voltha-go/adapters/adapterif/core_proxy_if.go b/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/adapterif/core_proxy_if.go
similarity index 100%
rename from vendor/github.com/opencord/voltha-go/adapters/adapterif/core_proxy_if.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/adapters/adapterif/core_proxy_if.go
diff --git a/vendor/github.com/opencord/voltha-go/adapters/adapterif/events_proxy_if.go b/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/adapterif/events_proxy_if.go
similarity index 100%
rename from vendor/github.com/opencord/voltha-go/adapters/adapterif/events_proxy_if.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/adapters/adapterif/events_proxy_if.go
diff --git a/vendor/github.com/opencord/voltha-go/adapters/common/adapter_proxy.go b/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/adapter_proxy.go
similarity index 96%
rename from vendor/github.com/opencord/voltha-go/adapters/common/adapter_proxy.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/adapter_proxy.go
index 6c32422..fee70c8 100644
--- a/vendor/github.com/opencord/voltha-go/adapters/common/adapter_proxy.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/adapter_proxy.go
@@ -21,8 +21,8 @@
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/any"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-go/common/log"
-	"github.com/opencord/voltha-go/kafka"
+	"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"
 	"time"
 )
diff --git a/vendor/github.com/opencord/voltha-go/adapters/common/core_proxy.go b/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/core_proxy.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-go/adapters/common/core_proxy.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/core_proxy.go
index c9f332c..30117ca 100644
--- a/vendor/github.com/opencord/voltha-go/adapters/common/core_proxy.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/core_proxy.go
@@ -19,8 +19,8 @@
 	"context"
 	"github.com/golang/protobuf/ptypes"
 	a "github.com/golang/protobuf/ptypes/any"
-	"github.com/opencord/voltha-go/common/log"
-	"github.com/opencord/voltha-go/kafka"
+	"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"
 	"google.golang.org/grpc/codes"
diff --git a/vendor/github.com/opencord/voltha-go/adapters/common/events_proxy.go b/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/events_proxy.go
similarity index 95%
rename from vendor/github.com/opencord/voltha-go/adapters/common/events_proxy.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/events_proxy.go
index 34fcde7..25b1be4 100644
--- a/vendor/github.com/opencord/voltha-go/adapters/common/events_proxy.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/events_proxy.go
@@ -23,9 +23,9 @@
 	"strings"
 	"time"
 
-	"github.com/opencord/voltha-go/adapters/adapterif"
-	"github.com/opencord/voltha-go/common/log"
-	"github.com/opencord/voltha-go/kafka"
+	"github.com/opencord/voltha-lib-go/pkg/adapters/adapterif"
+	"github.com/opencord/voltha-lib-go/pkg/kafka"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"github.com/opencord/voltha-protos/go/voltha"
 )
 
diff --git a/vendor/github.com/opencord/voltha-go/adapters/common/performance_metrics.go b/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/performance_metrics.go
similarity index 100%
rename from vendor/github.com/opencord/voltha-go/adapters/common/performance_metrics.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/performance_metrics.go
diff --git a/vendor/github.com/opencord/voltha-go/adapters/common/request_handler.go b/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/request_handler.go
similarity index 98%
rename from vendor/github.com/opencord/voltha-go/adapters/common/request_handler.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/request_handler.go
index 55e04d7..27f9846 100644
--- a/vendor/github.com/opencord/voltha-go/adapters/common/request_handler.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/request_handler.go
@@ -19,10 +19,10 @@
 	"errors"
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/opencord/voltha-go/adapters"
-	"github.com/opencord/voltha-go/adapters/adapterif"
-	"github.com/opencord/voltha-go/common/log"
-	"github.com/opencord/voltha-go/kafka"
+	"github.com/opencord/voltha-lib-go/pkg/adapters"
+	"github.com/opencord/voltha-lib-go/pkg/adapters/adapterif"
+	"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/openflow_13"
 	"github.com/opencord/voltha-protos/go/voltha"
diff --git a/vendor/github.com/opencord/voltha-go/adapters/common/utils.go b/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/utils.go
similarity index 100%
rename from vendor/github.com/opencord/voltha-go/adapters/common/utils.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/adapters/common/utils.go
diff --git a/vendor/github.com/opencord/voltha-go/adapters/iAdapter.go b/vendor/github.com/opencord/voltha-lib-go/pkg/adapters/iAdapter.go
similarity index 100%
rename from vendor/github.com/opencord/voltha-go/adapters/iAdapter.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/adapters/iAdapter.go
diff --git a/vendor/github.com/opencord/voltha-go/db/kvstore/client.go b/vendor/github.com/opencord/voltha-lib-go/pkg/db/kvstore/client.go
similarity index 98%
rename from vendor/github.com/opencord/voltha-go/db/kvstore/client.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/db/kvstore/client.go
index 67c9219..f40d10e 100644
--- a/vendor/github.com/opencord/voltha-go/db/kvstore/client.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/db/kvstore/client.go
@@ -16,7 +16,7 @@
 package kvstore
 
 import (
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 )
 
 const (
diff --git a/vendor/github.com/opencord/voltha-go/db/kvstore/consulclient.go b/vendor/github.com/opencord/voltha-lib-go/pkg/db/kvstore/consulclient.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-go/db/kvstore/consulclient.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/db/kvstore/consulclient.go
index c4fa0af..c3e3999 100644
--- a/vendor/github.com/opencord/voltha-go/db/kvstore/consulclient.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/db/kvstore/consulclient.go
@@ -19,7 +19,7 @@
 	"bytes"
 	"context"
 	"errors"
-	log "github.com/opencord/voltha-go/common/log"
+	log "github.com/opencord/voltha-lib-go/pkg/log"
 	"sync"
 	"time"
 	//log "ciena.com/coordinator/common"
diff --git a/vendor/github.com/opencord/voltha-go/db/kvstore/etcdclient.go b/vendor/github.com/opencord/voltha-lib-go/pkg/db/kvstore/etcdclient.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-go/db/kvstore/etcdclient.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/db/kvstore/etcdclient.go
index 3af1ef2..beac4e0 100644
--- a/vendor/github.com/opencord/voltha-go/db/kvstore/etcdclient.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/db/kvstore/etcdclient.go
@@ -19,7 +19,7 @@
 	"context"
 	"errors"
 	"fmt"
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	v3Client "go.etcd.io/etcd/clientv3"
 	v3Concurrency "go.etcd.io/etcd/clientv3/concurrency"
 	v3rpcTypes "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
diff --git a/vendor/github.com/opencord/voltha-go/db/kvstore/kvutils.go b/vendor/github.com/opencord/voltha-lib-go/pkg/db/kvstore/kvutils.go
similarity index 100%
rename from vendor/github.com/opencord/voltha-go/db/kvstore/kvutils.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/db/kvstore/kvutils.go
diff --git a/vendor/github.com/opencord/voltha-go/db/model/backend.go b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/backend.go
similarity index 97%
rename from vendor/github.com/opencord/voltha-go/db/model/backend.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/db/model/backend.go
index 981a1d5..fb2c813 100644
--- a/vendor/github.com/opencord/voltha-go/db/model/backend.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/backend.go
@@ -19,8 +19,8 @@
 import (
 	"errors"
 	"fmt"
-	"github.com/opencord/voltha-go/common/log"
-	"github.com/opencord/voltha-go/db/kvstore"
+	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"strconv"
 	"sync"
 	"time"
diff --git a/vendor/github.com/opencord/voltha-go/db/model/branch.go b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/branch.go
similarity index 98%
rename from vendor/github.com/opencord/voltha-go/db/model/branch.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/db/model/branch.go
index 3389291..2075b7e 100644
--- a/vendor/github.com/opencord/voltha-go/db/model/branch.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/branch.go
@@ -17,7 +17,7 @@
 package model
 
 import (
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"sync"
 )
 
diff --git a/vendor/github.com/opencord/voltha-go/db/model/callback_type.go b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/callback_type.go
similarity index 100%
rename from vendor/github.com/opencord/voltha-go/db/model/callback_type.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/db/model/callback_type.go
diff --git a/vendor/github.com/opencord/voltha-go/db/model/child_type.go b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/child_type.go
similarity index 98%
rename from vendor/github.com/opencord/voltha-go/db/model/child_type.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/db/model/child_type.go
index 250de9c..fae9844 100644
--- a/vendor/github.com/opencord/voltha-go/db/model/child_type.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/child_type.go
@@ -20,7 +20,7 @@
 	desc "github.com/golang/protobuf/descriptor"
 	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/protoc-gen-go/descriptor"
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"github.com/opencord/voltha-protos/go/common"
 	"reflect"
 	"strconv"
diff --git a/vendor/github.com/opencord/voltha-go/db/model/data_revision.go b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/data_revision.go
similarity index 97%
rename from vendor/github.com/opencord/voltha-go/db/model/data_revision.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/db/model/data_revision.go
index 0763d09..b930ae1 100644
--- a/vendor/github.com/opencord/voltha-go/db/model/data_revision.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/data_revision.go
@@ -22,7 +22,7 @@
 	"encoding/json"
 	"fmt"
 	"github.com/golang/protobuf/proto"
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"reflect"
 )
 
diff --git a/vendor/github.com/opencord/voltha-go/db/model/event_bus.go b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/event_bus.go
similarity index 97%
rename from vendor/github.com/opencord/voltha-go/db/model/event_bus.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/db/model/event_bus.go
index 335d43f..3af2556 100644
--- a/vendor/github.com/opencord/voltha-go/db/model/event_bus.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/event_bus.go
@@ -19,7 +19,7 @@
 import (
 	"encoding/json"
 	"github.com/golang/protobuf/proto"
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"github.com/opencord/voltha-protos/go/voltha"
 )
 
diff --git a/vendor/github.com/opencord/voltha-go/db/model/event_bus_client.go b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/event_bus_client.go
similarity index 95%
rename from vendor/github.com/opencord/voltha-go/db/model/event_bus_client.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/db/model/event_bus_client.go
index c9c1314..fdc02f9 100644
--- a/vendor/github.com/opencord/voltha-go/db/model/event_bus_client.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/event_bus_client.go
@@ -17,7 +17,7 @@
 package model
 
 import (
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"github.com/opencord/voltha-protos/go/voltha"
 )
 
diff --git a/vendor/github.com/opencord/voltha-go/db/model/merge.go b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/merge.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-go/db/model/merge.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/db/model/merge.go
index c59dda4..752d025 100644
--- a/vendor/github.com/opencord/voltha-go/db/model/merge.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/merge.go
@@ -17,7 +17,7 @@
 package model
 
 import (
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 )
 
 func revisionsAreEqual(a, b []Revision) bool {
diff --git a/vendor/github.com/opencord/voltha-go/db/model/model.go b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/model.go
similarity index 95%
rename from vendor/github.com/opencord/voltha-go/db/model/model.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/db/model/model.go
index 3446303..8087919 100644
--- a/vendor/github.com/opencord/voltha-go/db/model/model.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/model.go
@@ -16,7 +16,7 @@
 package model
 
 import (
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 )
 
 func init() {
diff --git a/vendor/github.com/opencord/voltha-go/db/model/node.go b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/node.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-go/db/model/node.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/db/model/node.go
index c9815fa..7fd0250 100644
--- a/vendor/github.com/opencord/voltha-go/db/model/node.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/node.go
@@ -23,7 +23,7 @@
 	"context"
 	"fmt"
 	"github.com/golang/protobuf/proto"
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"reflect"
 	"strings"
 	"sync"
diff --git a/vendor/github.com/opencord/voltha-go/db/model/non_persisted_revision.go b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/non_persisted_revision.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-go/db/model/non_persisted_revision.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/db/model/non_persisted_revision.go
index 6900c5d..88320cb 100644
--- a/vendor/github.com/opencord/voltha-go/db/model/non_persisted_revision.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/non_persisted_revision.go
@@ -21,8 +21,8 @@
 	"crypto/md5"
 	"fmt"
 	"github.com/golang/protobuf/proto"
-	"github.com/opencord/voltha-go/common/log"
-	"github.com/opencord/voltha-go/db/kvstore"
+	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"reflect"
 	"sort"
 	"sync"
diff --git a/vendor/github.com/opencord/voltha-go/db/model/persisted_revision.go b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/persisted_revision.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-go/db/model/persisted_revision.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/db/model/persisted_revision.go
index d2d228f..c644e14 100644
--- a/vendor/github.com/opencord/voltha-go/db/model/persisted_revision.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/persisted_revision.go
@@ -22,8 +22,8 @@
 	"context"
 	"github.com/golang/protobuf/proto"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-go/common/log"
-	"github.com/opencord/voltha-go/db/kvstore"
+	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"reflect"
 	"strings"
 	"sync"
diff --git a/vendor/github.com/opencord/voltha-go/db/model/profiling.go b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/profiling.go
similarity index 98%
rename from vendor/github.com/opencord/voltha-go/db/model/profiling.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/db/model/profiling.go
index 874b035..c50c9f6 100644
--- a/vendor/github.com/opencord/voltha-go/db/model/profiling.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/profiling.go
@@ -17,7 +17,7 @@
 package model
 
 import (
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"sync"
 )
 
diff --git a/vendor/github.com/opencord/voltha-go/db/model/proxy.go b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/proxy.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-go/db/model/proxy.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/db/model/proxy.go
index 5c4d772..2d2c24e 100644
--- a/vendor/github.com/opencord/voltha-go/db/model/proxy.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/proxy.go
@@ -22,7 +22,7 @@
 	"errors"
 	"fmt"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"reflect"
 	"runtime"
 	"strings"
diff --git a/vendor/github.com/opencord/voltha-go/db/model/revision.go b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/revision.go
similarity index 96%
rename from vendor/github.com/opencord/voltha-go/db/model/revision.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/db/model/revision.go
index 6f52248..bb61355 100644
--- a/vendor/github.com/opencord/voltha-go/db/model/revision.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/revision.go
@@ -17,7 +17,7 @@
 
 import (
 	"context"
-	"github.com/opencord/voltha-go/db/kvstore"
+	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
 	"time"
 )
 
diff --git a/vendor/github.com/opencord/voltha-go/db/model/root.go b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/root.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-go/db/model/root.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/db/model/root.go
index 8331e11..20c3721 100644
--- a/vendor/github.com/opencord/voltha-go/db/model/root.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/root.go
@@ -22,7 +22,7 @@
 	"encoding/json"
 	"github.com/golang/protobuf/proto"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"reflect"
 	"sync"
 )
diff --git a/vendor/github.com/opencord/voltha-go/db/model/transaction.go b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/transaction.go
similarity index 97%
rename from vendor/github.com/opencord/voltha-go/db/model/transaction.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/db/model/transaction.go
index 7529ff2..5bef77e 100644
--- a/vendor/github.com/opencord/voltha-go/db/model/transaction.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/transaction.go
@@ -17,7 +17,7 @@
 
 import (
 	"context"
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 )
 
 type Transaction struct {
diff --git a/vendor/github.com/opencord/voltha-go/db/model/utils.go b/vendor/github.com/opencord/voltha-lib-go/pkg/db/model/utils.go
similarity index 100%
rename from vendor/github.com/opencord/voltha-go/db/model/utils.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/db/model/utils.go
diff --git a/vendor/github.com/opencord/voltha-go/kafka/client.go b/vendor/github.com/opencord/voltha-lib-go/pkg/kafka/client.go
similarity index 100%
rename from vendor/github.com/opencord/voltha-go/kafka/client.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/kafka/client.go
diff --git a/vendor/github.com/opencord/voltha-go/kafka/kafka_inter_container_library.go b/vendor/github.com/opencord/voltha-lib-go/pkg/kafka/kafka_inter_container_library.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-go/kafka/kafka_inter_container_library.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/kafka/kafka_inter_container_library.go
index f9b3319..d2e0702 100644
--- a/vendor/github.com/opencord/voltha-go/kafka/kafka_inter_container_library.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/kafka/kafka_inter_container_library.go
@@ -23,7 +23,7 @@
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/any"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	ic "github.com/opencord/voltha-protos/go/inter_container"
 	"reflect"
 	"strings"
diff --git a/vendor/github.com/opencord/voltha-go/kafka/sarama_client.go b/vendor/github.com/opencord/voltha-lib-go/pkg/kafka/sarama_client.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-go/kafka/sarama_client.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/kafka/sarama_client.go
index 9e3ce0c..cec18ec 100755
--- a/vendor/github.com/opencord/voltha-go/kafka/sarama_client.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/kafka/sarama_client.go
@@ -22,7 +22,7 @@
 	scc "github.com/bsm/sarama-cluster"
 	"github.com/golang/protobuf/proto"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-go/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	ic "github.com/opencord/voltha-protos/go/inter_container"
 	"strings"
 	"sync"
diff --git a/vendor/github.com/opencord/voltha-go/kafka/utils.go b/vendor/github.com/opencord/voltha-lib-go/pkg/kafka/utils.go
similarity index 100%
rename from vendor/github.com/opencord/voltha-go/kafka/utils.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/kafka/utils.go
diff --git a/vendor/github.com/opencord/voltha-go/common/log/log.go b/vendor/github.com/opencord/voltha-lib-go/pkg/log/log.go
similarity index 100%
rename from vendor/github.com/opencord/voltha-go/common/log/log.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/log/log.go
diff --git a/vendor/github.com/opencord/voltha-go/common/ponresourcemanager/ponresourcemanager.go b/vendor/github.com/opencord/voltha-lib-go/pkg/ponresourcemanager/ponresourcemanager.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-go/common/ponresourcemanager/ponresourcemanager.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/ponresourcemanager/ponresourcemanager.go
index 1544b8d..12e6a3c 100755
--- a/vendor/github.com/opencord/voltha-go/common/ponresourcemanager/ponresourcemanager.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/ponresourcemanager/ponresourcemanager.go
@@ -24,10 +24,10 @@
 	"strconv"
 
 	bitmap "github.com/boljen/go-bitmap"
-	"github.com/opencord/voltha-go/common/log"
-	tp "github.com/opencord/voltha-go/common/techprofile"
-	"github.com/opencord/voltha-go/db/kvstore"
-	"github.com/opencord/voltha-go/db/model"
+	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
+	"github.com/opencord/voltha-lib-go/pkg/db/model"
+	"github.com/opencord/voltha-lib-go/pkg/log"
+	tp "github.com/opencord/voltha-lib-go/pkg/techprofile"
 )
 
 const (
diff --git a/vendor/github.com/opencord/voltha-go/common/techprofile/4QueueHybridProfileMap1.json b/vendor/github.com/opencord/voltha-lib-go/pkg/techprofile/4QueueHybridProfileMap1.json
similarity index 100%
rename from vendor/github.com/opencord/voltha-go/common/techprofile/4QueueHybridProfileMap1.json
rename to vendor/github.com/opencord/voltha-lib-go/pkg/techprofile/4QueueHybridProfileMap1.json
diff --git a/vendor/github.com/opencord/voltha-go/common/techprofile/README.md b/vendor/github.com/opencord/voltha-lib-go/pkg/techprofile/README.md
similarity index 100%
rename from vendor/github.com/opencord/voltha-go/common/techprofile/README.md
rename to vendor/github.com/opencord/voltha-lib-go/pkg/techprofile/README.md
diff --git a/vendor/github.com/opencord/voltha-go/common/techprofile/config.go b/vendor/github.com/opencord/voltha-lib-go/pkg/techprofile/config.go
similarity index 98%
rename from vendor/github.com/opencord/voltha-go/common/techprofile/config.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/techprofile/config.go
index 9d521ed..f9655a8 100644
--- a/vendor/github.com/opencord/voltha-go/common/techprofile/config.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/techprofile/config.go
@@ -16,7 +16,7 @@
 package techprofile
 
 import (
-	"github.com/opencord/voltha-go/db/model"
+	"github.com/opencord/voltha-lib-go/pkg/db/model"
 )
 
 // tech profile default constants
diff --git a/vendor/github.com/opencord/voltha-go/common/techprofile/tech_profile.go b/vendor/github.com/opencord/voltha-lib-go/pkg/techprofile/tech_profile.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-go/common/techprofile/tech_profile.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/techprofile/tech_profile.go
index 9c34880..c8f2aa3 100644
--- a/vendor/github.com/opencord/voltha-go/common/techprofile/tech_profile.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/techprofile/tech_profile.go
@@ -22,9 +22,9 @@
 	"fmt"
 	"strconv"
 
-	"github.com/opencord/voltha-go/common/log"
-	"github.com/opencord/voltha-go/db/kvstore"
-	"github.com/opencord/voltha-go/db/model"
+	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
+	"github.com/opencord/voltha-lib-go/pkg/db/model"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	tp_pb "github.com/opencord/voltha-protos/go/tech_profile"
 )
 
diff --git a/vendor/github.com/opencord/voltha-go/common/techprofile/tech_profile_if.go b/vendor/github.com/opencord/voltha-lib-go/pkg/techprofile/tech_profile_if.go
similarity index 96%
rename from vendor/github.com/opencord/voltha-go/common/techprofile/tech_profile_if.go
rename to vendor/github.com/opencord/voltha-lib-go/pkg/techprofile/tech_profile_if.go
index 1ed38db..de2fca4 100644
--- a/vendor/github.com/opencord/voltha-go/common/techprofile/tech_profile_if.go
+++ b/vendor/github.com/opencord/voltha-lib-go/pkg/techprofile/tech_profile_if.go
@@ -17,7 +17,7 @@
 package techprofile
 
 import (
-	"github.com/opencord/voltha-go/db/model"
+	"github.com/opencord/voltha-lib-go/pkg/db/model"
 	tp_pb "github.com/opencord/voltha-protos/go/tech_profile"
 )