diff --git a/cid/multibase.go b/cid/multibase/multibase.go
similarity index 96%
rename from cid/multibase.go
rename to cid/multibase/multibase.go
index fc20b67..8d2b360 100644
--- a/cid/multibase.go
+++ b/cid/multibase/multibase.go
@@ -1,4 +1,4 @@
-package cid
+package multibase
 
 import (
 	"errors"
@@ -30,7 +30,7 @@ type Multibase interface {
 
 var _ Multibase = (*multibaseImpl)(nil)
 
-func NewMultibase(encoder Encoder) Multibase {
+func New(encoder Encoder) Multibase {
 	return &multibaseImpl{encoder: encoder}
 }
 
diff --git a/cid/multibase_test.go b/cid/multibase/multibase_test.go
similarity index 99%
rename from cid/multibase_test.go
rename to cid/multibase/multibase_test.go
index 9be53d1..b49f778 100644
--- a/cid/multibase_test.go
+++ b/cid/multibase/multibase_test.go
@@ -1,4 +1,4 @@
-package cid
+package multibase
 
 import (
 	"git.lumeweb.com/LumeWeb/libs5-go/internal/testdata"
@@ -17,7 +17,7 @@ func (e *encoder) ToBytes() []byte {
 
 func newEncoder(data []byte) encoder {
 	e := &encoder{data: data}
-	m := NewMultibase(e)
+	m := New(e)
 	e.Multibase = m
 
 	return *e