diff --git a/examples/morpheusvm/auth/bls.go b/auth/bls.go
similarity index 93%
rename from examples/morpheusvm/auth/bls.go
rename to auth/bls.go
index f56f59bf8b..c34b61aba8 100644
--- a/examples/morpheusvm/auth/bls.go
+++ b/auth/bls.go
@@ -10,7 +10,6 @@ import (
 	"github.com/ava-labs/hypersdk/codec"
 	"github.com/ava-labs/hypersdk/crypto"
 	"github.com/ava-labs/hypersdk/crypto/bls"
-	"github.com/ava-labs/hypersdk/examples/morpheusvm/consts"
 	"github.com/ava-labs/hypersdk/utils"
 )
 
@@ -36,7 +35,7 @@ func (b *BLS) address() codec.Address {
 }
 
 func (*BLS) GetTypeID() uint8 {
-	return consts.BLSID
+	return BLSID
 }
 
 func (*BLS) ComputeUnits(chain.Rules) uint64 {
@@ -113,5 +112,5 @@ func (*BLSFactory) MaxUnits() (uint64, uint64) {
 }
 
 func NewBLSAddress(pk *bls.PublicKey) codec.Address {
-	return codec.CreateAddress(consts.BLSID, utils.ToID(bls.PublicKeyToBytes(pk)))
+	return codec.CreateAddress(BLSID, utils.ToID(bls.PublicKeyToBytes(pk)))
 }
diff --git a/examples/tokenvm/auth/consts.go b/auth/consts.go
similarity index 67%
rename from examples/tokenvm/auth/consts.go
rename to auth/consts.go
index 67596fbc35..ab724c4007 100644
--- a/examples/tokenvm/auth/consts.go
+++ b/auth/consts.go
@@ -3,15 +3,20 @@
 
 package auth
 
-import "github.com/ava-labs/hypersdk/vm"
+import (
+	"github.com/ava-labs/hypersdk/vm"
+)
 
 // Note: Registry will error during initialization if a duplicate ID is assigned. We explicitly assign IDs to avoid accidental remapping.
 const (
-	ed25519ID uint8 = 0
+	// Auth TypeIDs
+	ED25519ID   uint8 = 0
+	SECP256R1ID uint8 = 1
+	BLSID       uint8 = 2
 )
 
 func Engines() map[uint8]vm.AuthEngine {
 	return map[uint8]vm.AuthEngine{
-		ed25519ID: &ED25519AuthEngine{},
+		ED25519ID: &ED25519AuthEngine{},
 	}
 }
diff --git a/examples/tokenvm/auth/ed25519.go b/auth/ed25519.go
similarity index 97%
rename from examples/tokenvm/auth/ed25519.go
rename to auth/ed25519.go
index ee78b9a0bc..61d71c0d54 100644
--- a/examples/tokenvm/auth/ed25519.go
+++ b/auth/ed25519.go
@@ -35,7 +35,7 @@ func (d *ED25519) address() codec.Address {
 }
 
 func (*ED25519) GetTypeID() uint8 {
-	return ed25519ID
+	return ED25519ID
 }
 
 func (*ED25519) ComputeUnits(chain.Rules) uint64 {
@@ -149,5 +149,5 @@ func (b *ED25519Batch) Done() []func() error {
 }
 
 func NewED25519Address(pk ed25519.PublicKey) codec.Address {
-	return codec.CreateAddress(ed25519ID, utils.ToID(pk[:]))
+	return codec.CreateAddress(ED25519ID, utils.ToID(pk[:]))
 }
diff --git a/examples/morpheusvm/auth/secp256r1.go b/auth/secp256r1.go
similarity index 94%
rename from examples/morpheusvm/auth/secp256r1.go
rename to auth/secp256r1.go
index 41f9adde6c..ca97454fd7 100644
--- a/examples/morpheusvm/auth/secp256r1.go
+++ b/auth/secp256r1.go
@@ -10,7 +10,6 @@ import (
 	"github.com/ava-labs/hypersdk/codec"
 	"github.com/ava-labs/hypersdk/crypto"
 	"github.com/ava-labs/hypersdk/crypto/secp256r1"
-	"github.com/ava-labs/hypersdk/examples/morpheusvm/consts"
 	"github.com/ava-labs/hypersdk/utils"
 )
 
@@ -36,7 +35,7 @@ func (d *SECP256R1) address() codec.Address {
 }
 
 func (*SECP256R1) GetTypeID() uint8 {
-	return consts.SECP256R1ID
+	return SECP256R1ID
 }
 
 func (*SECP256R1) ComputeUnits(chain.Rules) uint64 {
@@ -103,5 +102,5 @@ func (*SECP256R1Factory) MaxUnits() (uint64, uint64) {
 }
 
 func NewSECP256R1Address(pk secp256r1.PublicKey) codec.Address {
-	return codec.CreateAddress(consts.SECP256R1ID, utils.ToID(pk[:]))
+	return codec.CreateAddress(SECP256R1ID, utils.ToID(pk[:]))
 }
diff --git a/examples/morpheusvm/auth/consts.go b/examples/morpheusvm/auth/consts.go
deleted file mode 100644
index fa377921f1..0000000000
--- a/examples/morpheusvm/auth/consts.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (C) 2023, Ava Labs, Inc. All rights reserved.
-// See the file LICENSE for licensing terms.
-
-package auth
-
-import (
-	"github.com/ava-labs/hypersdk/examples/morpheusvm/consts"
-	"github.com/ava-labs/hypersdk/vm"
-)
-
-func Engines() map[uint8]vm.AuthEngine {
-	return map[uint8]vm.AuthEngine{
-		// Only ed25519 batch verification is supported
-		consts.ED25519ID: &ED25519AuthEngine{},
-	}
-}
diff --git a/examples/morpheusvm/auth/ed25519.go b/examples/morpheusvm/auth/ed25519.go
deleted file mode 100644
index e8dd4ac7fe..0000000000
--- a/examples/morpheusvm/auth/ed25519.go
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright (C) 2023, Ava Labs, Inc. All rights reserved.
-// See the file LICENSE for licensing terms.
-
-package auth
-
-import (
-	"context"
-
-	"github.com/ava-labs/hypersdk/chain"
-	"github.com/ava-labs/hypersdk/codec"
-	"github.com/ava-labs/hypersdk/crypto"
-	"github.com/ava-labs/hypersdk/crypto/ed25519"
-	"github.com/ava-labs/hypersdk/examples/morpheusvm/consts"
-	"github.com/ava-labs/hypersdk/utils"
-)
-
-var _ chain.Auth = (*ED25519)(nil)
-
-const (
-	ED25519ComputeUnits = 5
-	ED25519Size         = ed25519.PublicKeyLen + ed25519.SignatureLen
-)
-
-type ED25519 struct {
-	Signer    ed25519.PublicKey `json:"signer"`
-	Signature ed25519.Signature `json:"signature"`
-
-	addr codec.Address
-}
-
-func (d *ED25519) address() codec.Address {
-	if d.addr == codec.EmptyAddress {
-		d.addr = NewED25519Address(d.Signer)
-	}
-	return d.addr
-}
-
-func (*ED25519) GetTypeID() uint8 {
-	return consts.ED25519ID
-}
-
-func (*ED25519) ComputeUnits(chain.Rules) uint64 {
-	return ED25519ComputeUnits
-}
-
-func (*ED25519) ValidRange(chain.Rules) (int64, int64) {
-	return -1, -1
-}
-
-func (d *ED25519) Verify(_ context.Context, msg []byte) error {
-	if !ed25519.Verify(msg, d.Signer, d.Signature) {
-		return crypto.ErrInvalidSignature
-	}
-	return nil
-}
-
-func (d *ED25519) Actor() codec.Address {
-	return d.address()
-}
-
-func (d *ED25519) Sponsor() codec.Address {
-	return d.address()
-}
-
-func (*ED25519) Size() int {
-	return ED25519Size
-}
-
-func (d *ED25519) Marshal(p *codec.Packer) {
-	p.PackFixedBytes(d.Signer[:])
-	p.PackFixedBytes(d.Signature[:])
-}
-
-func UnmarshalED25519(p *codec.Packer) (chain.Auth, error) {
-	var d ED25519
-	signer := d.Signer[:] // avoid allocating additional memory
-	p.UnpackFixedBytes(ed25519.PublicKeyLen, &signer)
-	signature := d.Signature[:] // avoid allocating additional memory
-	p.UnpackFixedBytes(ed25519.SignatureLen, &signature)
-	return &d, p.Err()
-}
-
-var _ chain.AuthFactory = (*ED25519Factory)(nil)
-
-func NewED25519Factory(priv ed25519.PrivateKey) *ED25519Factory {
-	return &ED25519Factory{priv}
-}
-
-type ED25519Factory struct {
-	priv ed25519.PrivateKey
-}
-
-func (d *ED25519Factory) Sign(msg []byte) (chain.Auth, error) {
-	sig := ed25519.Sign(msg, d.priv)
-	return &ED25519{Signer: d.priv.PublicKey(), Signature: sig}, nil
-}
-
-func (*ED25519Factory) MaxUnits() (uint64, uint64) {
-	return ED25519Size, ED25519ComputeUnits
-}
-
-type ED25519AuthEngine struct{}
-
-func (*ED25519AuthEngine) GetBatchVerifier(cores int, count int) chain.AuthBatchVerifier {
-	batchSize := max(count/cores, ed25519.MinBatchSize)
-	return &ED25519Batch{
-		batchSize: batchSize,
-		total:     count,
-	}
-}
-
-func (*ED25519AuthEngine) Cache(chain.Auth) {
-	// TODO: add support for caching expanded public key to make batch verification faster
-}
-
-type ED25519Batch struct {
-	batchSize int
-	total     int
-
-	counter      int
-	totalCounter int
-	batch        *ed25519.Batch
-}
-
-func (b *ED25519Batch) Add(msg []byte, rauth chain.Auth) func() error {
-	auth := rauth.(*ED25519)
-	if b.batch == nil {
-		b.batch = ed25519.NewBatch(b.batchSize)
-	}
-	b.batch.Add(msg, auth.Signer, auth.Signature)
-	b.counter++
-	b.totalCounter++
-	if b.counter == b.batchSize {
-		last := b.batch
-		b.counter = 0
-		if b.totalCounter < b.total {
-			// don't create a new batch if we are done
-			b.batch = ed25519.NewBatch(b.batchSize)
-		}
-		return last.VerifyAsync()
-	}
-	return nil
-}
-
-func (b *ED25519Batch) Done() []func() error {
-	if b.batch == nil {
-		return nil
-	}
-	return []func() error{b.batch.VerifyAsync()}
-}
-
-func NewED25519Address(pk ed25519.PublicKey) codec.Address {
-	return codec.CreateAddress(consts.ED25519ID, utils.ToID(pk[:]))
-}
diff --git a/examples/morpheusvm/cmd/morpheus-cli/cmd/handler.go b/examples/morpheusvm/cmd/morpheus-cli/cmd/handler.go
index 786f55b25d..d20f5cb9f9 100644
--- a/examples/morpheusvm/cmd/morpheus-cli/cmd/handler.go
+++ b/examples/morpheusvm/cmd/morpheus-cli/cmd/handler.go
@@ -8,13 +8,13 @@ import (
 
 	"github.com/ava-labs/avalanchego/ids"
 
+	"github.com/ava-labs/hypersdk/auth"
 	"github.com/ava-labs/hypersdk/chain"
 	"github.com/ava-labs/hypersdk/cli"
 	"github.com/ava-labs/hypersdk/codec"
 	"github.com/ava-labs/hypersdk/crypto/bls"
 	"github.com/ava-labs/hypersdk/crypto/ed25519"
 	"github.com/ava-labs/hypersdk/crypto/secp256r1"
-	"github.com/ava-labs/hypersdk/examples/morpheusvm/auth"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/consts"
 	"github.com/ava-labs/hypersdk/pubsub"
 	"github.com/ava-labs/hypersdk/rpc"
@@ -47,11 +47,11 @@ func (h *Handler) DefaultActor() (
 	}
 	var factory chain.AuthFactory
 	switch addr[0] {
-	case consts.ED25519ID:
+	case auth.ED25519ID:
 		factory = auth.NewED25519Factory(ed25519.PrivateKey(priv))
-	case consts.SECP256R1ID:
+	case auth.SECP256R1ID:
 		factory = auth.NewSECP256R1Factory(secp256r1.PrivateKey(priv))
-	case consts.BLSID:
+	case auth.BLSID:
 		p, err := bls.PrivateKeyFromBytes(priv)
 		if err != nil {
 			return ids.Empty, nil, nil, nil, nil, nil, err
diff --git a/examples/morpheusvm/cmd/morpheus-cli/cmd/key.go b/examples/morpheusvm/cmd/morpheus-cli/cmd/key.go
index a07d79d694..46418cd4ca 100644
--- a/examples/morpheusvm/cmd/morpheus-cli/cmd/key.go
+++ b/examples/morpheusvm/cmd/morpheus-cli/cmd/key.go
@@ -10,12 +10,12 @@ import (
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/spf13/cobra"
 
+	"github.com/ava-labs/hypersdk/auth"
 	"github.com/ava-labs/hypersdk/cli"
 	"github.com/ava-labs/hypersdk/codec"
 	"github.com/ava-labs/hypersdk/crypto/bls"
 	"github.com/ava-labs/hypersdk/crypto/ed25519"
 	"github.com/ava-labs/hypersdk/crypto/secp256r1"
-	"github.com/ava-labs/hypersdk/examples/morpheusvm/auth"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/consts"
 	"github.com/ava-labs/hypersdk/utils"
 
@@ -39,11 +39,11 @@ func checkKeyType(k string) error {
 
 func getKeyType(addr codec.Address) (string, error) {
 	switch addr[0] {
-	case consts.ED25519ID:
+	case auth.ED25519ID:
 		return ed25519Key, nil
-	case consts.SECP256R1ID:
+	case auth.SECP256R1ID:
 		return secp256r1Key, nil
-	case consts.BLSID:
+	case auth.BLSID:
 		return blsKey, nil
 	default:
 		return "", ErrInvalidKeyType
diff --git a/examples/morpheusvm/cmd/morpheus-cli/cmd/spam.go b/examples/morpheusvm/cmd/morpheus-cli/cmd/spam.go
index 0bc3bb8f87..e7865dca09 100644
--- a/examples/morpheusvm/cmd/morpheus-cli/cmd/spam.go
+++ b/examples/morpheusvm/cmd/morpheus-cli/cmd/spam.go
@@ -9,6 +9,7 @@ import (
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/spf13/cobra"
 
+	"github.com/ava-labs/hypersdk/auth"
 	"github.com/ava-labs/hypersdk/chain"
 	"github.com/ava-labs/hypersdk/cli"
 	"github.com/ava-labs/hypersdk/codec"
@@ -16,7 +17,6 @@ import (
 	"github.com/ava-labs/hypersdk/crypto/ed25519"
 	"github.com/ava-labs/hypersdk/crypto/secp256r1"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/actions"
-	"github.com/ava-labs/hypersdk/examples/morpheusvm/auth"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/consts"
 	"github.com/ava-labs/hypersdk/pubsub"
 	"github.com/ava-labs/hypersdk/rpc"
@@ -27,11 +27,11 @@ import (
 
 func getFactory(priv *cli.PrivateKey) (chain.AuthFactory, error) {
 	switch priv.Address[0] {
-	case consts.ED25519ID:
+	case auth.ED25519ID:
 		return auth.NewED25519Factory(ed25519.PrivateKey(priv.Bytes)), nil
-	case consts.SECP256R1ID:
+	case auth.SECP256R1ID:
 		return auth.NewSECP256R1Factory(secp256r1.PrivateKey(priv.Bytes)), nil
-	case consts.BLSID:
+	case auth.BLSID:
 		p, err := bls.PrivateKeyFromBytes(priv.Bytes)
 		if err != nil {
 			return nil, err
diff --git a/examples/morpheusvm/consts/types.go b/examples/morpheusvm/consts/types.go
index c89378e840..096627169d 100644
--- a/examples/morpheusvm/consts/types.go
+++ b/examples/morpheusvm/consts/types.go
@@ -6,9 +6,4 @@ package consts
 const (
 	// Action TypeIDs
 	TransferID uint8 = 0
-
-	// Auth TypeIDs
-	ED25519ID   uint8 = 0
-	SECP256R1ID uint8 = 1
-	BLSID       uint8 = 2
 )
diff --git a/examples/morpheusvm/controller/controller.go b/examples/morpheusvm/controller/controller.go
index 0dafc41627..301a62fe69 100644
--- a/examples/morpheusvm/controller/controller.go
+++ b/examples/morpheusvm/controller/controller.go
@@ -12,10 +12,10 @@ import (
 	"github.com/ava-labs/avalanchego/snow"
 	"go.uber.org/zap"
 
+	"github.com/ava-labs/hypersdk/auth"
 	"github.com/ava-labs/hypersdk/builder"
 	"github.com/ava-labs/hypersdk/chain"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/actions"
-	"github.com/ava-labs/hypersdk/examples/morpheusvm/auth"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/config"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/consts"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/genesis"
diff --git a/examples/morpheusvm/registry/registry.go b/examples/morpheusvm/registry/registry.go
index d7197ab66c..829b5b4c94 100644
--- a/examples/morpheusvm/registry/registry.go
+++ b/examples/morpheusvm/registry/registry.go
@@ -6,10 +6,10 @@ package registry
 import (
 	"github.com/ava-labs/avalanchego/utils/wrappers"
 
+	"github.com/ava-labs/hypersdk/auth"
 	"github.com/ava-labs/hypersdk/chain"
 	"github.com/ava-labs/hypersdk/codec"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/actions"
-	"github.com/ava-labs/hypersdk/examples/morpheusvm/auth"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/consts"
 )
 
diff --git a/examples/morpheusvm/tests/e2e/e2e_test.go b/examples/morpheusvm/tests/e2e/e2e_test.go
index dd816fd591..06ccc74c66 100644
--- a/examples/morpheusvm/tests/e2e/e2e_test.go
+++ b/examples/morpheusvm/tests/e2e/e2e_test.go
@@ -18,11 +18,11 @@ import (
 	"github.com/fatih/color"
 	"github.com/stretchr/testify/require"
 
+	"github.com/ava-labs/hypersdk/auth"
 	"github.com/ava-labs/hypersdk/chain"
 	"github.com/ava-labs/hypersdk/codec"
 	"github.com/ava-labs/hypersdk/crypto/ed25519"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/actions"
-	"github.com/ava-labs/hypersdk/examples/morpheusvm/auth"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/consts"
 	"github.com/ava-labs/hypersdk/rpc"
 	"github.com/ava-labs/hypersdk/utils"
diff --git a/examples/morpheusvm/tests/integration/integration_test.go b/examples/morpheusvm/tests/integration/integration_test.go
index f130af1333..bac740f21b 100644
--- a/examples/morpheusvm/tests/integration/integration_test.go
+++ b/examples/morpheusvm/tests/integration/integration_test.go
@@ -36,7 +36,6 @@ import (
 	"github.com/ava-labs/hypersdk/crypto/ed25519"
 	"github.com/ava-labs/hypersdk/crypto/secp256r1"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/actions"
-	"github.com/ava-labs/hypersdk/examples/morpheusvm/auth"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/controller"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/genesis"
 	"github.com/ava-labs/hypersdk/fees"
@@ -44,6 +43,7 @@ import (
 	"github.com/ava-labs/hypersdk/rpc"
 	"github.com/ava-labs/hypersdk/vm"
 
+	auth "github.com/ava-labs/hypersdk/auth"
 	hbls "github.com/ava-labs/hypersdk/crypto/bls"
 	lconsts "github.com/ava-labs/hypersdk/examples/morpheusvm/consts"
 	lrpc "github.com/ava-labs/hypersdk/examples/morpheusvm/rpc"
diff --git a/examples/tokenvm/auth/errors.go b/examples/tokenvm/auth/errors.go
deleted file mode 100644
index 79462e2fc7..0000000000
--- a/examples/tokenvm/auth/errors.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (C) 2023, Ava Labs, Inc. All rights reserved.
-// See the file LICENSE for licensing terms.
-
-package auth
-
-import "errors"
-
-var ErrInvalidSignature = errors.New("invalid signature")
diff --git a/examples/tokenvm/cmd/token-cli/cmd/handler.go b/examples/tokenvm/cmd/token-cli/cmd/handler.go
index 1cfdd542f2..f6b6d93552 100644
--- a/examples/tokenvm/cmd/token-cli/cmd/handler.go
+++ b/examples/tokenvm/cmd/token-cli/cmd/handler.go
@@ -8,11 +8,11 @@ import (
 
 	"github.com/ava-labs/avalanchego/ids"
 
+	"github.com/ava-labs/hypersdk/auth"
 	"github.com/ava-labs/hypersdk/chain"
 	"github.com/ava-labs/hypersdk/cli"
 	"github.com/ava-labs/hypersdk/codec"
 	"github.com/ava-labs/hypersdk/crypto/ed25519"
-	"github.com/ava-labs/hypersdk/examples/tokenvm/auth"
 	"github.com/ava-labs/hypersdk/examples/tokenvm/consts"
 	"github.com/ava-labs/hypersdk/pubsub"
 	"github.com/ava-labs/hypersdk/rpc"
diff --git a/examples/tokenvm/cmd/token-cli/cmd/key.go b/examples/tokenvm/cmd/token-cli/cmd/key.go
index c8e6f4a907..df37f39dcf 100644
--- a/examples/tokenvm/cmd/token-cli/cmd/key.go
+++ b/examples/tokenvm/cmd/token-cli/cmd/key.go
@@ -10,11 +10,11 @@ import (
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/spf13/cobra"
 
+	"github.com/ava-labs/hypersdk/auth"
 	"github.com/ava-labs/hypersdk/cli"
 	"github.com/ava-labs/hypersdk/codec"
 	"github.com/ava-labs/hypersdk/consts"
 	"github.com/ava-labs/hypersdk/crypto/ed25519"
-	"github.com/ava-labs/hypersdk/examples/tokenvm/auth"
 	"github.com/ava-labs/hypersdk/examples/tokenvm/challenge"
 	"github.com/ava-labs/hypersdk/utils"
 
diff --git a/examples/tokenvm/cmd/token-cli/cmd/spam.go b/examples/tokenvm/cmd/token-cli/cmd/spam.go
index 2dec1a6a0c..04cb99cf54 100644
--- a/examples/tokenvm/cmd/token-cli/cmd/spam.go
+++ b/examples/tokenvm/cmd/token-cli/cmd/spam.go
@@ -9,12 +9,12 @@ import (
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/spf13/cobra"
 
+	"github.com/ava-labs/hypersdk/auth"
 	"github.com/ava-labs/hypersdk/chain"
 	"github.com/ava-labs/hypersdk/cli"
 	"github.com/ava-labs/hypersdk/codec"
 	"github.com/ava-labs/hypersdk/crypto/ed25519"
 	"github.com/ava-labs/hypersdk/examples/tokenvm/actions"
-	"github.com/ava-labs/hypersdk/examples/tokenvm/auth"
 	"github.com/ava-labs/hypersdk/examples/tokenvm/consts"
 	"github.com/ava-labs/hypersdk/pubsub"
 	"github.com/ava-labs/hypersdk/rpc"
diff --git a/examples/tokenvm/cmd/token-faucet/config/config.go b/examples/tokenvm/cmd/token-faucet/config/config.go
index 4f21ef9ed3..425ca0f15b 100644
--- a/examples/tokenvm/cmd/token-faucet/config/config.go
+++ b/examples/tokenvm/cmd/token-faucet/config/config.go
@@ -4,9 +4,9 @@
 package config
 
 import (
+	"github.com/ava-labs/hypersdk/auth"
 	"github.com/ava-labs/hypersdk/codec"
 	"github.com/ava-labs/hypersdk/crypto/ed25519"
-	"github.com/ava-labs/hypersdk/examples/tokenvm/auth"
 	"github.com/ava-labs/hypersdk/examples/tokenvm/consts"
 )
 
diff --git a/examples/tokenvm/cmd/token-faucet/manager/manager.go b/examples/tokenvm/cmd/token-faucet/manager/manager.go
index dfc9b73596..a0950bfef0 100644
--- a/examples/tokenvm/cmd/token-faucet/manager/manager.go
+++ b/examples/tokenvm/cmd/token-faucet/manager/manager.go
@@ -16,10 +16,10 @@ import (
 	"github.com/ava-labs/avalanchego/utils/timer"
 	"go.uber.org/zap"
 
+	"github.com/ava-labs/hypersdk/auth"
 	"github.com/ava-labs/hypersdk/chain"
 	"github.com/ava-labs/hypersdk/codec"
 	"github.com/ava-labs/hypersdk/examples/tokenvm/actions"
-	"github.com/ava-labs/hypersdk/examples/tokenvm/auth"
 	"github.com/ava-labs/hypersdk/examples/tokenvm/challenge"
 	"github.com/ava-labs/hypersdk/examples/tokenvm/cmd/token-faucet/config"
 	"github.com/ava-labs/hypersdk/examples/tokenvm/consts"
diff --git a/examples/tokenvm/cmd/token-wallet/backend/backend.go b/examples/tokenvm/cmd/token-wallet/backend/backend.go
index 42443feca7..1dabcb3706 100644
--- a/examples/tokenvm/cmd/token-wallet/backend/backend.go
+++ b/examples/tokenvm/cmd/token-wallet/backend/backend.go
@@ -24,12 +24,12 @@ import (
 	"github.com/ava-labs/avalanchego/utils/set"
 	"github.com/ava-labs/avalanchego/utils/units"
 
+	"github.com/ava-labs/hypersdk/auth"
 	"github.com/ava-labs/hypersdk/chain"
 	"github.com/ava-labs/hypersdk/codec"
 	"github.com/ava-labs/hypersdk/consts"
 	"github.com/ava-labs/hypersdk/crypto/ed25519"
 	"github.com/ava-labs/hypersdk/examples/tokenvm/actions"
-	"github.com/ava-labs/hypersdk/examples/tokenvm/auth"
 	"github.com/ava-labs/hypersdk/examples/tokenvm/challenge"
 	"github.com/ava-labs/hypersdk/examples/tokenvm/cmd/token-feed/manager"
 	"github.com/ava-labs/hypersdk/fees"
diff --git a/examples/tokenvm/controller/controller.go b/examples/tokenvm/controller/controller.go
index 0f993ea050..f9d505b7b7 100644
--- a/examples/tokenvm/controller/controller.go
+++ b/examples/tokenvm/controller/controller.go
@@ -12,10 +12,10 @@ import (
 	"github.com/ava-labs/avalanchego/snow"
 	"go.uber.org/zap"
 
+	"github.com/ava-labs/hypersdk/auth"
 	"github.com/ava-labs/hypersdk/builder"
 	"github.com/ava-labs/hypersdk/chain"
 	"github.com/ava-labs/hypersdk/examples/tokenvm/actions"
-	"github.com/ava-labs/hypersdk/examples/tokenvm/auth"
 	"github.com/ava-labs/hypersdk/examples/tokenvm/config"
 	"github.com/ava-labs/hypersdk/examples/tokenvm/consts"
 	"github.com/ava-labs/hypersdk/examples/tokenvm/genesis"
diff --git a/examples/tokenvm/registry/registry.go b/examples/tokenvm/registry/registry.go
index 1bf59d8cc8..0fa3d55210 100644
--- a/examples/tokenvm/registry/registry.go
+++ b/examples/tokenvm/registry/registry.go
@@ -6,10 +6,10 @@ package registry
 import (
 	"github.com/ava-labs/avalanchego/utils/wrappers"
 
+	"github.com/ava-labs/hypersdk/auth"
 	"github.com/ava-labs/hypersdk/chain"
 	"github.com/ava-labs/hypersdk/codec"
 	"github.com/ava-labs/hypersdk/examples/tokenvm/actions"
-	"github.com/ava-labs/hypersdk/examples/tokenvm/auth"
 	"github.com/ava-labs/hypersdk/examples/tokenvm/consts"
 )
 
diff --git a/examples/tokenvm/tests/e2e/e2e_test.go b/examples/tokenvm/tests/e2e/e2e_test.go
index ebc77ef970..30a387267f 100644
--- a/examples/tokenvm/tests/e2e/e2e_test.go
+++ b/examples/tokenvm/tests/e2e/e2e_test.go
@@ -18,11 +18,11 @@ import (
 	"github.com/fatih/color"
 	"github.com/stretchr/testify/require"
 
+	"github.com/ava-labs/hypersdk/auth"
 	"github.com/ava-labs/hypersdk/chain"
 	"github.com/ava-labs/hypersdk/codec"
 	"github.com/ava-labs/hypersdk/crypto/ed25519"
 	"github.com/ava-labs/hypersdk/examples/tokenvm/actions"
-	"github.com/ava-labs/hypersdk/examples/tokenvm/auth"
 	"github.com/ava-labs/hypersdk/examples/tokenvm/consts"
 	"github.com/ava-labs/hypersdk/rpc"
 
diff --git a/examples/tokenvm/tests/integration/integration_test.go b/examples/tokenvm/tests/integration/integration_test.go
index 238da11646..3d4d42b103 100644
--- a/examples/tokenvm/tests/integration/integration_test.go
+++ b/examples/tokenvm/tests/integration/integration_test.go
@@ -35,7 +35,6 @@ import (
 	"github.com/ava-labs/hypersdk/consts"
 	"github.com/ava-labs/hypersdk/crypto/ed25519"
 	"github.com/ava-labs/hypersdk/examples/tokenvm/actions"
-	"github.com/ava-labs/hypersdk/examples/tokenvm/auth"
 	"github.com/ava-labs/hypersdk/examples/tokenvm/controller"
 	"github.com/ava-labs/hypersdk/examples/tokenvm/genesis"
 	"github.com/ava-labs/hypersdk/fees"
@@ -43,6 +42,7 @@ import (
 	"github.com/ava-labs/hypersdk/rpc"
 	"github.com/ava-labs/hypersdk/vm"
 
+	"github.com/ava-labs/hypersdk/auth"
 	tconsts "github.com/ava-labs/hypersdk/examples/tokenvm/consts"
 	trpc "github.com/ava-labs/hypersdk/examples/tokenvm/rpc"
 	hutils "github.com/ava-labs/hypersdk/utils"