diff --git a/VERSION b/VERSION
index 3e3c2f1..eca07e4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.1
+2.1.2
diff --git a/alarms.go b/alarms.go
index 5a5e64d..2bf61b5 100644
--- a/alarms.go
+++ b/alarms.go
@@ -22,7 +22,7 @@
 	"errors"
 	"fmt"
 	"github.com/google/gopacket"
-	me "github.com/opencord/omci-lib-go/generated"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 type GetAllAlarmsRequest struct {
diff --git a/alarms_test.go b/alarms_test.go
index c1f4e45..eefb7a6 100644
--- a/alarms_test.go
+++ b/alarms_test.go
@@ -19,8 +19,8 @@
 
 import (
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 	"github.com/stretchr/testify/assert"
 	"strings"
 	"testing"
diff --git a/avc.go b/avc.go
index 5242e3b..240fc7c 100644
--- a/avc.go
+++ b/avc.go
@@ -21,7 +21,7 @@
 	"encoding/binary"
 	"fmt"
 	"github.com/google/gopacket"
-	me "github.com/opencord/omci-lib-go/generated"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 type AttributeValueChangeMsg struct {
diff --git a/avc_test.go b/avc_test.go
index 3346a10..46b7429 100644
--- a/avc_test.go
+++ b/avc_test.go
@@ -19,8 +19,8 @@
 
 import (
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 	"github.com/stretchr/testify/assert"
 	"strings"
 	"testing"
diff --git a/create.go b/create.go
index 4f7519f..1a1b0e5 100644
--- a/create.go
+++ b/create.go
@@ -22,7 +22,7 @@
 	"errors"
 	"fmt"
 	"github.com/google/gopacket"
-	me "github.com/opencord/omci-lib-go/generated"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 // CreateRequest message apply only to attributes that are defined to be set by create.
diff --git a/create_test.go b/create_test.go
index 0207800..a2cdbf8 100644
--- a/create_test.go
+++ b/create_test.go
@@ -19,9 +19,9 @@
 
 import (
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
-	"github.com/opencord/omci-lib-go/meframe"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
+	"github.com/opencord/omci-lib-go/v2/meframe"
 	"github.com/stretchr/testify/assert"
 	"strings"
 	"testing"
diff --git a/delete.go b/delete.go
index 6502b8a..038cc20 100644
--- a/delete.go
+++ b/delete.go
@@ -21,7 +21,7 @@
 	"encoding/binary"
 	"fmt"
 	"github.com/google/gopacket"
-	me "github.com/opencord/omci-lib-go/generated"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 type DeleteRequest struct {
diff --git a/delete_test.go b/delete_test.go
index d6efc27..27d1a1a 100644
--- a/delete_test.go
+++ b/delete_test.go
@@ -19,8 +19,8 @@
 
 import (
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 	"github.com/stretchr/testify/assert"
 	"strings"
 	"testing"
diff --git a/get.go b/get.go
index 0214907..4852e00 100644
--- a/get.go
+++ b/get.go
@@ -22,7 +22,7 @@
 	"errors"
 	"fmt"
 	"github.com/google/gopacket"
-	me "github.com/opencord/omci-lib-go/generated"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 type GetRequest struct {
diff --git a/get_test.go b/get_test.go
index a76ff8f..059f8f5 100644
--- a/get_test.go
+++ b/get_test.go
@@ -22,8 +22,8 @@
 	"encoding/binary"
 	"fmt"
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 	"github.com/stretchr/testify/assert"
 	"strings"
 	"testing"
diff --git a/getcurrent.go b/getcurrent.go
index 33600e9..840a918 100644
--- a/getcurrent.go
+++ b/getcurrent.go
@@ -22,7 +22,7 @@
 	"errors"
 	"fmt"
 	"github.com/google/gopacket"
-	me "github.com/opencord/omci-lib-go/generated"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 type GetCurrentDataRequest struct {
diff --git a/getcurrent_test.go b/getcurrent_test.go
index 477f704..c7cfb08 100644
--- a/getcurrent_test.go
+++ b/getcurrent_test.go
@@ -19,8 +19,8 @@
 
 import (
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 	"github.com/stretchr/testify/assert"
 	"strings"
 	"testing"
diff --git a/getnext.go b/getnext.go
index 1a79bdc..57a542d 100644
--- a/getnext.go
+++ b/getnext.go
@@ -22,7 +22,7 @@
 	"errors"
 	"fmt"
 	"github.com/google/gopacket"
-	me "github.com/opencord/omci-lib-go/generated"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 type GetNextRequest struct {
diff --git a/getnext_test.go b/getnext_test.go
index f205ab0..ebfdb0b 100644
--- a/getnext_test.go
+++ b/getnext_test.go
@@ -19,8 +19,8 @@
 
 import (
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 	"github.com/stretchr/testify/assert"
 	"strings"
 	"testing"
diff --git a/go.mod b/go.mod
index 33a1e5b..b1f881b 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/opencord/omci-lib-go
+module github.com/opencord/omci-lib-go/v2
 
 go 1.16
 
diff --git a/layers.go b/layers.go
index d7904ad..19a673e 100644
--- a/layers.go
+++ b/layers.go
@@ -20,7 +20,7 @@
 import (
 	"errors"
 	"github.com/google/gopacket"
-	me "github.com/opencord/omci-lib-go/generated"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 var nextLayerMapping map[MessageType]gopacket.LayerType
diff --git a/layers_test.go b/layers_test.go
index 4b72a76..9171e9a 100644
--- a/layers_test.go
+++ b/layers_test.go
@@ -18,8 +18,8 @@
 
 import (
 	"github.com/google/gopacket"
-	"github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	"github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )
diff --git a/mebase.go b/mebase.go
index 2681078..b56b315 100644
--- a/mebase.go
+++ b/mebase.go
@@ -22,7 +22,7 @@
 	"fmt"
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
-	me "github.com/opencord/omci-lib-go/generated"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 type MeBasePacket struct {
diff --git a/mebase_test.go b/mebase_test.go
index 41e8e7c..b2d62b4 100644
--- a/mebase_test.go
+++ b/mebase_test.go
@@ -19,7 +19,7 @@
 import (
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
-	. "github.com/opencord/omci-lib-go"
+	. "github.com/opencord/omci-lib-go/v2"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )
diff --git a/meframe/me_alarms.go b/meframe/me_alarms.go
index ac0f242..7958b91 100644
--- a/meframe/me_alarms.go
+++ b/meframe/me_alarms.go
@@ -21,8 +21,8 @@
 	"errors"
 	"fmt"
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 func GetAllAlarmsRequestFrame(m *me.ManagedEntity, opt options) (gopacket.SerializableLayer, error) {
diff --git a/meframe/me_alarms_test.go b/meframe/me_alarms_test.go
index 8f410cf..c8da4fb 100644
--- a/meframe/me_alarms_test.go
+++ b/meframe/me_alarms_test.go
@@ -18,9 +18,9 @@
 
 import (
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
-	"github.com/opencord/omci-lib-go/meframe"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
+	"github.com/opencord/omci-lib-go/v2/meframe"
 	"github.com/stretchr/testify/assert"
 	"math/rand"
 	"testing"
diff --git a/meframe/me_avc.go b/meframe/me_avc.go
index e91339f..3d075fc 100644
--- a/meframe/me_avc.go
+++ b/meframe/me_avc.go
@@ -21,8 +21,8 @@
 	"errors"
 	"fmt"
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 func AttributeValueChangeFrame(m *me.ManagedEntity, opt options) (gopacket.SerializableLayer, error) {
diff --git a/meframe/me_avc_test.go b/meframe/me_avc_test.go
index ddf360d..9e27ec6 100644
--- a/meframe/me_avc_test.go
+++ b/meframe/me_avc_test.go
@@ -17,8 +17,8 @@
 package meframe_test
 
 import (
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 	"testing"
 )
 
diff --git a/meframe/me_create.go b/meframe/me_create.go
index 1f363ed..42ba2de 100644
--- a/meframe/me_create.go
+++ b/meframe/me_create.go
@@ -19,8 +19,8 @@
 import (
 	"errors"
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 func CreateRequestFrame(m *me.ManagedEntity, opt options) (gopacket.SerializableLayer, error) {
diff --git a/meframe/me_create_test.go b/meframe/me_create_test.go
index 5632af8..9356311 100644
--- a/meframe/me_create_test.go
+++ b/meframe/me_create_test.go
@@ -19,9 +19,9 @@
 
 import (
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
-	"github.com/opencord/omci-lib-go/meframe"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
+	"github.com/opencord/omci-lib-go/v2/meframe"
 	"github.com/stretchr/testify/assert"
 	"math/rand"
 	"testing"
diff --git a/meframe/me_delete.go b/meframe/me_delete.go
index 0a5552f..7d3dec6 100644
--- a/meframe/me_delete.go
+++ b/meframe/me_delete.go
@@ -20,8 +20,8 @@
 import (
 	"errors"
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 func DeleteRequestFrame(m *me.ManagedEntity, opt options) (gopacket.SerializableLayer, error) {
diff --git a/meframe/me_delete_test.go b/meframe/me_delete_test.go
index be0686e..12baf14 100644
--- a/meframe/me_delete_test.go
+++ b/meframe/me_delete_test.go
@@ -18,9 +18,9 @@
 
 import (
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
-	"github.com/opencord/omci-lib-go/meframe"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
+	"github.com/opencord/omci-lib-go/v2/meframe"
 	"github.com/stretchr/testify/assert"
 	"math/rand"
 	"testing"
diff --git a/meframe/me_get.go b/meframe/me_get.go
index f50e554..c3fe8a5 100644
--- a/meframe/me_get.go
+++ b/meframe/me_get.go
@@ -21,8 +21,8 @@
 	"errors"
 	"fmt"
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 func GetRequestFrame(m *me.ManagedEntity, opt options) (gopacket.SerializableLayer, error) {
diff --git a/meframe/me_get_test.go b/meframe/me_get_test.go
index 6e10431..394afdc 100644
--- a/meframe/me_get_test.go
+++ b/meframe/me_get_test.go
@@ -18,9 +18,9 @@
 
 import (
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
-	"github.com/opencord/omci-lib-go/meframe"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
+	"github.com/opencord/omci-lib-go/v2/meframe"
 	"github.com/stretchr/testify/assert"
 	"math/rand"
 	"testing"
diff --git a/meframe/me_getcurrent.go b/meframe/me_getcurrent.go
index 359a717..2589bbb 100644
--- a/meframe/me_getcurrent.go
+++ b/meframe/me_getcurrent.go
@@ -21,8 +21,8 @@
 	"errors"
 	"fmt"
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 func GetCurrentDataRequestFrame(m *me.ManagedEntity, opt options) (gopacket.SerializableLayer, error) {
diff --git a/meframe/me_getcurrent_test.go b/meframe/me_getcurrent_test.go
index 9c9452b..b8485fc 100644
--- a/meframe/me_getcurrent_test.go
+++ b/meframe/me_getcurrent_test.go
@@ -17,8 +17,8 @@
 package meframe_test
 
 import (
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 	"testing"
 )
 
diff --git a/meframe/me_getnext.go b/meframe/me_getnext.go
index 090b333..b4b2a5a 100644
--- a/meframe/me_getnext.go
+++ b/meframe/me_getnext.go
@@ -21,8 +21,8 @@
 	"errors"
 	"fmt"
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 func GetNextRequestFrame(m *me.ManagedEntity, opt options) (gopacket.SerializableLayer, error) {
diff --git a/meframe/me_getnext_test.go b/meframe/me_getnext_test.go
index 6db557e..db13607 100644
--- a/meframe/me_getnext_test.go
+++ b/meframe/me_getnext_test.go
@@ -18,9 +18,9 @@
 
 import (
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
-	"github.com/opencord/omci-lib-go/meframe"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
+	"github.com/opencord/omci-lib-go/v2/meframe"
 	"github.com/stretchr/testify/assert"
 	"math/rand"
 	"testing"
diff --git a/meframe/me_mibreset.go b/meframe/me_mibreset.go
index 78aab84..1a431ac 100644
--- a/meframe/me_mibreset.go
+++ b/meframe/me_mibreset.go
@@ -20,8 +20,8 @@
 import (
 	"errors"
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 func MibResetRequestFrame(m *me.ManagedEntity, opt options) (gopacket.SerializableLayer, error) {
diff --git a/meframe/me_mibreset_test.go b/meframe/me_mibreset_test.go
index 3c58bcc..d1075c3 100644
--- a/meframe/me_mibreset_test.go
+++ b/meframe/me_mibreset_test.go
@@ -18,9 +18,9 @@
 
 import (
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
-	"github.com/opencord/omci-lib-go/meframe"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
+	"github.com/opencord/omci-lib-go/v2/meframe"
 	"github.com/stretchr/testify/assert"
 	"math/rand"
 	"testing"
diff --git a/meframe/me_mibupload.go b/meframe/me_mibupload.go
index 1b1dab9..81eb2ce 100644
--- a/meframe/me_mibupload.go
+++ b/meframe/me_mibupload.go
@@ -20,8 +20,8 @@
 import (
 	"errors"
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 func MibUploadRequestFrame(m *me.ManagedEntity, opt options) (gopacket.SerializableLayer, error) {
diff --git a/meframe/me_mibupload_test.go b/meframe/me_mibupload_test.go
index d278682..09e7dff 100644
--- a/meframe/me_mibupload_test.go
+++ b/meframe/me_mibupload_test.go
@@ -18,9 +18,9 @@
 
 import (
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
-	"github.com/opencord/omci-lib-go/meframe"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
+	"github.com/opencord/omci-lib-go/v2/meframe"
 	"github.com/stretchr/testify/assert"
 	"math/rand"
 	"testing"
diff --git a/meframe/me_reboot.go b/meframe/me_reboot.go
index b4c23dc..f98a3a6 100644
--- a/meframe/me_reboot.go
+++ b/meframe/me_reboot.go
@@ -20,8 +20,8 @@
 import (
 	"errors"
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 func RebootRequestFrame(m *me.ManagedEntity, opt options) (gopacket.SerializableLayer, error) {
diff --git a/meframe/me_reboot_test.go b/meframe/me_reboot_test.go
index 8c16b7f..71b756b 100644
--- a/meframe/me_reboot_test.go
+++ b/meframe/me_reboot_test.go
@@ -18,9 +18,9 @@
 
 import (
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
-	"github.com/opencord/omci-lib-go/meframe"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
+	"github.com/opencord/omci-lib-go/v2/meframe"
 	"github.com/stretchr/testify/assert"
 	"math/rand"
 	"testing"
diff --git a/meframe/me_set.go b/meframe/me_set.go
index af760a9..1f126fa 100644
--- a/meframe/me_set.go
+++ b/meframe/me_set.go
@@ -21,8 +21,8 @@
 	"errors"
 	"fmt"
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 func SetRequestFrame(m *me.ManagedEntity, opt options) (gopacket.SerializableLayer, error) {
diff --git a/meframe/me_set_test.go b/meframe/me_set_test.go
index 33afb1a..4d6f3ae 100644
--- a/meframe/me_set_test.go
+++ b/meframe/me_set_test.go
@@ -18,9 +18,9 @@
 
 import (
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
-	"github.com/opencord/omci-lib-go/meframe"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
+	"github.com/opencord/omci-lib-go/v2/meframe"
 	"github.com/stretchr/testify/assert"
 	"math/rand"
 	"testing"
diff --git a/meframe/me_setable.go b/meframe/me_setable.go
index 07732c6..b5b4a8c 100644
--- a/meframe/me_setable.go
+++ b/meframe/me_setable.go
@@ -21,8 +21,8 @@
 	"errors"
 	"fmt"
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 func SetTableRequestFrame(m *me.ManagedEntity, opt options) (gopacket.SerializableLayer, error) {
diff --git a/meframe/me_setable_test.go b/meframe/me_setable_test.go
index 3afe70a..3c06c41 100644
--- a/meframe/me_setable_test.go
+++ b/meframe/me_setable_test.go
@@ -17,8 +17,8 @@
 package meframe_test
 
 import (
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 	"testing"
 )
 
diff --git a/meframe/me_software.go b/meframe/me_software.go
index 6d6d3fb..249baba 100644
--- a/meframe/me_software.go
+++ b/meframe/me_software.go
@@ -21,8 +21,8 @@
 	"errors"
 	"fmt"
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 func StartSoftwareDownloadRequestFrame(m *me.ManagedEntity, opt options) (gopacket.SerializableLayer, error) {
diff --git a/meframe/me_software_test.go b/meframe/me_software_test.go
index 7f0ae6e..6a60d70 100644
--- a/meframe/me_software_test.go
+++ b/meframe/me_software_test.go
@@ -18,9 +18,9 @@
 
 import (
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
-	"github.com/opencord/omci-lib-go/meframe"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
+	"github.com/opencord/omci-lib-go/v2/meframe"
 	"github.com/stretchr/testify/assert"
 	"math/rand"
 	"testing"
diff --git a/meframe/me_synctime.go b/meframe/me_synctime.go
index 4773bc8..1aa1e06 100644
--- a/meframe/me_synctime.go
+++ b/meframe/me_synctime.go
@@ -20,8 +20,8 @@
 import (
 	"errors"
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 	"time"
 )
 
diff --git a/meframe/me_synctime_test.go b/meframe/me_synctime_test.go
index 4ebe6d2..a22b675 100644
--- a/meframe/me_synctime_test.go
+++ b/meframe/me_synctime_test.go
@@ -18,9 +18,9 @@
 
 import (
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
-	"github.com/opencord/omci-lib-go/meframe"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
+	"github.com/opencord/omci-lib-go/v2/meframe"
 	"github.com/stretchr/testify/assert"
 	"math/rand"
 	"testing"
diff --git a/meframe/me_test_test.go b/meframe/me_test_test.go
index a68c7f3..2f92c42 100644
--- a/meframe/me_test_test.go
+++ b/meframe/me_test_test.go
@@ -17,8 +17,8 @@
 package meframe_test
 
 import (
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 	"testing"
 )
 
diff --git a/meframe/meframe.go b/meframe/meframe.go
index a6b384b..e9a55ae 100644
--- a/meframe/meframe.go
+++ b/meframe/meframe.go
@@ -22,8 +22,8 @@
 	"fmt"
 	"github.com/deckarep/golang-set"
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 var encoderMap map[MessageType]func(*me.ManagedEntity, options) (gopacket.SerializableLayer, error)
diff --git a/meframe/meframe_test.go b/meframe/meframe_test.go
index 9ebacb1..83e0e8d 100644
--- a/meframe/meframe_test.go
+++ b/meframe/meframe_test.go
@@ -19,9 +19,9 @@
 import (
 	mapset "github.com/deckarep/golang-set"
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
-	"github.com/opencord/omci-lib-go/meframe"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
+	"github.com/opencord/omci-lib-go/v2/meframe"
 	"github.com/stretchr/testify/assert"
 	"math/rand"
 	"testing"
diff --git a/messagetypes.go b/messagetypes.go
index be5c37b..e139af7 100644
--- a/messagetypes.go
+++ b/messagetypes.go
@@ -18,7 +18,7 @@
 package omci
 
 import (
-	me "github.com/opencord/omci-lib-go/generated"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 // MessageType is the OMCI Message Type combined with the AR/AK flags as appropriate.
diff --git a/messagetypes_test.go b/messagetypes_test.go
index a22e7ef..9274f3e 100644
--- a/messagetypes_test.go
+++ b/messagetypes_test.go
@@ -18,8 +18,8 @@
 
 import (
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 	"github.com/stretchr/testify/assert"
 	"strings"
 	"testing"
diff --git a/mibreset.go b/mibreset.go
index 564f85d..3af16fd 100644
--- a/mibreset.go
+++ b/mibreset.go
@@ -22,7 +22,7 @@
 	"errors"
 	"fmt"
 	"github.com/google/gopacket"
-	me "github.com/opencord/omci-lib-go/generated"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 type MibResetRequest struct {
diff --git a/mibreset_test.go b/mibreset_test.go
index cd50f39..be8235e 100644
--- a/mibreset_test.go
+++ b/mibreset_test.go
@@ -19,8 +19,8 @@
 
 import (
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 	"github.com/stretchr/testify/assert"
 	"strings"
 	"testing"
diff --git a/mibupload.go b/mibupload.go
index a8549a1..2af0b38 100644
--- a/mibupload.go
+++ b/mibupload.go
@@ -22,7 +22,7 @@
 	"errors"
 	"fmt"
 	"github.com/google/gopacket"
-	me "github.com/opencord/omci-lib-go/generated"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 type MibUploadRequest struct {
diff --git a/mibupload_test.go b/mibupload_test.go
index ecb9c9d..4341263 100644
--- a/mibupload_test.go
+++ b/mibupload_test.go
@@ -20,8 +20,8 @@
 import (
 	"fmt"
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 	"github.com/stretchr/testify/assert"
 	"strings"
 	"testing"
diff --git a/omci.go b/omci.go
index 75b1e41..f778382 100644
--- a/omci.go
+++ b/omci.go
@@ -27,7 +27,7 @@
 	"github.com/aead/cmac/aes"
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
-	me "github.com/opencord/omci-lib-go/generated"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 // DeviceIdent identifies the OMCI message format. Currently either baseline or extended.
diff --git a/omci_test.go b/omci_test.go
index 86c9a59..bab1e14 100644
--- a/omci_test.go
+++ b/omci_test.go
@@ -21,8 +21,8 @@
 	"encoding/hex"
 	"fmt"
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	. "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	. "github.com/opencord/omci-lib-go/v2/generated"
 	"github.com/stretchr/testify/assert"
 	"strings"
 	"testing"
diff --git a/reboot.go b/reboot.go
index f2983ca..2ab3db5 100644
--- a/reboot.go
+++ b/reboot.go
@@ -22,7 +22,7 @@
 	"errors"
 	"fmt"
 	"github.com/google/gopacket"
-	me "github.com/opencord/omci-lib-go/generated"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 type RebootRequest struct {
diff --git a/reboot_test.go b/reboot_test.go
index 295a396..583e652 100644
--- a/reboot_test.go
+++ b/reboot_test.go
@@ -19,8 +19,8 @@
 
 import (
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 	"github.com/stretchr/testify/assert"
 	"strings"
 	"testing"
diff --git a/relaxed_decode.go b/relaxed_decode.go
index adf3fb2..b835817 100644
--- a/relaxed_decode.go
+++ b/relaxed_decode.go
@@ -21,7 +21,7 @@
 	"fmt"
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
-	me "github.com/opencord/omci-lib-go/generated"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 type UnknownAttributeInfo struct {
diff --git a/relaxed_decode_test.go b/relaxed_decode_test.go
index 75714be..482c0b8 100644
--- a/relaxed_decode_test.go
+++ b/relaxed_decode_test.go
@@ -19,8 +19,8 @@
 
 import (
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )
diff --git a/set.go b/set.go
index e3fdb3b..bd94bbc 100644
--- a/set.go
+++ b/set.go
@@ -22,7 +22,7 @@
 	"errors"
 	"fmt"
 	"github.com/google/gopacket"
-	me "github.com/opencord/omci-lib-go/generated"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 type SetRequest struct {
diff --git a/set_test.go b/set_test.go
index 7cc04ef..169b0bf 100644
--- a/set_test.go
+++ b/set_test.go
@@ -19,8 +19,8 @@
 
 import (
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 	"github.com/stretchr/testify/assert"
 	"strings"
 	"testing"
diff --git a/settable.go b/settable.go
index 61ceafd..4a920d9 100644
--- a/settable.go
+++ b/settable.go
@@ -22,7 +22,7 @@
 	"errors"
 	"fmt"
 	"github.com/google/gopacket"
-	me "github.com/opencord/omci-lib-go/generated"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 	"math/bits"
 )
 
diff --git a/settable_test.go b/settable_test.go
index c65eb7e..4020fce 100644
--- a/settable_test.go
+++ b/settable_test.go
@@ -19,8 +19,8 @@
 
 import (
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 	"github.com/stretchr/testify/assert"
 	"strings"
 	"testing"
diff --git a/software.go b/software.go
index de5cb74..a98debc 100644
--- a/software.go
+++ b/software.go
@@ -22,7 +22,7 @@
 	"errors"
 	"fmt"
 	"github.com/google/gopacket"
-	me "github.com/opencord/omci-lib-go/generated"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 type StartSoftwareDownloadRequest struct {
diff --git a/software_test.go b/software_test.go
index dc0fb93..7b3682b 100644
--- a/software_test.go
+++ b/software_test.go
@@ -20,8 +20,8 @@
 import (
 	"fmt"
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 	"github.com/stretchr/testify/assert"
 	"strings"
 	"testing"
diff --git a/synctime.go b/synctime.go
index 7e7cad0..f7cbfe3 100644
--- a/synctime.go
+++ b/synctime.go
@@ -22,7 +22,7 @@
 	"errors"
 	"fmt"
 	"github.com/google/gopacket"
-	me "github.com/opencord/omci-lib-go/generated"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 type SynchronizeTimeRequest struct {
diff --git a/synctime_test.go b/synctime_test.go
index cf7e99f..9ae877d 100644
--- a/synctime_test.go
+++ b/synctime_test.go
@@ -19,8 +19,8 @@
 
 import (
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 	"github.com/stretchr/testify/assert"
 	"strings"
 	"testing"
diff --git a/test.go b/test.go
index 00ea602..923fc02 100644
--- a/test.go
+++ b/test.go
@@ -22,7 +22,7 @@
 	"errors"
 	"fmt"
 	"github.com/google/gopacket"
-	me "github.com/opencord/omci-lib-go/generated"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 )
 
 func decodeTestRequest(data []byte, p gopacket.PacketBuilder) error {
diff --git a/test_test.go b/test_test.go
index b387428..e60ca80 100644
--- a/test_test.go
+++ b/test_test.go
@@ -20,8 +20,8 @@
 import (
 	"fmt"
 	"github.com/google/gopacket"
-	. "github.com/opencord/omci-lib-go"
-	me "github.com/opencord/omci-lib-go/generated"
+	. "github.com/opencord/omci-lib-go/v2"
+	me "github.com/opencord/omci-lib-go/v2/generated"
 	"github.com/stretchr/testify/assert"
 	"strings"
 	"testing"