diff --git a/decode_test.go b/decode_test.go
index 0f1c295..65df302 100644
--- a/decode_test.go
+++ b/decode_test.go
@@ -1,13 +1,14 @@
-package iabtcf
+package iabtcf_test
 
 import (
+	iabtcf "github.com/SirDataFR/iab-tcf-v2"
 	"testing"
 )
 
 func TestDecode(t *testing.T) {
 	str := "COxR03kOxR1CqBcABCENAgCMAP_AAH_AAAqIF3EXySoGY2thI2YVFxBEIYwfJxyigMgChgQIsSwNQIeFLBoGLiAAHBGYJAQAGBAEEACBAQIkHGBMCQAAgAgBiRCMQEGMCzNIBIBAggEbY0FACCVmHkHSmZCY7064O__QLuIJEFQMAkSBAIACLECIQwAQDiAAAYAlAAABAhIaAAgIWBQEeAAAACAwAAgAAABBAAACAAQAAICIAAABAAAgAiAQAAAAGgIQAACBABACRIAAAEANCAAgiCEAQg4EAo4AAA.IF3EXySoGY2tho2YVFzBEIYwfJxyigMgShgQIsS0NQIeFLBoGPiAAHBGYJAQAGBAkkACBAQIsHGBMCQABgAgRiRCMQEGMDzNIBIBAggkbY0FACCVmnkHS3ZCY70-6u__QA.elAAAAAAAWA"
 
-	data, err := Decode(str)
+	data, err := iabtcf.Decode(str)
 	if err != nil {
 		t.Errorf("TC String should be decoded without error: %s", err)
 		return
@@ -27,7 +28,7 @@ func TestDecode(t *testing.T) {
 func TestDecodeInvalid(t *testing.T) {
 	str := "IF3EXySoGY2tho2YVFzBEIYwfJxyigMgShgQIsS0NQIeFLBoGPiAAHBGYJAQAGBAkkACBAQIsHGBMCQABgAgRiRCMQEGMDzNIBIBAggkbY0FACCVmnkHS3ZCY70-6u__QA.elAAAAAAAWA"
 
-	_, err := Decode(str)
+	_, err := iabtcf.Decode(str)
 	if err == nil {
 		t.Errorf("TC String should not be decoded: %s", err)
 		return
@@ -37,12 +38,12 @@ func TestDecodeInvalid(t *testing.T) {
 func TestDecodeCoreString(t *testing.T) {
 	str := "COxR03kOxR1CqBcABCENAgCMAP_AAH_AAAqIF3EXySoGY2thI2YVFxBEIYwfJxyigMgChgQIsSwNQIeFLBoGLiAAHBGYJAQAGBAEEACBAQIkHGBMCQAAgAgBiRCMQEGMCzNIBIBAggEbY0FACCVmHkHSmZCY7064O__QLuIJEFQMAkSBAIACLECIQwAQDiAAAYAlAAABAhIaAAgIWBQEeAAAACAwAAgAAABBAAACAAQAAICIAAABAAAgAiAQAAAAGgIQAACBABACRIAAAEANCAAgiCEAQg4EAo4AAA"
 
-	if DecodeSegmentType(str) != 0 {
+	if iabtcf.DecodeSegmentType(str) != 0 {
 		t.Errorf("Segment type should be 0")
 		return
 	}
 
-	segment, err := DecodeCoreString(str)
+	segment, err := iabtcf.DecodeCoreString(str)
 	if err != nil {
 		t.Errorf("Segment should be decoded without error: %s", err)
 		return
@@ -62,12 +63,12 @@ func TestDecodeCoreString(t *testing.T) {
 func TestDecodeDisclosedVendors(t *testing.T) {
 	str := "IF3EXySoGY2tho2YVFzBEIYwfJxyigMgShgQIsS0NQIeFLBoGPiAAHBGYJAQAGBAkkACBAQIsHGBMCQABgAgRiRCMQEGMDzNIBIBAggkbY0FACCVmnkHS3ZCY70-6u__QA"
 
-	if DecodeSegmentType(str) != 1 {
+	if iabtcf.DecodeSegmentType(str) != 1 {
 		t.Errorf("Segment type should be 1")
 		return
 	}
 
-	segment, err := DecodeDisclosedVendors(str)
+	segment, err := iabtcf.DecodeDisclosedVendors(str)
 	if err != nil {
 		t.Errorf("Segment should be decoded without error: %s", err)
 		return
@@ -97,12 +98,12 @@ func TestDecodeDisclosedVendors(t *testing.T) {
 func TestDecodeAllowedVendors(t *testing.T) {
 	str := "QF3QAgABAA1A"
 
-	if DecodeSegmentType(str) != 2 {
+	if iabtcf.DecodeSegmentType(str) != 2 {
 		t.Errorf("Segment type should be 2")
 		return
 	}
 
-	segment, err := DecodeAllowedVendors(str)
+	segment, err := iabtcf.DecodeAllowedVendors(str)
 	if err != nil {
 		t.Errorf("Segment should be decoded without error: %s", err)
 		return
@@ -132,12 +133,12 @@ func TestDecodeAllowedVendors(t *testing.T) {
 func TestDecodePublisherTC(t *testing.T) {
 	str := "elAAAAAAAWA"
 
-	if DecodeSegmentType(str) != 3 {
+	if iabtcf.DecodeSegmentType(str) != 3 {
 		t.Errorf("Segment type should be 3")
 		return
 	}
 
-	segment, err := DecodePubllisherTC(str)
+	segment, err := iabtcf.DecodePubllisherTC(str)
 	if err != nil {
 		t.Errorf("Segment should be decoded without error: %s", err)
 		return
diff --git a/encode_test.go b/encode_test.go
index e81e849..daa6d6a 100644
--- a/encode_test.go
+++ b/encode_test.go
@@ -1,14 +1,15 @@
-package iabtcf
+package iabtcf_test
 
 import (
+	iabtcf "github.com/SirDataFR/iab-tcf-v2"
 	"testing"
 	"time"
 )
 
 func TestEncode(t *testing.T) {
 	str := "COxSKBCOxSKCCBcABCENAgCMAPzAAEPAAAqIDaQBQAMgAgABqAR0A2gDaQAwAMgAgANoAAA.IDaQBQAMgAgABqAR0A2g.QF3QAgABAA1A.eEAAAAAAAUA"
-	data := &TCData{
-		CoreString: &CoreString{
+	data := &iabtcf.TCData{
+		CoreString: &iabtcf.CoreString{
 			Version:              2,
 			Created:              timeFromDeciSeconds(15859228738),
 			LastUpdated:          timeFromDeciSeconds(15859228802),
@@ -47,7 +48,7 @@ func TestEncode(t *testing.T) {
 			IsRangeEncoding:     true,
 			VendorsConsent:      map[int]bool{},
 			NumEntries:          5,
-			RangeEntries: []*RangeEntry{
+			RangeEntries: []*iabtcf.RangeEntry{
 				{
 					StartVendorID: 25,
 					EndVendorID:   25,
@@ -73,7 +74,7 @@ func TestEncode(t *testing.T) {
 			IsRangeEncodingLI:     true,
 			VendorsLITransparency: map[int]bool{},
 			NumEntriesLI:          3,
-			RangeEntriesLI: []*RangeEntry{
+			RangeEntriesLI: []*iabtcf.RangeEntry{
 				{
 					StartVendorID: 25,
 					EndVendorID:   25,
@@ -89,12 +90,12 @@ func TestEncode(t *testing.T) {
 			},
 			NumPubRestrictions: 0,
 		},
-		DisclosedVendors: &DisclosedVendors{
+		DisclosedVendors: &iabtcf.DisclosedVendors{
 			SegmentType:     1,
 			MaxVendorId:     436,
 			IsRangeEncoding: true,
 			NumEntries:      5,
-			RangeEntries: []*RangeEntry{
+			RangeEntries: []*iabtcf.RangeEntry{
 				{
 					StartVendorID: 25,
 					EndVendorID:   25,
@@ -117,12 +118,12 @@ func TestEncode(t *testing.T) {
 				},
 			},
 		},
-		AllowedVendors: &AllowedVendors{
+		AllowedVendors: &iabtcf.AllowedVendors{
 			SegmentType:     2,
 			MaxVendorId:     750,
 			IsRangeEncoding: true,
 			NumEntries:      2,
-			RangeEntries: []*RangeEntry{
+			RangeEntries: []*iabtcf.RangeEntry{
 				{
 					StartVendorID: 2,
 					EndVendorID:   2,
@@ -133,7 +134,7 @@ func TestEncode(t *testing.T) {
 				},
 			},
 		},
-		PublisherTC: &PublisherTC{
+		PublisherTC: &iabtcf.PublisherTC{
 			SegmentType: 3,
 			PubPurposesConsent: map[int]bool{
 				1: true,
@@ -157,7 +158,7 @@ func TestEncode(t *testing.T) {
 }
 func TestEncodeCoreString(t *testing.T) {
 	str := "COxSKBCOxSKCCBcABCENAgCMAPzAAEPAAAqIDaQBQAMgAgABqAR0A2gDaQAwAMgAgANoAAA"
-	segment := &CoreString{
+	segment := &iabtcf.CoreString{
 		Version:              2,
 		Created:              timeFromDeciSeconds(15859228738),
 		LastUpdated:          timeFromDeciSeconds(15859228802),
@@ -196,7 +197,7 @@ func TestEncodeCoreString(t *testing.T) {
 		IsRangeEncoding:     true,
 		VendorsConsent:      map[int]bool{},
 		NumEntries:          5,
-		RangeEntries: []*RangeEntry{
+		RangeEntries: []*iabtcf.RangeEntry{
 			{
 				StartVendorID: 25,
 				EndVendorID:   25,
@@ -222,7 +223,7 @@ func TestEncodeCoreString(t *testing.T) {
 		IsRangeEncodingLI:     true,
 		VendorsLITransparency: map[int]bool{},
 		NumEntriesLI:          3,
-		RangeEntriesLI: []*RangeEntry{
+		RangeEntriesLI: []*iabtcf.RangeEntry{
 			{
 				StartVendorID: 25,
 				EndVendorID:   25,
@@ -247,12 +248,12 @@ func TestEncodeCoreString(t *testing.T) {
 
 func TestEncodeDisclosedVendors(t *testing.T) {
 	str := "IDaQBQAMgAgABqAR0A2g"
-	segment := &DisclosedVendors{
+	segment := &iabtcf.DisclosedVendors{
 		SegmentType:     1,
 		MaxVendorId:     436,
 		IsRangeEncoding: true,
 		NumEntries:      5,
-		RangeEntries: []*RangeEntry{
+		RangeEntries: []*iabtcf.RangeEntry{
 			{
 				StartVendorID: 25,
 				EndVendorID:   25,
@@ -284,12 +285,12 @@ func TestEncodeDisclosedVendors(t *testing.T) {
 
 func TestEncodeAllowedVendors(t *testing.T) {
 	str := "QF3QAgABAA1A"
-	segment := &AllowedVendors{
+	segment := &iabtcf.AllowedVendors{
 		SegmentType:     2,
 		MaxVendorId:     750,
 		IsRangeEncoding: true,
 		NumEntries:      2,
-		RangeEntries: []*RangeEntry{
+		RangeEntries: []*iabtcf.RangeEntry{
 			{
 				StartVendorID: 2,
 				EndVendorID:   2,
@@ -309,7 +310,7 @@ func TestEncodeAllowedVendors(t *testing.T) {
 
 func TestEncodePublisherTC(t *testing.T) {
 	str := "eEAAAAAAAUA"
-	segment := &PublisherTC{
+	segment := &iabtcf.PublisherTC{
 		SegmentType: 3,
 		PubPurposesConsent: map[int]bool{
 			1: true,