diff --git a/VERSION b/VERSION
index c043eea..b1b25a5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.1
+2.2.2
diff --git a/pkg/adapters/common/adapter_proxy.go b/pkg/adapters/common/adapter_proxy.go
index fdf94c8..fee70c8 100644
--- a/pkg/adapters/common/adapter_proxy.go
+++ b/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-lib-go/pkg/common/log"
 	"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/pkg/adapters/common/core_proxy.go b/pkg/adapters/common/core_proxy.go
index a9ad039..30117ca 100644
--- a/pkg/adapters/common/core_proxy.go
+++ b/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-lib-go/pkg/common/log"
 	"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/pkg/adapters/common/events_proxy.go b/pkg/adapters/common/events_proxy.go
index 59e7a00..25b1be4 100644
--- a/pkg/adapters/common/events_proxy.go
+++ b/pkg/adapters/common/events_proxy.go
@@ -24,8 +24,8 @@
 	"time"
 
 	"github.com/opencord/voltha-lib-go/pkg/adapters/adapterif"
-	"github.com/opencord/voltha-lib-go/pkg/common/log"
 	"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/pkg/adapters/common/request_handler.go b/pkg/adapters/common/request_handler.go
index 2cd9c00..27f9846 100644
--- a/pkg/adapters/common/request_handler.go
+++ b/pkg/adapters/common/request_handler.go
@@ -21,8 +21,8 @@
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/opencord/voltha-lib-go/pkg/adapters"
 	"github.com/opencord/voltha-lib-go/pkg/adapters/adapterif"
-	"github.com/opencord/voltha-lib-go/pkg/common/log"
 	"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/pkg/db/kvstore/client.go b/pkg/db/kvstore/client.go
index 4f40731..f40d10e 100644
--- a/pkg/db/kvstore/client.go
+++ b/pkg/db/kvstore/client.go
@@ -16,7 +16,7 @@
 package kvstore
 
 import (
-	"github.com/opencord/voltha-lib-go/pkg/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 )
 
 const (
diff --git a/pkg/db/kvstore/consulclient.go b/pkg/db/kvstore/consulclient.go
index 96c1989..c3e3999 100644
--- a/pkg/db/kvstore/consulclient.go
+++ b/pkg/db/kvstore/consulclient.go
@@ -19,7 +19,7 @@
 	"bytes"
 	"context"
 	"errors"
-	log "github.com/opencord/voltha-lib-go/pkg/common/log"
+	log "github.com/opencord/voltha-lib-go/pkg/log"
 	"sync"
 	"time"
 	//log "ciena.com/coordinator/common"
diff --git a/pkg/db/kvstore/etcdclient.go b/pkg/db/kvstore/etcdclient.go
index a04dadc..beac4e0 100644
--- a/pkg/db/kvstore/etcdclient.go
+++ b/pkg/db/kvstore/etcdclient.go
@@ -19,7 +19,7 @@
 	"context"
 	"errors"
 	"fmt"
-	"github.com/opencord/voltha-lib-go/pkg/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/pkg/db/model/backend.go b/pkg/db/model/backend.go
index de731ad..fb2c813 100644
--- a/pkg/db/model/backend.go
+++ b/pkg/db/model/backend.go
@@ -19,8 +19,8 @@
 import (
 	"errors"
 	"fmt"
-	"github.com/opencord/voltha-lib-go/pkg/common/log"
 	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"strconv"
 	"sync"
 	"time"
diff --git a/pkg/db/model/base_test.go b/pkg/db/model/base_test.go
index 06110b1..d4c7d3a 100644
--- a/pkg/db/model/base_test.go
+++ b/pkg/db/model/base_test.go
@@ -16,7 +16,7 @@
 package model
 
 import (
-	"github.com/opencord/voltha-lib-go/pkg/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"github.com/opencord/voltha-protos/go/voltha"
 	"runtime/debug"
 	"sync"
diff --git a/pkg/db/model/branch.go b/pkg/db/model/branch.go
index a242ab8..2075b7e 100644
--- a/pkg/db/model/branch.go
+++ b/pkg/db/model/branch.go
@@ -17,7 +17,7 @@
 package model
 
 import (
-	"github.com/opencord/voltha-lib-go/pkg/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"sync"
 )
 
diff --git a/pkg/db/model/child_type.go b/pkg/db/model/child_type.go
index baf01a2..fae9844 100644
--- a/pkg/db/model/child_type.go
+++ b/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-lib-go/pkg/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"github.com/opencord/voltha-protos/go/common"
 	"reflect"
 	"strconv"
diff --git a/pkg/db/model/data_revision.go b/pkg/db/model/data_revision.go
index d349ec2..b930ae1 100644
--- a/pkg/db/model/data_revision.go
+++ b/pkg/db/model/data_revision.go
@@ -22,7 +22,7 @@
 	"encoding/json"
 	"fmt"
 	"github.com/golang/protobuf/proto"
-	"github.com/opencord/voltha-lib-go/pkg/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"reflect"
 )
 
diff --git a/pkg/db/model/event_bus.go b/pkg/db/model/event_bus.go
index 079e3b2..3af2556 100644
--- a/pkg/db/model/event_bus.go
+++ b/pkg/db/model/event_bus.go
@@ -19,7 +19,7 @@
 import (
 	"encoding/json"
 	"github.com/golang/protobuf/proto"
-	"github.com/opencord/voltha-lib-go/pkg/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"github.com/opencord/voltha-protos/go/voltha"
 )
 
diff --git a/pkg/db/model/event_bus_client.go b/pkg/db/model/event_bus_client.go
index e3729e8..fdc02f9 100644
--- a/pkg/db/model/event_bus_client.go
+++ b/pkg/db/model/event_bus_client.go
@@ -17,7 +17,7 @@
 package model
 
 import (
-	"github.com/opencord/voltha-lib-go/pkg/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"github.com/opencord/voltha-protos/go/voltha"
 )
 
diff --git a/pkg/db/model/merge.go b/pkg/db/model/merge.go
index b2a0e33..752d025 100644
--- a/pkg/db/model/merge.go
+++ b/pkg/db/model/merge.go
@@ -17,7 +17,7 @@
 package model
 
 import (
-	"github.com/opencord/voltha-lib-go/pkg/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 )
 
 func revisionsAreEqual(a, b []Revision) bool {
diff --git a/pkg/db/model/model.go b/pkg/db/model/model.go
index 5236ec2..8087919 100644
--- a/pkg/db/model/model.go
+++ b/pkg/db/model/model.go
@@ -16,7 +16,7 @@
 package model
 
 import (
-	"github.com/opencord/voltha-lib-go/pkg/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 )
 
 func init() {
diff --git a/pkg/db/model/node.go b/pkg/db/model/node.go
index 4d8c467..7fd0250 100644
--- a/pkg/db/model/node.go
+++ b/pkg/db/model/node.go
@@ -23,7 +23,7 @@
 	"context"
 	"fmt"
 	"github.com/golang/protobuf/proto"
-	"github.com/opencord/voltha-lib-go/pkg/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"reflect"
 	"strings"
 	"sync"
diff --git a/pkg/db/model/non_persisted_revision.go b/pkg/db/model/non_persisted_revision.go
index db78b4c..88320cb 100644
--- a/pkg/db/model/non_persisted_revision.go
+++ b/pkg/db/model/non_persisted_revision.go
@@ -21,8 +21,8 @@
 	"crypto/md5"
 	"fmt"
 	"github.com/golang/protobuf/proto"
-	"github.com/opencord/voltha-lib-go/pkg/common/log"
 	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"reflect"
 	"sort"
 	"sync"
diff --git a/pkg/db/model/persisted_revision.go b/pkg/db/model/persisted_revision.go
index fa1a97e..c644e14 100644
--- a/pkg/db/model/persisted_revision.go
+++ b/pkg/db/model/persisted_revision.go
@@ -22,8 +22,8 @@
 	"context"
 	"github.com/golang/protobuf/proto"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-lib-go/pkg/common/log"
 	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"reflect"
 	"strings"
 	"sync"
diff --git a/pkg/db/model/profiling.go b/pkg/db/model/profiling.go
index cb5814b..c50c9f6 100644
--- a/pkg/db/model/profiling.go
+++ b/pkg/db/model/profiling.go
@@ -17,7 +17,7 @@
 package model
 
 import (
-	"github.com/opencord/voltha-lib-go/pkg/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"sync"
 )
 
diff --git a/pkg/db/model/proxy.go b/pkg/db/model/proxy.go
index a68b585..2d2c24e 100644
--- a/pkg/db/model/proxy.go
+++ b/pkg/db/model/proxy.go
@@ -22,7 +22,7 @@
 	"errors"
 	"fmt"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-lib-go/pkg/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"reflect"
 	"runtime"
 	"strings"
diff --git a/pkg/db/model/proxy_load_test.go b/pkg/db/model/proxy_load_test.go
index 6c4839d..056d3c1 100644
--- a/pkg/db/model/proxy_load_test.go
+++ b/pkg/db/model/proxy_load_test.go
@@ -19,7 +19,7 @@
 	"context"
 	"encoding/hex"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-lib-go/pkg/common/log"
+	"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/pkg/db/model/root.go b/pkg/db/model/root.go
index 7485937..20c3721 100644
--- a/pkg/db/model/root.go
+++ b/pkg/db/model/root.go
@@ -22,7 +22,7 @@
 	"encoding/json"
 	"github.com/golang/protobuf/proto"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-lib-go/pkg/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"reflect"
 	"sync"
 )
diff --git a/pkg/db/model/transaction.go b/pkg/db/model/transaction.go
index e71a5a0..5bef77e 100644
--- a/pkg/db/model/transaction.go
+++ b/pkg/db/model/transaction.go
@@ -17,7 +17,7 @@
 
 import (
 	"context"
-	"github.com/opencord/voltha-lib-go/pkg/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 )
 
 type Transaction struct {
diff --git a/pkg/common/grpc/security.go b/pkg/grpc/security.go
similarity index 100%
rename from pkg/common/grpc/security.go
rename to pkg/grpc/security.go
diff --git a/pkg/common/grpc/server.go b/pkg/grpc/server.go
similarity index 97%
rename from pkg/common/grpc/server.go
rename to pkg/grpc/server.go
index 65a0e95..d2438e0 100644
--- a/pkg/common/grpc/server.go
+++ b/pkg/grpc/server.go
@@ -18,7 +18,7 @@
 import (
 	"context"
 	"fmt"
-	"github.com/opencord/voltha-lib-go/pkg/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"net"
diff --git a/pkg/kafka/kafka_inter_container_library.go b/pkg/kafka/kafka_inter_container_library.go
index fa3f9eb..d2e0702 100644
--- a/pkg/kafka/kafka_inter_container_library.go
+++ b/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-lib-go/pkg/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	ic "github.com/opencord/voltha-protos/go/inter_container"
 	"reflect"
 	"strings"
diff --git a/pkg/kafka/sarama_client.go b/pkg/kafka/sarama_client.go
index 08f9bca..cec18ec 100755
--- a/pkg/kafka/sarama_client.go
+++ b/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-lib-go/pkg/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	ic "github.com/opencord/voltha-protos/go/inter_container"
 	"strings"
 	"sync"
diff --git a/pkg/common/log/log.go b/pkg/log/log.go
similarity index 100%
rename from pkg/common/log/log.go
rename to pkg/log/log.go
diff --git a/pkg/common/log/log_test.go b/pkg/log/log_test.go
similarity index 100%
rename from pkg/common/log/log_test.go
rename to pkg/log/log_test.go
diff --git a/pkg/common/ponresourcemanager/ponresourcemanager.go b/pkg/ponresourcemanager/ponresourcemanager.go
similarity index 99%
rename from pkg/common/ponresourcemanager/ponresourcemanager.go
rename to pkg/ponresourcemanager/ponresourcemanager.go
index 69156ae..12e6a3c 100755
--- a/pkg/common/ponresourcemanager/ponresourcemanager.go
+++ b/pkg/ponresourcemanager/ponresourcemanager.go
@@ -24,10 +24,10 @@
 	"strconv"
 
 	bitmap "github.com/boljen/go-bitmap"
-	"github.com/opencord/voltha-lib-go/pkg/common/log"
-	tp "github.com/opencord/voltha-lib-go/pkg/common/techprofile"
 	"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/pkg/common/probe/probe.go b/pkg/probe/probe.go
similarity index 98%
rename from pkg/common/probe/probe.go
rename to pkg/probe/probe.go
index 910e0c6..192c7ca 100644
--- a/pkg/common/probe/probe.go
+++ b/pkg/probe/probe.go
@@ -18,7 +18,7 @@
 import (
 	"context"
 	"fmt"
-	"github.com/opencord/voltha-lib-go/pkg/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"net/http"
 	"sync"
 )
diff --git a/pkg/common/probe/probe_test.go b/pkg/probe/probe_test.go
similarity index 99%
rename from pkg/common/probe/probe_test.go
rename to pkg/probe/probe_test.go
index 1322d47..79bfc77 100644
--- a/pkg/common/probe/probe_test.go
+++ b/pkg/probe/probe_test.go
@@ -18,7 +18,7 @@
 import (
 	"context"
 	"encoding/json"
-	"github.com/opencord/voltha-lib-go/pkg/common/log"
+	"github.com/opencord/voltha-lib-go/pkg/log"
 	"github.com/stretchr/testify/assert"
 	"io/ioutil"
 	"net/http"
diff --git a/pkg/common/techprofile/4QueueHybridProfileMap1.json b/pkg/techprofile/4QueueHybridProfileMap1.json
similarity index 100%
rename from pkg/common/techprofile/4QueueHybridProfileMap1.json
rename to pkg/techprofile/4QueueHybridProfileMap1.json
diff --git a/pkg/common/techprofile/README.md b/pkg/techprofile/README.md
similarity index 100%
rename from pkg/common/techprofile/README.md
rename to pkg/techprofile/README.md
diff --git a/pkg/common/techprofile/config.go b/pkg/techprofile/config.go
similarity index 100%
rename from pkg/common/techprofile/config.go
rename to pkg/techprofile/config.go
diff --git a/pkg/common/techprofile/tech_profile.go b/pkg/techprofile/tech_profile.go
similarity index 99%
rename from pkg/common/techprofile/tech_profile.go
rename to pkg/techprofile/tech_profile.go
index 582fecc..c8f2aa3 100644
--- a/pkg/common/techprofile/tech_profile.go
+++ b/pkg/techprofile/tech_profile.go
@@ -22,9 +22,9 @@
 	"fmt"
 	"strconv"
 
-	"github.com/opencord/voltha-lib-go/pkg/common/log"
 	"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/pkg/common/techprofile/tech_profile_if.go b/pkg/techprofile/tech_profile_if.go
similarity index 100%
rename from pkg/common/techprofile/tech_profile_if.go
rename to pkg/techprofile/tech_profile_if.go
diff --git a/pkg/common/version/version.go b/pkg/version/version.go
similarity index 100%
rename from pkg/common/version/version.go
rename to pkg/version/version.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
index a26d1e4..51eb113 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -62,8 +62,8 @@
 github.com/opencord/voltha-protos/go/inter_container
 github.com/opencord/voltha-protos/go/openflow_13
 github.com/opencord/voltha-protos/go/voltha
-github.com/opencord/voltha-protos/go/tech_profile
 github.com/opencord/voltha-protos/go/common
+github.com/opencord/voltha-protos/go/tech_profile
 github.com/opencord/voltha-protos/go/omci
 # github.com/pierrec/lz4 v2.3.0+incompatible
 github.com/pierrec/lz4
@@ -111,10 +111,10 @@
 # golang.org/x/net v0.0.0-20190930134127-c5a3c61f89f3
 golang.org/x/net/trace
 golang.org/x/net/proxy
+golang.org/x/net/context
 golang.org/x/net/internal/timeseries
 golang.org/x/net/http2
 golang.org/x/net/http2/hpack
-golang.org/x/net/context
 golang.org/x/net/internal/socks
 golang.org/x/net/http/httpguts
 golang.org/x/net/idna
@@ -134,12 +134,14 @@
 google.golang.org/grpc
 google.golang.org/grpc/credentials
 google.golang.org/grpc/internal
+google.golang.org/grpc/grpclog
+google.golang.org/grpc/keepalive
+google.golang.org/grpc/metadata
 google.golang.org/grpc/balancer
 google.golang.org/grpc/balancer/roundrobin
 google.golang.org/grpc/connectivity
 google.golang.org/grpc/encoding
 google.golang.org/grpc/encoding/proto
-google.golang.org/grpc/grpclog
 google.golang.org/grpc/internal/backoff
 google.golang.org/grpc/internal/balancerload
 google.golang.org/grpc/internal/binarylog
@@ -148,8 +150,6 @@
 google.golang.org/grpc/internal/grpcrand
 google.golang.org/grpc/internal/grpcsync
 google.golang.org/grpc/internal/transport
-google.golang.org/grpc/keepalive
-google.golang.org/grpc/metadata
 google.golang.org/grpc/naming
 google.golang.org/grpc/peer
 google.golang.org/grpc/resolver