diff --git a/pkg/router/session.go b/pkg/router/session.go
index c9603d6..19c8e83 100644
--- a/pkg/router/session.go
+++ b/pkg/router/session.go
@@ -79,7 +79,7 @@ func (h *Handler) getSessionLifetime(tokenExpiry time.Time) time.Duration {
 }
 
 func (h *Handler) createSession(w http.ResponseWriter, r *http.Request, tokens *jwt.Tokens, rawTokens *oauth2.Token, params url.Values) error {
-	externalSessionID, err := NewSessionID(h.Provider.GetOpenIDConfiguration(), tokens.IDToken, params)
+	externalSessionID, err := session.NewSessionID(h.Provider.GetOpenIDConfiguration(), tokens.IDToken, params)
 	if err != nil {
 		return fmt.Errorf("generating session ID: %w", err)
 	}
diff --git a/pkg/router/session_id.go b/pkg/session/session_id.go
similarity index 98%
rename from pkg/router/session_id.go
rename to pkg/session/session_id.go
index cb4c905..67730bc 100644
--- a/pkg/router/session_id.go
+++ b/pkg/session/session_id.go
@@ -1,4 +1,4 @@
-package router
+package session
 
 import (
 	"crypto/rand"
diff --git a/pkg/router/session_id_test.go b/pkg/session/session_id_test.go
similarity index 96%
rename from pkg/router/session_id_test.go
rename to pkg/session/session_id_test.go
index 51ee981..e8c089d 100644
--- a/pkg/router/session_id_test.go
+++ b/pkg/session/session_id_test.go
@@ -1,4 +1,4 @@
-package router_test
+package session_test
 
 import (
 	"net/url"
@@ -10,7 +10,7 @@ import (
 
 	"github.com/nais/wonderwall/pkg/jwt"
 	"github.com/nais/wonderwall/pkg/openid"
-	"github.com/nais/wonderwall/pkg/router"
+	"github.com/nais/wonderwall/pkg/session"
 )
 
 func TestSessionID(t *testing.T) {
@@ -98,7 +98,7 @@ func TestSessionID(t *testing.T) {
 			exactMatch: true,
 		},
 	} {
-		actual, err := router.NewSessionID(test.config, test.idToken, test.params)
+		actual, err := session.NewSessionID(test.config, test.idToken, test.params)
 
 		t.Run(test.name, func(t *testing.T) {
 			if test.expectErr {