diff --git a/common/user_store.go b/common/user_store.go
index 4b8409f..29796e2 100644
--- a/common/user_store.go
+++ b/common/user_store.go
@@ -25,6 +25,7 @@ func (store *UserDataStore) ReadEntry(ctx context.Context, sessionId string, typ
 }
 
 // WriteEntry adds an entry to the userdata store.
+// BUG: this uses sessionId twice
 func (store *UserDataStore) WriteEntry(ctx context.Context, sessionId string, typ DataTyp, value []byte) error {
 	store.SetPrefix(db.DATATYPE_USERDATA)
 	store.SetSession(sessionId)
diff --git a/internal/handlers/ussd/menuhandler_test.go b/internal/handlers/ussd/menuhandler_test.go
index 86c905d..74e9f53 100644
--- a/internal/handlers/ussd/menuhandler_test.go
+++ b/internal/handlers/ussd/menuhandler_test.go
@@ -14,7 +14,7 @@ import (
 	"git.defalsify.org/vise.git/persist"
 	"git.defalsify.org/vise.git/resource"
 	"git.defalsify.org/vise.git/state"
-	"git.grassecon.net/urdt/ussd/internal/models"
+	"git.grassecon.net/urdt/ussd/models"
 	"git.grassecon.net/urdt/ussd/internal/testutil/mocks"
 	"git.grassecon.net/urdt/ussd/internal/testutil/testservice"
 
diff --git a/internal/testutil/mocks/servicemock.go b/internal/testutil/mocks/servicemock.go
index 78ee2b0..a24e459 100644
--- a/internal/testutil/mocks/servicemock.go
+++ b/internal/testutil/mocks/servicemock.go
@@ -3,7 +3,7 @@ package mocks
 import (
 	"context"
 
-	"git.grassecon.net/urdt/ussd/internal/models"
+	"git.grassecon.net/urdt/ussd/models"
 	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
 	"github.com/stretchr/testify/mock"
 )
diff --git a/internal/testutil/testservice/TestAccountService.go b/internal/testutil/testservice/TestAccountService.go
index 3c104bd..21f7a63 100644
--- a/internal/testutil/testservice/TestAccountService.go
+++ b/internal/testutil/testservice/TestAccountService.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"encoding/json"
 
-	"git.grassecon.net/urdt/ussd/internal/models"
+	"git.grassecon.net/urdt/ussd/models"
 	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
 )
 
diff --git a/internal/models/accountresponse.go b/models/accountresponse.go
similarity index 100%
rename from internal/models/accountresponse.go
rename to models/accountresponse.go
diff --git a/internal/models/balanceresponse.go b/models/balanceresponse.go
similarity index 100%
rename from internal/models/balanceresponse.go
rename to models/balanceresponse.go
diff --git a/internal/models/tokenresponse.go b/models/tokenresponse.go
similarity index 100%
rename from internal/models/tokenresponse.go
rename to models/tokenresponse.go
diff --git a/internal/models/trackstatusresponse.go b/models/trackstatusresponse.go
similarity index 100%
rename from internal/models/trackstatusresponse.go
rename to models/trackstatusresponse.go
diff --git a/internal/models/vouchersresponse.go b/models/vouchersresponse.go
similarity index 100%
rename from internal/models/vouchersresponse.go
rename to models/vouchersresponse.go
diff --git a/remote/accountservice.go b/remote/accountservice.go
index d0d7e9b..402add5 100644
--- a/remote/accountservice.go
+++ b/remote/accountservice.go
@@ -11,7 +11,7 @@ import (
 	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
 	"github.com/grassrootseconomics/eth-custodial/pkg/api"
 	"git.grassecon.net/urdt/ussd/config"
-	"git.grassecon.net/urdt/ussd/internal/models"
+	"git.grassecon.net/urdt/ussd/models"
 )
 
 var (