diff --git a/internal/utils/userStore.go b/common/user_store.go
similarity index 55%
rename from internal/utils/userStore.go
rename to common/user_store.go
index 13682b7..8d982ab 100644
--- a/internal/utils/userStore.go
+++ b/common/user_store.go
@@ -1,17 +1,15 @@
-package utils
+package common
 
 import (
 	"context"
 
-	"git.grassecon.net/urdt/ussd/common"
-
 	"git.defalsify.org/vise.git/db"
 )
 
 type DataStore interface {
 	db.Db
-	ReadEntry(ctx context.Context, sessionId string, typ common.DataTyp) ([]byte, error)
-	WriteEntry(ctx context.Context, sessionId string, typ common.DataTyp, value []byte) error
+	ReadEntry(ctx context.Context, sessionId string, typ DataTyp) ([]byte, error)
+	WriteEntry(ctx context.Context, sessionId string, typ DataTyp, value []byte) error
 }
 
 type UserDataStore struct {
@@ -19,16 +17,16 @@ type UserDataStore struct {
 }
 
 // ReadEntry retrieves an entry from the store based on the provided parameters.
-func (store *UserDataStore) ReadEntry(ctx context.Context, sessionId string, typ common.DataTyp) ([]byte, error) {
+func (store *UserDataStore) ReadEntry(ctx context.Context, sessionId string, typ DataTyp) ([]byte, error) {
 	store.SetPrefix(db.DATATYPE_USERDATA)
 	store.SetSession(sessionId)
-	k := common.PackKey(typ, []byte(sessionId))
+	k := PackKey(typ, []byte(sessionId))
 	return store.Get(ctx, k)
 }
 
-func (store *UserDataStore) WriteEntry(ctx context.Context, sessionId string, typ common.DataTyp, value []byte) error {
+func (store *UserDataStore) WriteEntry(ctx context.Context, sessionId string, typ DataTyp, value []byte) error {
 	store.SetPrefix(db.DATATYPE_USERDATA)
 	store.SetSession(sessionId)
-	k := common.PackKey(typ, []byte(sessionId))
+	k := PackKey(typ, []byte(sessionId))
 	return store.Put(ctx, k, value)
 }
diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go
index e2bcfaf..303bea9 100644
--- a/internal/handlers/ussd/menuhandler.go
+++ b/internal/handlers/ussd/menuhandler.go
@@ -63,7 +63,7 @@ type Handlers struct {
 	pe             *persist.Persister
 	st             *state.State
 	ca             cache.Memory
-	userdataStore  utils.DataStore
+	userdataStore  common.DataStore
 	flagManager    *asm.FlagParser
 	accountService server.AccountServiceInterface
 }
@@ -72,7 +72,7 @@ func NewHandlers(appFlags *asm.FlagParser, userdataStore db.Db, accountService s
 	if userdataStore == nil {
 		return nil, fmt.Errorf("cannot create handler with nil userdata store")
 	}
-	userDb := &utils.UserDataStore{
+	userDb := &common.UserDataStore{
 		Db: userdataStore,
 	}
 	h := &Handlers{