diff --git a/ledger/allegra.go b/ledger/allegra/allegra.go
similarity index 76%
rename from ledger/allegra.go
rename to ledger/allegra/allegra.go
index 7a738751..1c91ce78 100644
--- a/ledger/allegra.go
+++ b/ledger/allegra/allegra.go
@@ -1,4 +1,4 @@
-// Copyright 2023 Blink Labs Software
+// Copyright 2024 Blink Labs Software
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package ledger
+package allegra
 
 import (
 	"encoding/hex"
@@ -20,6 +20,7 @@ import (
 
 	"github.com/blinklabs-io/gouroboros/cbor"
 	"github.com/blinklabs-io/gouroboros/ledger/common"
+	"github.com/blinklabs-io/gouroboros/ledger/shelley"
 
 	utxorpc "github.com/utxorpc/go-codegen/utxorpc/v1alpha/cardano"
 )
@@ -51,7 +52,7 @@ type AllegraBlock struct {
 	cbor.DecodeStoreCbor
 	Header                 *AllegraBlockHeader
 	TransactionBodies      []AllegraTransactionBody
-	TransactionWitnessSets []ShelleyTransactionWitnessSet
+	TransactionWitnessSets []shelley.ShelleyTransactionWitnessSet
 	TransactionMetadataSet map[uint]*cbor.LazyValue
 }
 
@@ -71,7 +72,7 @@ func (b *AllegraBlock) SlotNumber() uint64 {
 	return b.Header.SlotNumber()
 }
 
-func (b *AllegraBlock) IssuerVkey() IssuerVkey {
+func (b *AllegraBlock) IssuerVkey() common.IssuerVkey {
 	return b.Header.IssuerVkey()
 }
 
@@ -79,12 +80,12 @@ func (b *AllegraBlock) BlockBodySize() uint64 {
 	return b.Header.BlockBodySize()
 }
 
-func (b *AllegraBlock) Era() Era {
+func (b *AllegraBlock) Era() common.Era {
 	return EraAllegra
 }
 
-func (b *AllegraBlock) Transactions() []Transaction {
-	ret := make([]Transaction, len(b.TransactionBodies))
+func (b *AllegraBlock) Transactions() []common.Transaction {
+	ret := make([]common.Transaction, len(b.TransactionBodies))
 	for idx := range b.TransactionBodies {
 		ret[idx] = &AllegraTransaction{
 			Body:       b.TransactionBodies[idx],
@@ -118,18 +119,18 @@ func (b *AllegraBlock) Utxorpc() *utxorpc.Block {
 }
 
 type AllegraBlockHeader struct {
-	ShelleyBlockHeader
+	shelley.ShelleyBlockHeader
 }
 
-func (h *AllegraBlockHeader) Era() Era {
+func (h *AllegraBlockHeader) Era() common.Era {
 	return EraAllegra
 }
 
 type AllegraTransactionBody struct {
-	ShelleyTransactionBody
+	shelley.ShelleyTransactionBody
 	Update struct {
 		cbor.StructAsArray
-		ProtocolParamUpdates map[Blake2b224]AllegraProtocolParameterUpdate
+		ProtocolParamUpdates map[common.Blake2b224]AllegraProtocolParameterUpdate
 		Epoch                uint64
 	} `cbor:"6,keyasint,omitempty"`
 	TxValidityIntervalStart uint64 `cbor:"8,keyasint,omitempty"`
@@ -143,8 +144,8 @@ func (b *AllegraTransactionBody) ValidityIntervalStart() uint64 {
 	return b.TxValidityIntervalStart
 }
 
-func (b *AllegraTransactionBody) ProtocolParametersUpdate() map[Blake2b224]any {
-	updateMap := make(map[Blake2b224]any)
+func (b *AllegraTransactionBody) ProtocolParametersUpdate() map[common.Blake2b224]any {
+	updateMap := make(map[common.Blake2b224]any)
 	for k, v := range b.Update.ProtocolParamUpdates {
 		updateMap[k] = v
 	}
@@ -155,7 +156,7 @@ type AllegraTransaction struct {
 	cbor.StructAsArray
 	cbor.DecodeStoreCbor
 	Body       AllegraTransactionBody
-	WitnessSet ShelleyTransactionWitnessSet
+	WitnessSet shelley.ShelleyTransactionWitnessSet
 	TxMetadata *cbor.LazyValue
 }
 
@@ -163,11 +164,11 @@ func (t AllegraTransaction) Hash() string {
 	return t.Body.Hash()
 }
 
-func (t AllegraTransaction) Inputs() []TransactionInput {
+func (t AllegraTransaction) Inputs() []common.TransactionInput {
 	return t.Body.Inputs()
 }
 
-func (t AllegraTransaction) Outputs() []TransactionOutput {
+func (t AllegraTransaction) Outputs() []common.TransactionOutput {
 	return t.Body.Outputs()
 }
 
@@ -183,15 +184,15 @@ func (t AllegraTransaction) ValidityIntervalStart() uint64 {
 	return t.Body.ValidityIntervalStart()
 }
 
-func (t AllegraTransaction) ReferenceInputs() []TransactionInput {
+func (t AllegraTransaction) ReferenceInputs() []common.TransactionInput {
 	return t.Body.ReferenceInputs()
 }
 
-func (t AllegraTransaction) Collateral() []TransactionInput {
+func (t AllegraTransaction) Collateral() []common.TransactionInput {
 	return t.Body.Collateral()
 }
 
-func (t AllegraTransaction) CollateralReturn() TransactionOutput {
+func (t AllegraTransaction) CollateralReturn() common.TransactionOutput {
 	return t.Body.CollateralReturn()
 }
 
@@ -199,19 +200,19 @@ func (t AllegraTransaction) TotalCollateral() uint64 {
 	return t.Body.TotalCollateral()
 }
 
-func (t AllegraTransaction) Certificates() []Certificate {
+func (t AllegraTransaction) Certificates() []common.Certificate {
 	return t.Body.Certificates()
 }
 
-func (t AllegraTransaction) Withdrawals() map[*Address]uint64 {
+func (t AllegraTransaction) Withdrawals() map[*common.Address]uint64 {
 	return t.Body.Withdrawals()
 }
 
-func (t AllegraTransaction) AuxDataHash() *Blake2b256 {
+func (t AllegraTransaction) AuxDataHash() *common.Blake2b256 {
 	return t.Body.AuxDataHash()
 }
 
-func (t AllegraTransaction) RequiredSigners() []Blake2b224 {
+func (t AllegraTransaction) RequiredSigners() []common.Blake2b224 {
 	return t.Body.RequiredSigners()
 }
 
@@ -219,15 +220,15 @@ func (t AllegraTransaction) AssetMint() *common.MultiAsset[common.MultiAssetType
 	return t.Body.AssetMint()
 }
 
-func (t AllegraTransaction) ScriptDataHash() *Blake2b256 {
+func (t AllegraTransaction) ScriptDataHash() *common.Blake2b256 {
 	return t.Body.ScriptDataHash()
 }
 
-func (t AllegraTransaction) VotingProcedures() VotingProcedures {
+func (t AllegraTransaction) VotingProcedures() common.VotingProcedures {
 	return t.Body.VotingProcedures()
 }
 
-func (t AllegraTransaction) ProposalProcedures() []ProposalProcedure {
+func (t AllegraTransaction) ProposalProcedures() []common.ProposalProcedure {
 	return t.Body.ProposalProcedures()
 }
 
@@ -251,17 +252,17 @@ func (t AllegraTransaction) IsValid() bool {
 	return true
 }
 
-func (t AllegraTransaction) Consumed() []TransactionInput {
+func (t AllegraTransaction) Consumed() []common.TransactionInput {
 	return t.Inputs()
 }
 
-func (t AllegraTransaction) Produced() []Utxo {
-	var ret []Utxo
+func (t AllegraTransaction) Produced() []common.Utxo {
+	var ret []common.Utxo
 	for idx, output := range t.Outputs() {
 		ret = append(
 			ret,
-			Utxo{
-				Id:     NewShelleyTransactionInput(t.Hash(), idx),
+			common.Utxo{
+				Id:     shelley.NewShelleyTransactionInput(t.Hash(), idx),
 				Output: output,
 			},
 		)
@@ -269,7 +270,7 @@ func (t AllegraTransaction) Produced() []Utxo {
 	return ret
 }
 
-func (t AllegraTransaction) ProtocolParametersUpdate() map[Blake2b224]any {
+func (t AllegraTransaction) ProtocolParametersUpdate() map[common.Blake2b224]any {
 	return t.Body.ProtocolParametersUpdate()
 }
 
@@ -300,11 +301,11 @@ func (t *AllegraTransaction) Cbor() []byte {
 }
 
 type AllegraProtocolParameters struct {
-	ShelleyProtocolParameters
+	shelley.ShelleyProtocolParameters
 }
 
 type AllegraProtocolParameterUpdate struct {
-	ShelleyProtocolParameterUpdate
+	shelley.ShelleyProtocolParameterUpdate
 }
 
 func NewAllegraBlockFromCbor(data []byte) (*AllegraBlock, error) {
diff --git a/ledger/alonzo.go b/ledger/alonzo/alonzo.go
similarity index 77%
rename from ledger/alonzo.go
rename to ledger/alonzo/alonzo.go
index 71bd84f1..028a2035 100644
--- a/ledger/alonzo.go
+++ b/ledger/alonzo/alonzo.go
@@ -1,4 +1,4 @@
-// Copyright 2023 Blink Labs Software
+// Copyright 2024 Blink Labs Software
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package ledger
+package alonzo
 
 import (
 	"encoding/hex"
@@ -21,6 +21,8 @@ import (
 
 	"github.com/blinklabs-io/gouroboros/cbor"
 	"github.com/blinklabs-io/gouroboros/ledger/common"
+	"github.com/blinklabs-io/gouroboros/ledger/mary"
+	"github.com/blinklabs-io/gouroboros/ledger/shelley"
 
 	utxorpc "github.com/utxorpc/go-codegen/utxorpc/v1alpha/cardano"
 )
@@ -73,7 +75,7 @@ func (b *AlonzoBlock) SlotNumber() uint64 {
 	return b.Header.SlotNumber()
 }
 
-func (b *AlonzoBlock) IssuerVkey() IssuerVkey {
+func (b *AlonzoBlock) IssuerVkey() common.IssuerVkey {
 	return b.Header.IssuerVkey()
 }
 
@@ -81,17 +83,17 @@ func (b *AlonzoBlock) BlockBodySize() uint64 {
 	return b.Header.BlockBodySize()
 }
 
-func (b *AlonzoBlock) Era() Era {
+func (b *AlonzoBlock) Era() common.Era {
 	return EraAlonzo
 }
 
-func (b *AlonzoBlock) Transactions() []Transaction {
+func (b *AlonzoBlock) Transactions() []common.Transaction {
 	invalidTxMap := make(map[uint]bool, len(b.InvalidTransactions))
 	for _, invalidTxIdx := range b.InvalidTransactions {
 		invalidTxMap[invalidTxIdx] = true
 	}
 
-	ret := make([]Transaction, len(b.TransactionBodies))
+	ret := make([]common.Transaction, len(b.TransactionBodies))
 	for idx := range b.TransactionBodies {
 		ret[idx] = &AlonzoTransaction{
 			Body:       b.TransactionBodies[idx],
@@ -126,33 +128,33 @@ func (b *AlonzoBlock) Utxorpc() *utxorpc.Block {
 }
 
 type AlonzoBlockHeader struct {
-	ShelleyBlockHeader
+	shelley.ShelleyBlockHeader
 }
 
-func (h *AlonzoBlockHeader) Era() Era {
+func (h *AlonzoBlockHeader) Era() common.Era {
 	return EraAlonzo
 }
 
 type AlonzoTransactionBody struct {
-	MaryTransactionBody
+	mary.MaryTransactionBody
 	TxOutputs []AlonzoTransactionOutput `cbor:"1,keyasint,omitempty"`
 	Update    struct {
 		cbor.StructAsArray
-		ProtocolParamUpdates map[Blake2b224]AlonzoProtocolParameterUpdate
+		ProtocolParamUpdates map[common.Blake2b224]AlonzoProtocolParameterUpdate
 		Epoch                uint64
 	} `cbor:"6,keyasint,omitempty"`
-	TxScriptDataHash  *Blake2b256               `cbor:"11,keyasint,omitempty"`
-	TxCollateral      []ShelleyTransactionInput `cbor:"13,keyasint,omitempty"`
-	TxRequiredSigners []Blake2b224              `cbor:"14,keyasint,omitempty"`
-	NetworkId         uint8                     `cbor:"15,keyasint,omitempty"`
+	TxScriptDataHash  *common.Blake2b256                `cbor:"11,keyasint,omitempty"`
+	TxCollateral      []shelley.ShelleyTransactionInput `cbor:"13,keyasint,omitempty"`
+	TxRequiredSigners []common.Blake2b224               `cbor:"14,keyasint,omitempty"`
+	NetworkId         uint8                             `cbor:"15,keyasint,omitempty"`
 }
 
 func (b *AlonzoTransactionBody) UnmarshalCBOR(cborData []byte) error {
 	return b.UnmarshalCbor(cborData, b)
 }
 
-func (b *AlonzoTransactionBody) Outputs() []TransactionOutput {
-	ret := []TransactionOutput{}
+func (b *AlonzoTransactionBody) Outputs() []common.TransactionOutput {
+	ret := []common.TransactionOutput{}
 	for _, output := range b.TxOutputs {
 		output := output
 		ret = append(ret, &output)
@@ -160,46 +162,46 @@ func (b *AlonzoTransactionBody) Outputs() []TransactionOutput {
 	return ret
 }
 
-func (b *AlonzoTransactionBody) ProtocolParametersUpdate() map[Blake2b224]any {
-	updateMap := make(map[Blake2b224]any)
+func (b *AlonzoTransactionBody) ProtocolParametersUpdate() map[common.Blake2b224]any {
+	updateMap := make(map[common.Blake2b224]any)
 	for k, v := range b.Update.ProtocolParamUpdates {
 		updateMap[k] = v
 	}
 	return updateMap
 }
 
-func (b *AlonzoTransactionBody) Collateral() []TransactionInput {
-	ret := []TransactionInput{}
+func (b *AlonzoTransactionBody) Collateral() []common.TransactionInput {
+	ret := []common.TransactionInput{}
 	for _, collateral := range b.TxCollateral {
 		ret = append(ret, collateral)
 	}
 	return ret
 }
 
-func (b *AlonzoTransactionBody) RequiredSigners() []Blake2b224 {
+func (b *AlonzoTransactionBody) RequiredSigners() []common.Blake2b224 {
 	return b.TxRequiredSigners[:]
 }
 
-func (b *AlonzoTransactionBody) ScriptDataHash() *Blake2b256 {
+func (b *AlonzoTransactionBody) ScriptDataHash() *common.Blake2b256 {
 	return b.TxScriptDataHash
 }
 
 type AlonzoTransactionOutput struct {
 	cbor.StructAsArray
 	cbor.DecodeStoreCbor
-	OutputAddress     Address
-	OutputAmount      MaryTransactionOutputValue
-	TxOutputDatumHash *Blake2b256
+	OutputAddress     common.Address
+	OutputAmount      mary.MaryTransactionOutputValue
+	TxOutputDatumHash *common.Blake2b256
 	legacyOutput      bool
 }
 
 func (o *AlonzoTransactionOutput) UnmarshalCBOR(cborData []byte) error {
 	// Save original CBOR
 	o.SetCbor(cborData)
-	// Try to parse as legacy Mary output first
-	var tmpOutput MaryTransactionOutput
+	// Try to parse as legacy mary.Mary output first
+	var tmpOutput mary.MaryTransactionOutput
 	if _, err := cbor.Decode(cborData, &tmpOutput); err == nil {
-		// Copy from temp Mary output to Alonzo format
+		// Copy from temp mary.Mary output to Alonzo format
 		o.OutputAddress = tmpOutput.OutputAddress
 		o.OutputAmount = tmpOutput.OutputAmount
 		o.legacyOutput = true
@@ -211,7 +213,7 @@ func (o *AlonzoTransactionOutput) UnmarshalCBOR(cborData []byte) error {
 
 func (o *AlonzoTransactionOutput) MarshalCBOR() ([]byte, error) {
 	if o.legacyOutput {
-		tmpOutput := MaryTransactionOutput{
+		tmpOutput := mary.MaryTransactionOutput{
 			OutputAddress: o.OutputAddress,
 			OutputAmount:  o.OutputAmount,
 		}
@@ -222,7 +224,7 @@ func (o *AlonzoTransactionOutput) MarshalCBOR() ([]byte, error) {
 
 func (o AlonzoTransactionOutput) MarshalJSON() ([]byte, error) {
 	tmpObj := struct {
-		Address   Address                                         `json:"address"`
+		Address   common.Address                                  `json:"address"`
 		Amount    uint64                                          `json:"amount"`
 		Assets    *common.MultiAsset[common.MultiAssetTypeOutput] `json:"assets,omitempty"`
 		DatumHash string                                          `json:"datumHash,omitempty"`
@@ -237,7 +239,7 @@ func (o AlonzoTransactionOutput) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&tmpObj)
 }
 
-func (o AlonzoTransactionOutput) Address() Address {
+func (o AlonzoTransactionOutput) Address() common.Address {
 	return o.OutputAddress
 }
 
@@ -249,7 +251,7 @@ func (o AlonzoTransactionOutput) Assets() *common.MultiAsset[common.MultiAssetTy
 	return o.OutputAmount.Assets
 }
 
-func (o AlonzoTransactionOutput) DatumHash() *Blake2b256 {
+func (o AlonzoTransactionOutput) DatumHash() *common.Blake2b256 {
 	return o.TxOutputDatumHash
 }
 
@@ -292,17 +294,11 @@ type AlonzoRedeemer struct {
 	Tag     uint8
 	Index   uint32
 	Data    cbor.RawMessage
-	ExUnits RedeemerExUnits
-}
-
-type RedeemerExUnits struct {
-	cbor.StructAsArray
-	Memory uint64
-	Steps  uint64
+	ExUnits common.RedeemerExUnits
 }
 
 type AlonzoTransactionWitnessSet struct {
-	ShelleyTransactionWitnessSet
+	shelley.ShelleyTransactionWitnessSet
 	PlutusScripts []cbor.RawMessage `cbor:"3,keyasint,omitempty"`
 	PlutusData    []cbor.RawMessage `cbor:"4,keyasint,omitempty"`
 	Redeemers     []AlonzoRedeemer  `cbor:"5,keyasint,omitempty"`
@@ -325,11 +321,11 @@ func (t AlonzoTransaction) Hash() string {
 	return t.Body.Hash()
 }
 
-func (t AlonzoTransaction) Inputs() []TransactionInput {
+func (t AlonzoTransaction) Inputs() []common.TransactionInput {
 	return t.Body.Inputs()
 }
 
-func (t AlonzoTransaction) Outputs() []TransactionOutput {
+func (t AlonzoTransaction) Outputs() []common.TransactionOutput {
 	return t.Body.Outputs()
 }
 
@@ -345,19 +341,19 @@ func (t AlonzoTransaction) ValidityIntervalStart() uint64 {
 	return t.Body.ValidityIntervalStart()
 }
 
-func (t AlonzoTransaction) ProtocolParametersUpdate() map[Blake2b224]any {
+func (t AlonzoTransaction) ProtocolParametersUpdate() map[common.Blake2b224]any {
 	return t.Body.ProtocolParametersUpdate()
 }
 
-func (t AlonzoTransaction) ReferenceInputs() []TransactionInput {
+func (t AlonzoTransaction) ReferenceInputs() []common.TransactionInput {
 	return t.Body.ReferenceInputs()
 }
 
-func (t AlonzoTransaction) Collateral() []TransactionInput {
+func (t AlonzoTransaction) Collateral() []common.TransactionInput {
 	return t.Body.Collateral()
 }
 
-func (t AlonzoTransaction) CollateralReturn() TransactionOutput {
+func (t AlonzoTransaction) CollateralReturn() common.TransactionOutput {
 	return t.Body.CollateralReturn()
 }
 
@@ -365,19 +361,19 @@ func (t AlonzoTransaction) TotalCollateral() uint64 {
 	return t.Body.TotalCollateral()
 }
 
-func (t AlonzoTransaction) Certificates() []Certificate {
+func (t AlonzoTransaction) Certificates() []common.Certificate {
 	return t.Body.Certificates()
 }
 
-func (t AlonzoTransaction) Withdrawals() map[*Address]uint64 {
+func (t AlonzoTransaction) Withdrawals() map[*common.Address]uint64 {
 	return t.Body.Withdrawals()
 }
 
-func (t AlonzoTransaction) AuxDataHash() *Blake2b256 {
+func (t AlonzoTransaction) AuxDataHash() *common.Blake2b256 {
 	return t.Body.AuxDataHash()
 }
 
-func (t AlonzoTransaction) RequiredSigners() []Blake2b224 {
+func (t AlonzoTransaction) RequiredSigners() []common.Blake2b224 {
 	return t.Body.RequiredSigners()
 }
 
@@ -385,15 +381,15 @@ func (t AlonzoTransaction) AssetMint() *common.MultiAsset[common.MultiAssetTypeM
 	return t.Body.AssetMint()
 }
 
-func (t AlonzoTransaction) ScriptDataHash() *Blake2b256 {
+func (t AlonzoTransaction) ScriptDataHash() *common.Blake2b256 {
 	return t.Body.ScriptDataHash()
 }
 
-func (t AlonzoTransaction) VotingProcedures() VotingProcedures {
+func (t AlonzoTransaction) VotingProcedures() common.VotingProcedures {
 	return t.Body.VotingProcedures()
 }
 
-func (t AlonzoTransaction) ProposalProcedures() []ProposalProcedure {
+func (t AlonzoTransaction) ProposalProcedures() []common.ProposalProcedure {
 	return t.Body.ProposalProcedures()
 }
 
@@ -413,7 +409,7 @@ func (t AlonzoTransaction) IsValid() bool {
 	return t.IsTxValid
 }
 
-func (t AlonzoTransaction) Consumed() []TransactionInput {
+func (t AlonzoTransaction) Consumed() []common.TransactionInput {
 	if t.IsValid() {
 		return t.Inputs()
 	} else {
@@ -421,14 +417,14 @@ func (t AlonzoTransaction) Consumed() []TransactionInput {
 	}
 }
 
-func (t AlonzoTransaction) Produced() []Utxo {
+func (t AlonzoTransaction) Produced() []common.Utxo {
 	if t.IsValid() {
-		var ret []Utxo
+		var ret []common.Utxo
 		for idx, output := range t.Outputs() {
 			ret = append(
 				ret,
-				Utxo{
-					Id:     NewShelleyTransactionInput(t.Hash(), idx),
+				common.Utxo{
+					Id:     shelley.NewShelleyTransactionInput(t.Hash(), idx),
 					Output: output,
 				},
 			)
@@ -436,7 +432,7 @@ func (t AlonzoTransaction) Produced() []Utxo {
 		return ret
 	} else {
 		// No collateral return in Alonzo
-		return []Utxo{}
+		return []common.Utxo{}
 	}
 }
 
@@ -484,7 +480,7 @@ type ExUnitPrice struct {
 }
 
 type AlonzoProtocolParameters struct {
-	MaryProtocolParameters
+	mary.MaryProtocolParameters
 	MinPoolCost          uint
 	AdaPerUtxoByte       uint
 	CostModels           uint
@@ -497,7 +493,7 @@ type AlonzoProtocolParameters struct {
 }
 
 type AlonzoProtocolParameterUpdate struct {
-	MaryProtocolParameterUpdate
+	mary.MaryProtocolParameterUpdate
 	MinPoolCost          uint            `cbor:"16,keyasint"`
 	AdaPerUtxoByte       uint            `cbor:"17,keyasint"`
 	CostModels           map[uint][]uint `cbor:"18,keyasint"`
diff --git a/ledger/babbage.go b/ledger/babbage/babbage.go
similarity index 83%
rename from ledger/babbage.go
rename to ledger/babbage/babbage.go
index 5b74f516..6ce818d2 100644
--- a/ledger/babbage.go
+++ b/ledger/babbage/babbage.go
@@ -1,4 +1,4 @@
-// Copyright 2023 Blink Labs Software
+// Copyright 2024 Blink Labs Software
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package ledger
+package babbage
 
 import (
 	"encoding/hex"
@@ -20,7 +20,10 @@ import (
 	"fmt"
 
 	"github.com/blinklabs-io/gouroboros/cbor"
+	"github.com/blinklabs-io/gouroboros/ledger/alonzo"
 	"github.com/blinklabs-io/gouroboros/ledger/common"
+	"github.com/blinklabs-io/gouroboros/ledger/mary"
+	"github.com/blinklabs-io/gouroboros/ledger/shelley"
 
 	utxorpc "github.com/utxorpc/go-codegen/utxorpc/v1alpha/cardano"
 )
@@ -73,7 +76,7 @@ func (b *BabbageBlock) SlotNumber() uint64 {
 	return b.Header.SlotNumber()
 }
 
-func (b *BabbageBlock) IssuerVkey() IssuerVkey {
+func (b *BabbageBlock) IssuerVkey() common.IssuerVkey {
 	return b.Header.IssuerVkey()
 }
 
@@ -81,17 +84,17 @@ func (b *BabbageBlock) BlockBodySize() uint64 {
 	return b.Header.BlockBodySize()
 }
 
-func (b *BabbageBlock) Era() Era {
+func (b *BabbageBlock) Era() common.Era {
 	return EraBabbage
 }
 
-func (b *BabbageBlock) Transactions() []Transaction {
+func (b *BabbageBlock) Transactions() []common.Transaction {
 	invalidTxMap := make(map[uint]bool, len(b.InvalidTransactions))
 	for _, invalidTxIdx := range b.InvalidTransactions {
 		invalidTxMap[invalidTxIdx] = true
 	}
 
-	ret := make([]Transaction, len(b.TransactionBodies))
+	ret := make([]common.Transaction, len(b.TransactionBodies))
 	for idx := range b.TransactionBodies {
 		ret[idx] = &BabbageTransaction{
 			Body:       b.TransactionBodies[idx],
@@ -133,12 +136,12 @@ type BabbageBlockHeader struct {
 		cbor.StructAsArray
 		BlockNumber   uint64
 		Slot          uint64
-		PrevHash      Blake2b256
-		IssuerVkey    IssuerVkey
+		PrevHash      common.Blake2b256
+		IssuerVkey    common.IssuerVkey
 		VrfKey        []byte
 		VrfResult     interface{}
 		BlockBodySize uint64
-		BlockBodyHash Blake2b256
+		BlockBodyHash common.Blake2b256
 		OpCert        struct {
 			cbor.StructAsArray
 			HotVkey        []byte
@@ -161,7 +164,8 @@ func (h *BabbageBlockHeader) UnmarshalCBOR(cborData []byte) error {
 
 func (h *BabbageBlockHeader) Hash() string {
 	if h.hash == "" {
-		h.hash = generateBlockHeaderHash(h.Cbor(), nil)
+		tmpHash := common.Blake2b256Hash(h.Cbor())
+		h.hash = hex.EncodeToString(tmpHash.Bytes())
 	}
 	return h.hash
 }
@@ -174,7 +178,7 @@ func (h *BabbageBlockHeader) SlotNumber() uint64 {
 	return h.Body.Slot
 }
 
-func (h *BabbageBlockHeader) IssuerVkey() IssuerVkey {
+func (h *BabbageBlockHeader) IssuerVkey() common.IssuerVkey {
 	return h.Body.IssuerVkey
 }
 
@@ -182,29 +186,29 @@ func (h *BabbageBlockHeader) BlockBodySize() uint64 {
 	return h.Body.BlockBodySize
 }
 
-func (h *BabbageBlockHeader) Era() Era {
+func (h *BabbageBlockHeader) Era() common.Era {
 	return EraBabbage
 }
 
 type BabbageTransactionBody struct {
-	AlonzoTransactionBody
+	alonzo.AlonzoTransactionBody
 	TxOutputs []BabbageTransactionOutput `cbor:"1,keyasint,omitempty"`
 	Update    struct {
 		cbor.StructAsArray
-		ProtocolParamUpdates map[Blake2b224]BabbageProtocolParameterUpdate
+		ProtocolParamUpdates map[common.Blake2b224]BabbageProtocolParameterUpdate
 		Epoch                uint64
 	} `cbor:"6,keyasint,omitempty"`
-	TxCollateralReturn *BabbageTransactionOutput `cbor:"16,keyasint,omitempty"`
-	TxTotalCollateral  uint64                    `cbor:"17,keyasint,omitempty"`
-	TxReferenceInputs  []ShelleyTransactionInput `cbor:"18,keyasint,omitempty"`
+	TxCollateralReturn *BabbageTransactionOutput         `cbor:"16,keyasint,omitempty"`
+	TxTotalCollateral  uint64                            `cbor:"17,keyasint,omitempty"`
+	TxReferenceInputs  []shelley.ShelleyTransactionInput `cbor:"18,keyasint,omitempty"`
 }
 
 func (b *BabbageTransactionBody) UnmarshalCBOR(cborData []byte) error {
 	return b.UnmarshalCbor(cborData, b)
 }
 
-func (b *BabbageTransactionBody) Outputs() []TransactionOutput {
-	ret := []TransactionOutput{}
+func (b *BabbageTransactionBody) Outputs() []common.TransactionOutput {
+	ret := []common.TransactionOutput{}
 	for _, output := range b.TxOutputs {
 		output := output
 		ret = append(ret, &output)
@@ -212,16 +216,16 @@ func (b *BabbageTransactionBody) Outputs() []TransactionOutput {
 	return ret
 }
 
-func (b *BabbageTransactionBody) ProtocolParametersUpdate() map[Blake2b224]any {
-	updateMap := make(map[Blake2b224]any)
+func (b *BabbageTransactionBody) ProtocolParametersUpdate() map[common.Blake2b224]any {
+	updateMap := make(map[common.Blake2b224]any)
 	for k, v := range b.Update.ProtocolParamUpdates {
 		updateMap[k] = v
 	}
 	return updateMap
 }
 
-func (b *BabbageTransactionBody) ReferenceInputs() []TransactionInput {
-	ret := []TransactionInput{}
+func (b *BabbageTransactionBody) ReferenceInputs() []common.TransactionInput {
+	ret := []common.TransactionInput{}
 	for _, input := range b.TxReferenceInputs {
 		input := input
 		ret = append(ret, &input)
@@ -229,7 +233,7 @@ func (b *BabbageTransactionBody) ReferenceInputs() []TransactionInput {
 	return ret
 }
 
-func (b *BabbageTransactionBody) CollateralReturn() TransactionOutput {
+func (b *BabbageTransactionBody) CollateralReturn() common.TransactionOutput {
 	// Return an actual nil if we have no value. If we return our nil pointer,
 	// we get a non-nil interface containing a nil value, which is harder to
 	// compare against
@@ -286,7 +290,7 @@ const (
 )
 
 type BabbageTransactionOutputDatumOption struct {
-	hash *Blake2b256
+	hash *common.Blake2b256
 	data *cbor.LazyValue
 }
 
@@ -300,7 +304,7 @@ func (d *BabbageTransactionOutputDatumOption) UnmarshalCBOR(data []byte) error {
 		var tmpDatumHash struct {
 			cbor.StructAsArray
 			Type int
-			Hash Blake2b256
+			Hash common.Blake2b256
 		}
 		if _, err := cbor.Decode(data, &tmpDatumHash); err != nil {
 			return err
@@ -340,8 +344,8 @@ func (d *BabbageTransactionOutputDatumOption) MarshalCBOR() ([]byte, error) {
 
 type BabbageTransactionOutput struct {
 	cbor.DecodeStoreCbor
-	OutputAddress Address                              `cbor:"0,keyasint,omitempty"`
-	OutputAmount  MaryTransactionOutputValue           `cbor:"1,keyasint,omitempty"`
+	OutputAddress common.Address                       `cbor:"0,keyasint,omitempty"`
+	OutputAmount  mary.MaryTransactionOutputValue      `cbor:"1,keyasint,omitempty"`
 	DatumOption   *BabbageTransactionOutputDatumOption `cbor:"2,keyasint,omitempty"`
 	ScriptRef     *cbor.Tag                            `cbor:"3,keyasint,omitempty"`
 	legacyOutput  bool
@@ -351,7 +355,7 @@ func (o *BabbageTransactionOutput) UnmarshalCBOR(cborData []byte) error {
 	// Save original CBOR
 	o.SetCbor(cborData)
 	// Try to parse as legacy output first
-	var tmpOutput AlonzoTransactionOutput
+	var tmpOutput alonzo.AlonzoTransactionOutput
 	if _, err := cbor.Decode(cborData, &tmpOutput); err == nil {
 		// Copy from temp legacy object to Babbage format
 		o.OutputAddress = tmpOutput.OutputAddress
@@ -365,7 +369,7 @@ func (o *BabbageTransactionOutput) UnmarshalCBOR(cborData []byte) error {
 
 func (o *BabbageTransactionOutput) MarshalCBOR() ([]byte, error) {
 	if o.legacyOutput {
-		tmpOutput := AlonzoTransactionOutput{
+		tmpOutput := alonzo.AlonzoTransactionOutput{
 			OutputAddress: o.OutputAddress,
 			OutputAmount:  o.OutputAmount,
 		}
@@ -376,7 +380,7 @@ func (o *BabbageTransactionOutput) MarshalCBOR() ([]byte, error) {
 
 func (o BabbageTransactionOutput) MarshalJSON() ([]byte, error) {
 	tmpObj := struct {
-		Address   Address                                         `json:"address"`
+		Address   common.Address                                  `json:"address"`
 		Amount    uint64                                          `json:"amount"`
 		Assets    *common.MultiAsset[common.MultiAssetTypeOutput] `json:"assets,omitempty"`
 		Datum     *cbor.LazyValue                                 `json:"datum,omitempty"`
@@ -397,7 +401,7 @@ func (o BabbageTransactionOutput) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&tmpObj)
 }
 
-func (o BabbageTransactionOutput) Address() Address {
+func (o BabbageTransactionOutput) Address() common.Address {
 	return o.OutputAddress
 }
 
@@ -409,11 +413,11 @@ func (o BabbageTransactionOutput) Assets() *common.MultiAsset[common.MultiAssetT
 	return o.OutputAmount.Assets
 }
 
-func (o BabbageTransactionOutput) DatumHash() *Blake2b256 {
+func (o BabbageTransactionOutput) DatumHash() *common.Blake2b256 {
 	if o.DatumOption != nil {
 		return o.DatumOption.hash
 	}
-	return &Blake2b256{}
+	return &common.Blake2b256{}
 }
 
 func (o BabbageTransactionOutput) Datum() *cbor.LazyValue {
@@ -470,7 +474,7 @@ func (o BabbageTransactionOutput) Utxorpc() *utxorpc.TxOutput {
 }
 
 type BabbageTransactionWitnessSet struct {
-	AlonzoTransactionWitnessSet
+	alonzo.AlonzoTransactionWitnessSet
 	PlutusV2Scripts []cbor.RawMessage `cbor:"6,keyasint,omitempty"`
 }
 
@@ -491,11 +495,11 @@ func (t BabbageTransaction) Hash() string {
 	return t.Body.Hash()
 }
 
-func (t BabbageTransaction) Inputs() []TransactionInput {
+func (t BabbageTransaction) Inputs() []common.TransactionInput {
 	return t.Body.Inputs()
 }
 
-func (t BabbageTransaction) Outputs() []TransactionOutput {
+func (t BabbageTransaction) Outputs() []common.TransactionOutput {
 	return t.Body.Outputs()
 }
 
@@ -511,19 +515,19 @@ func (t BabbageTransaction) ValidityIntervalStart() uint64 {
 	return t.Body.ValidityIntervalStart()
 }
 
-func (t BabbageTransaction) ProtocolParametersUpdate() map[Blake2b224]any {
+func (t BabbageTransaction) ProtocolParametersUpdate() map[common.Blake2b224]any {
 	return t.Body.ProtocolParametersUpdate()
 }
 
-func (t BabbageTransaction) ReferenceInputs() []TransactionInput {
+func (t BabbageTransaction) ReferenceInputs() []common.TransactionInput {
 	return t.Body.ReferenceInputs()
 }
 
-func (t BabbageTransaction) Collateral() []TransactionInput {
+func (t BabbageTransaction) Collateral() []common.TransactionInput {
 	return t.Body.Collateral()
 }
 
-func (t BabbageTransaction) CollateralReturn() TransactionOutput {
+func (t BabbageTransaction) CollateralReturn() common.TransactionOutput {
 	return t.Body.CollateralReturn()
 }
 
@@ -531,27 +535,27 @@ func (t BabbageTransaction) TotalCollateral() uint64 {
 	return t.Body.TotalCollateral()
 }
 
-func (t BabbageTransaction) Certificates() []Certificate {
+func (t BabbageTransaction) Certificates() []common.Certificate {
 	return t.Body.Certificates()
 }
 
-func (t BabbageTransaction) Withdrawals() map[*Address]uint64 {
+func (t BabbageTransaction) Withdrawals() map[*common.Address]uint64 {
 	return t.Body.Withdrawals()
 }
 
-func (t BabbageTransaction) AuxDataHash() *Blake2b256 {
+func (t BabbageTransaction) AuxDataHash() *common.Blake2b256 {
 	return t.Body.AuxDataHash()
 }
 
-func (t BabbageTransaction) ScriptDataHash() *Blake2b256 {
+func (t BabbageTransaction) ScriptDataHash() *common.Blake2b256 {
 	return t.Body.ScriptDataHash()
 }
 
-func (t BabbageTransaction) VotingProcedures() VotingProcedures {
+func (t BabbageTransaction) VotingProcedures() common.VotingProcedures {
 	return t.Body.VotingProcedures()
 }
 
-func (t BabbageTransaction) RequiredSigners() []Blake2b224 {
+func (t BabbageTransaction) RequiredSigners() []common.Blake2b224 {
 	return t.Body.RequiredSigners()
 }
 
@@ -559,7 +563,7 @@ func (t BabbageTransaction) AssetMint() *common.MultiAsset[common.MultiAssetType
 	return t.Body.AssetMint()
 }
 
-func (t BabbageTransaction) ProposalProcedures() []ProposalProcedure {
+func (t BabbageTransaction) ProposalProcedures() []common.ProposalProcedure {
 	return t.Body.ProposalProcedures()
 }
 
@@ -579,7 +583,7 @@ func (t BabbageTransaction) IsValid() bool {
 	return t.IsTxValid
 }
 
-func (t BabbageTransaction) Consumed() []TransactionInput {
+func (t BabbageTransaction) Consumed() []common.TransactionInput {
 	if t.IsValid() {
 		return t.Inputs()
 	} else {
@@ -587,14 +591,14 @@ func (t BabbageTransaction) Consumed() []TransactionInput {
 	}
 }
 
-func (t BabbageTransaction) Produced() []Utxo {
+func (t BabbageTransaction) Produced() []common.Utxo {
 	if t.IsValid() {
-		var ret []Utxo
+		var ret []common.Utxo
 		for idx, output := range t.Outputs() {
 			ret = append(
 				ret,
-				Utxo{
-					Id:     NewShelleyTransactionInput(t.Hash(), idx),
+				common.Utxo{
+					Id:     shelley.NewShelleyTransactionInput(t.Hash(), idx),
 					Output: output,
 				},
 			)
@@ -602,11 +606,11 @@ func (t BabbageTransaction) Produced() []Utxo {
 		return ret
 	} else {
 		if t.CollateralReturn() == nil {
-			return []Utxo{}
+			return []common.Utxo{}
 		}
-		return []Utxo{
+		return []common.Utxo{
 			{
-				Id:     NewShelleyTransactionInput(t.Hash(), len(t.Outputs())),
+				Id:     shelley.NewShelleyTransactionInput(t.Hash(), len(t.Outputs())),
 				Output: t.CollateralReturn(),
 			},
 		}
diff --git a/ledger/babbage_test.go b/ledger/babbage/babbage_test.go
similarity index 95%
rename from ledger/babbage_test.go
rename to ledger/babbage/babbage_test.go
index aa7dfb8e..249b5487 100644
--- a/ledger/babbage_test.go
+++ b/ledger/babbage/babbage_test.go
@@ -1,9 +1,27 @@
-package ledger
+// Copyright 2024 Blink Labs Software
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package babbage
 
 import (
 	"encoding/hex"
 	"testing"
 
+	"github.com/blinklabs-io/gouroboros/ledger/alonzo"
+	"github.com/blinklabs-io/gouroboros/ledger/common"
+	"github.com/blinklabs-io/gouroboros/ledger/mary"
+	"github.com/blinklabs-io/gouroboros/ledger/shelley"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -28,8 +46,8 @@ func TestBabbageBlockTransactions(t *testing.T) {
 			TxTotalCollateral: 1 << i,
 		}
 		b.TransactionWitnessSets[i] = BabbageTransactionWitnessSet{
-			AlonzoTransactionWitnessSet: AlonzoTransactionWitnessSet{
-				ShelleyTransactionWitnessSet: ShelleyTransactionWitnessSet{
+			AlonzoTransactionWitnessSet: alonzo.AlonzoTransactionWitnessSet{
+				ShelleyTransactionWitnessSet: shelley.ShelleyTransactionWitnessSet{
 					VkeyWitnesses: []interface{}{
 						append(make([]byte, 95), 1<<i),
 					},
@@ -2755,8 +2773,8 @@ type TxOutput struct {
 
 func TestBabbageTransactionOutput_Utxorpc_DatumOptionNil(t *testing.T) {
 	output := BabbageTransactionOutput{
-		OutputAddress: Address{},
-		OutputAmount: MaryTransactionOutputValue{
+		OutputAddress: common.Address{},
+		OutputAmount: mary.MaryTransactionOutputValue{
 			Amount: 1000,
 		},
 		DatumOption: &BabbageTransactionOutputDatumOption{},
@@ -2772,8 +2790,8 @@ func TestBabbageTransactionOutput_Utxorpc_DatumOptionNil(t *testing.T) {
 
 func TestBabbageTransactionOutput_DatumHashReturnsNil(t *testing.T) {
 	output := BabbageTransactionOutput{
-		OutputAddress: Address{},
-		OutputAmount: MaryTransactionOutputValue{
+		OutputAddress: common.Address{},
+		OutputAmount: mary.MaryTransactionOutputValue{
 			Amount: 1000,
 		},
 		DatumOption: &BabbageTransactionOutputDatumOption{},
diff --git a/ledger/block.go b/ledger/block.go
index 9d0621c2..7d2fbdb9 100644
--- a/ledger/block.go
+++ b/ledger/block.go
@@ -15,11 +15,9 @@
 package ledger
 
 import (
-	"encoding/hex"
 	"fmt"
 
 	utxorpc "github.com/utxorpc/go-codegen/utxorpc/v1alpha/cardano"
-	"golang.org/x/crypto/blake2b"
 )
 
 type Block interface {
@@ -103,20 +101,3 @@ func DetermineBlockType(data []byte) (uint, error) {
 	}
 	return 0, fmt.Errorf("unknown block type")
 }
-
-func generateBlockHeaderHash(data []byte, prefix []byte) string {
-	tmpHash, err := blake2b.New256(nil)
-	if err != nil {
-		panic(
-			fmt.Sprintf(
-				"unexpected error generating empty blake2b hash: %s",
-				err,
-			),
-		)
-	}
-	if prefix != nil {
-		tmpHash.Write(prefix)
-	}
-	tmpHash.Write(data)
-	return hex.EncodeToString(tmpHash.Sum(nil))
-}
diff --git a/ledger/byron.go b/ledger/byron/byron.go
similarity index 81%
rename from ledger/byron.go
rename to ledger/byron/byron.go
index 0129f896..57fa4777 100644
--- a/ledger/byron.go
+++ b/ledger/byron/byron.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package ledger
+package byron
 
 import (
 	"encoding/hex"
@@ -54,7 +54,7 @@ type ByronMainBlockHeader struct {
 	cbor.DecodeStoreCbor
 	hash          string
 	ProtocolMagic uint32
-	PrevBlock     Blake2b256
+	PrevBlock     common.Blake2b256
 	BodyProof     interface{}
 	ConsensusData struct {
 		cbor.StructAsArray
@@ -85,7 +85,7 @@ type ByronMainBlockHeader struct {
 			Unknown uint32
 		}
 		Attributes interface{}
-		ExtraProof Blake2b256
+		ExtraProof common.Blake2b256
 	}
 }
 
@@ -99,10 +99,13 @@ func (h *ByronMainBlockHeader) Hash() string {
 		// Prepend bytes for CBOR list wrapper
 		// The block hash is calculated with these extra bytes, so we have to add them to
 		// get the correct value
-		h.hash = generateBlockHeaderHash(
-			h.Cbor(),
-			[]byte{0x82, BlockTypeByronMain},
+		tmpHash := common.Blake2b256Hash(
+			append(
+				[]byte{0x82, BlockTypeByronMain},
+				h.Cbor()...,
+			),
 		)
+		h.hash = hex.EncodeToString(tmpHash.Bytes())
 	}
 	return h.hash
 }
@@ -120,9 +123,9 @@ func (h *ByronMainBlockHeader) SlotNumber() uint64 {
 	)
 }
 
-func (h *ByronMainBlockHeader) IssuerVkey() IssuerVkey {
+func (h *ByronMainBlockHeader) IssuerVkey() common.IssuerVkey {
 	// Byron blocks don't have an issuer
-	return IssuerVkey{}
+	return common.IssuerVkey{}
 }
 
 func (h *ByronMainBlockHeader) BlockBodySize() uint64 {
@@ -130,7 +133,7 @@ func (h *ByronMainBlockHeader) BlockBodySize() uint64 {
 	return 0
 }
 
-func (h *ByronMainBlockHeader) Era() Era {
+func (h *ByronMainBlockHeader) Era() common.Era {
 	return EraByron
 }
 
@@ -150,21 +153,22 @@ func (t *ByronTransaction) UnmarshalCBOR(data []byte) error {
 
 func (t *ByronTransaction) Hash() string {
 	if t.hash == "" {
-		t.hash = generateTransactionHash(t.Cbor(), nil)
+		tmpHash := common.Blake2b256Hash(t.Cbor())
+		t.hash = hex.EncodeToString(tmpHash.Bytes())
 	}
 	return t.hash
 }
 
-func (t *ByronTransaction) Inputs() []TransactionInput {
-	ret := []TransactionInput{}
+func (t *ByronTransaction) Inputs() []common.TransactionInput {
+	ret := []common.TransactionInput{}
 	for _, input := range t.TxInputs {
 		ret = append(ret, input)
 	}
 	return ret
 }
 
-func (t *ByronTransaction) Outputs() []TransactionOutput {
-	ret := []TransactionOutput{}
+func (t *ByronTransaction) Outputs() []common.TransactionOutput {
+	ret := []common.TransactionOutput{}
 	for _, output := range t.TxOutputs {
 		output := output
 		ret = append(ret, &output)
@@ -189,17 +193,17 @@ func (t *ByronTransaction) ValidityIntervalStart() uint64 {
 	return 0
 }
 
-func (t *ByronTransaction) ReferenceInputs() []TransactionInput {
+func (t *ByronTransaction) ReferenceInputs() []common.TransactionInput {
 	// No reference inputs in Byron
 	return nil
 }
 
-func (t *ByronTransaction) Collateral() []TransactionInput {
+func (t *ByronTransaction) Collateral() []common.TransactionInput {
 	// No collateral in Byron
 	return nil
 }
 
-func (t *ByronTransaction) CollateralReturn() TransactionOutput {
+func (t *ByronTransaction) CollateralReturn() common.TransactionOutput {
 	// No collateral in Byron
 	return nil
 }
@@ -209,22 +213,22 @@ func (t *ByronTransaction) TotalCollateral() uint64 {
 	return 0
 }
 
-func (t *ByronTransaction) Certificates() []Certificate {
+func (t *ByronTransaction) Certificates() []common.Certificate {
 	// No certificates in Byron
 	return nil
 }
 
-func (t *ByronTransaction) Withdrawals() map[*Address]uint64 {
+func (t *ByronTransaction) Withdrawals() map[*common.Address]uint64 {
 	// No withdrawals in Byron
 	return nil
 }
 
-func (t *ByronTransaction) AuxDataHash() *Blake2b256 {
+func (t *ByronTransaction) AuxDataHash() *common.Blake2b256 {
 	// No aux data hash in Byron
 	return nil
 }
 
-func (t *ByronTransaction) RequiredSigners() []Blake2b224 {
+func (t *ByronTransaction) RequiredSigners() []common.Blake2b224 {
 	// No required signers in Byron
 	return nil
 }
@@ -234,17 +238,17 @@ func (t *ByronTransaction) AssetMint() *common.MultiAsset[common.MultiAssetTypeM
 	return nil
 }
 
-func (t *ByronTransaction) ScriptDataHash() *Blake2b256 {
+func (t *ByronTransaction) ScriptDataHash() *common.Blake2b256 {
 	// No script data hash in Byron
 	return nil
 }
 
-func (t *ByronTransaction) VotingProcedures() VotingProcedures {
+func (t *ByronTransaction) VotingProcedures() common.VotingProcedures {
 	// No voting procedures in Byron
 	return nil
 }
 
-func (t *ByronTransaction) ProposalProcedures() []ProposalProcedure {
+func (t *ByronTransaction) ProposalProcedures() []common.ProposalProcedure {
 	// No proposal procedures in Byron
 	return nil
 }
@@ -267,16 +271,16 @@ func (t *ByronTransaction) IsValid() bool {
 	return true
 }
 
-func (t *ByronTransaction) Consumed() []TransactionInput {
+func (t *ByronTransaction) Consumed() []common.TransactionInput {
 	return t.Inputs()
 }
 
-func (t *ByronTransaction) Produced() []Utxo {
-	var ret []Utxo
+func (t *ByronTransaction) Produced() []common.Utxo {
+	var ret []common.Utxo
 	for idx, output := range t.Outputs() {
 		ret = append(
 			ret,
-			Utxo{
+			common.Utxo{
 				Id:     NewByronTransactionInput(t.Hash(), idx),
 				Output: output,
 			},
@@ -289,9 +293,9 @@ func (t *ByronTransaction) Utxorpc() *utxorpc.Tx {
 	return &utxorpc.Tx{}
 }
 
-func (t *ByronTransaction) ProtocolParametersUpdate() map[Blake2b224]any {
+func (t *ByronTransaction) ProtocolParametersUpdate() map[common.Blake2b224]any {
 	// TODO: Implement this add missing Body TransactionBody
-	updateMap := make(map[Blake2b224]any)
+	updateMap := make(map[common.Blake2b224]any)
 	// for k, v := range t.Body.Update.ProtocolParamUpdates {
 	// 	updateMap[k] = v
 	// }
@@ -300,7 +304,7 @@ func (t *ByronTransaction) ProtocolParametersUpdate() map[Blake2b224]any {
 
 type ByronTransactionInput struct {
 	cbor.StructAsArray
-	TxId        Blake2b256
+	TxId        common.Blake2b256
 	OutputIndex uint32
 }
 
@@ -310,7 +314,7 @@ func NewByronTransactionInput(hash string, idx int) ByronTransactionInput {
 		panic(fmt.Sprintf("failed to decode transaction hash: %s", err))
 	}
 	return ByronTransactionInput{
-		TxId:        Blake2b256(tmpHash),
+		TxId:        common.Blake2b256(tmpHash),
 		OutputIndex: uint32(idx),
 	}
 }
@@ -340,7 +344,7 @@ func (i *ByronTransactionInput) UnmarshalCBOR(data []byte) error {
 	return nil
 }
 
-func (i ByronTransactionInput) Id() Blake2b256 {
+func (i ByronTransactionInput) Id() common.Blake2b256 {
 	return i.TxId
 }
 
@@ -368,8 +372,8 @@ func (i ByronTransactionInput) MarshalJSON() ([]byte, error) {
 type ByronTransactionOutput struct {
 	cbor.StructAsArray
 	cbor.DecodeStoreCbor
-	OutputAddress Address `json:"address"`
-	OutputAmount  uint64  `json:"amount"`
+	OutputAddress common.Address `json:"address"`
+	OutputAmount  uint64         `json:"amount"`
 }
 
 func (o *ByronTransactionOutput) UnmarshalCBOR(data []byte) error {
@@ -390,7 +394,7 @@ func (o *ByronTransactionOutput) UnmarshalCBOR(data []byte) error {
 	return nil
 }
 
-func (o ByronTransactionOutput) Address() Address {
+func (o ByronTransactionOutput) Address() common.Address {
 	return o.OutputAddress
 }
 
@@ -402,7 +406,7 @@ func (o ByronTransactionOutput) Assets() *common.MultiAsset[common.MultiAssetTyp
 	return nil
 }
 
-func (o ByronTransactionOutput) DatumHash() *Blake2b256 {
+func (o ByronTransactionOutput) DatumHash() *common.Blake2b256 {
 	return nil
 }
 
@@ -442,7 +446,7 @@ type ByronEpochBoundaryBlockHeader struct {
 	cbor.DecodeStoreCbor
 	hash          string
 	ProtocolMagic uint32
-	PrevBlock     Blake2b256
+	PrevBlock     common.Blake2b256
 	BodyProof     interface{}
 	ConsensusData struct {
 		cbor.StructAsArray
@@ -465,10 +469,13 @@ func (h *ByronEpochBoundaryBlockHeader) Hash() string {
 		// Prepend bytes for CBOR list wrapper
 		// The block hash is calculated with these extra bytes, so we have to add them to
 		// get the correct value
-		h.hash = generateBlockHeaderHash(
-			h.Cbor(),
-			[]byte{0x82, BlockTypeByronEbb},
+		tmpHash := common.Blake2b256Hash(
+			append(
+				[]byte{0x82, BlockTypeByronEbb},
+				h.Cbor()...,
+			),
 		)
+		h.hash = hex.EncodeToString(tmpHash.Bytes())
 	}
 	return h.hash
 }
@@ -482,9 +489,9 @@ func (h *ByronEpochBoundaryBlockHeader) SlotNumber() uint64 {
 	return uint64(h.ConsensusData.Epoch * ByronSlotsPerEpoch)
 }
 
-func (h *ByronEpochBoundaryBlockHeader) IssuerVkey() IssuerVkey {
+func (h *ByronEpochBoundaryBlockHeader) IssuerVkey() common.IssuerVkey {
 	// Byron blocks don't have an issuer
-	return IssuerVkey([]byte{})
+	return common.IssuerVkey([]byte{})
 }
 
 func (h *ByronEpochBoundaryBlockHeader) BlockBodySize() uint64 {
@@ -492,7 +499,7 @@ func (h *ByronEpochBoundaryBlockHeader) BlockBodySize() uint64 {
 	return 0
 }
 
-func (h *ByronEpochBoundaryBlockHeader) Era() Era {
+func (h *ByronEpochBoundaryBlockHeader) Era() common.Era {
 	return EraByron
 }
 
@@ -521,7 +528,7 @@ func (b *ByronMainBlock) SlotNumber() uint64 {
 	return b.Header.SlotNumber()
 }
 
-func (b *ByronMainBlock) IssuerVkey() IssuerVkey {
+func (b *ByronMainBlock) IssuerVkey() common.IssuerVkey {
 	return b.Header.IssuerVkey()
 }
 
@@ -529,12 +536,12 @@ func (b *ByronMainBlock) BlockBodySize() uint64 {
 	return uint64(len(b.Body.Cbor()))
 }
 
-func (b *ByronMainBlock) Era() Era {
+func (b *ByronMainBlock) Era() common.Era {
 	return b.Header.Era()
 }
 
-func (b *ByronMainBlock) Transactions() []Transaction {
-	ret := make([]Transaction, len(b.Body.TxPayload))
+func (b *ByronMainBlock) Transactions() []common.Transaction {
+	ret := make([]common.Transaction, len(b.Body.TxPayload))
 	for idx, payload := range b.Body.TxPayload {
 		payload := payload
 		ret[idx] = &payload.Transaction
@@ -550,7 +557,7 @@ type ByronEpochBoundaryBlock struct {
 	cbor.StructAsArray
 	cbor.DecodeStoreCbor
 	Header *ByronEpochBoundaryBlockHeader
-	Body   []Blake2b224
+	Body   []common.Blake2b224
 	Extra  []interface{}
 }
 
@@ -571,7 +578,7 @@ func (b *ByronEpochBoundaryBlock) SlotNumber() uint64 {
 	return b.Header.SlotNumber()
 }
 
-func (b *ByronEpochBoundaryBlock) IssuerVkey() IssuerVkey {
+func (b *ByronEpochBoundaryBlock) IssuerVkey() common.IssuerVkey {
 	return b.Header.IssuerVkey()
 }
 
@@ -580,11 +587,11 @@ func (b *ByronEpochBoundaryBlock) BlockBodySize() uint64 {
 	return 0
 }
 
-func (b *ByronEpochBoundaryBlock) Era() Era {
+func (b *ByronEpochBoundaryBlock) Era() common.Era {
 	return b.Header.Era()
 }
 
-func (b *ByronEpochBoundaryBlock) Transactions() []Transaction {
+func (b *ByronEpochBoundaryBlock) Transactions() []common.Transaction {
 	// Boundary blocks don't have transactions
 	return nil
 }
diff --git a/ledger/common/common.go b/ledger/common/common.go
index 7234ff41..56c69f17 100644
--- a/ledger/common/common.go
+++ b/ledger/common/common.go
@@ -311,3 +311,10 @@ func (i IssuerVkey) PoolId() string {
 	}
 	return encoded
 }
+
+// RedeemerExUnits represents the steps and memory usage for script execution
+type RedeemerExUnits struct {
+	cbor.StructAsArray
+	Memory uint64
+	Steps  uint64
+}
diff --git a/ledger/compat.go b/ledger/compat.go
index dd509c59..64754435 100644
--- a/ledger/compat.go
+++ b/ledger/compat.go
@@ -15,7 +15,14 @@
 package ledger
 
 import (
+	"github.com/blinklabs-io/gouroboros/ledger/allegra"
+	"github.com/blinklabs-io/gouroboros/ledger/alonzo"
+	"github.com/blinklabs-io/gouroboros/ledger/babbage"
+	"github.com/blinklabs-io/gouroboros/ledger/byron"
 	"github.com/blinklabs-io/gouroboros/ledger/common"
+	"github.com/blinklabs-io/gouroboros/ledger/conway"
+	"github.com/blinklabs-io/gouroboros/ledger/mary"
+	"github.com/blinklabs-io/gouroboros/ledger/shelley"
 )
 
 // The below are compatability types and functions to keep existing code working
@@ -51,6 +58,7 @@ type Certificate = common.Certificate
 type CertificateWrapper = common.CertificateWrapper
 type PoolRetirementCertificate = common.PoolRetirementCertificate
 type PoolRegistrationCertificate = common.PoolRegistrationCertificate
+type StakeDelegationCertificate = common.StakeDelegationCertificate
 
 // Other types
 type IssuerVkey = common.IssuerVkey
@@ -69,3 +77,187 @@ type AssetFingerprint = common.AssetFingerprint
 func NewAssetFingerprint(policyId []byte, assetName []byte) AssetFingerprint {
 	return common.NewAssetFingerprint(policyId, assetName)
 }
+
+// Byron types
+type ByronEpochBoundaryBlock = byron.ByronEpochBoundaryBlock
+type ByronMainBlock = byron.ByronMainBlock
+type ByronEpochBounaryBlockHeader = byron.ByronEpochBoundaryBlockHeader
+type ByronMainBlockHeader = byron.ByronMainBlockHeader
+type ByronTransaction = byron.ByronTransaction
+type ByronTransactionInput = byron.ByronTransactionInput
+type ByronTransactionOutput = byron.ByronTransactionOutput
+
+// Byron constants
+const (
+	EraIdByron           = byron.EraIdByron
+	BlockTypeByronEbb    = byron.BlockTypeByronEbb
+	BlockTypeByronMain   = byron.BlockTypeByronMain
+	BlockHeaderTypeByron = byron.BlockHeaderTypeByron
+	TxTypeByron          = byron.TxTypeByron
+)
+
+// Byron functions
+var (
+	NewByronEpochBoundaryBlockFromCbor       = byron.NewByronEpochBoundaryBlockFromCbor
+	NewByronMainBlockFromCbor                = byron.NewByronMainBlockFromCbor
+	NewByronEpochBoundaryBlockHeaderFromCbor = byron.NewByronEpochBoundaryBlockHeaderFromCbor
+	NewByronMainBlockHeaderFromCbor          = byron.NewByronMainBlockHeaderFromCbor
+	NewByronTransactionInput                 = byron.NewByronTransactionInput
+	NewByronTransactionFromCbor              = byron.NewByronTransactionFromCbor
+)
+
+// Shelley types
+type ShelleyBlock = shelley.ShelleyBlock
+type ShelleyBlockHeader = shelley.ShelleyBlockHeader
+type ShelleyTransaction = shelley.ShelleyTransaction
+type ShelleyTransactionBody = shelley.ShelleyTransactionBody
+type ShelleyTransactionInput = shelley.ShelleyTransactionInput
+type ShelleyTransactionOutput = shelley.ShelleyTransactionOutput
+type ShelleyTransactionWitnessSet = shelley.ShelleyTransactionWitnessSet
+type ShelleyProtocolParameters = shelley.ShelleyProtocolParameters
+type ShelleyProtocolParameterUpdate = shelley.ShelleyProtocolParameterUpdate
+
+// Shelley constants
+const (
+	EraIdShelley           = shelley.EraIdShelley
+	BlockTypeShelley       = shelley.BlockTypeShelley
+	BlockHeaderTypeShelley = shelley.BlockHeaderTypeShelley
+	TxTypeShelley          = shelley.TxTypeShelley
+)
+
+// Shelley functions
+var (
+	NewShelleyBlockFromCbor             = shelley.NewShelleyBlockFromCbor
+	NewShelleyBlockHeaderFromCbor       = shelley.NewShelleyBlockHeaderFromCbor
+	NewShelleyTransactionInput          = shelley.NewShelleyTransactionInput
+	NewShelleyTransactionFromCbor       = shelley.NewShelleyTransactionFromCbor
+	NewShelleyTransactionBodyFromCbor   = shelley.NewShelleyTransactionBodyFromCbor
+	NewShelleyTransactionOutputFromCbor = shelley.NewShelleyTransactionOutputFromCbor
+)
+
+// Allegra types
+type AllegraBlock = allegra.AllegraBlock
+type AllegraTransaction = allegra.AllegraTransaction
+type AllegraTransactionBody = allegra.AllegraTransactionBody
+type AllegraProtocolParameters = allegra.AllegraProtocolParameters
+type AllegraProtocolParameterUpdate = allegra.AllegraProtocolParameterUpdate
+
+// Allegra constants
+const (
+	EraIdAllegra           = allegra.EraIdAllegra
+	BlockTypeAllegra       = allegra.BlockTypeAllegra
+	BlockHeaderTypeAllegra = allegra.BlockHeaderTypeAllegra
+	TxTypeAllegra          = allegra.TxTypeAllegra
+)
+
+// Allegra functions
+var (
+	NewAllegraBlockFromCbor           = allegra.NewAllegraBlockFromCbor
+	NewAllegraTransactionFromCbor     = allegra.NewAllegraTransactionFromCbor
+	NewAllegraTransactionBodyFromCbor = allegra.NewAllegraTransactionBodyFromCbor
+)
+
+// Mary types
+type MaryBlock = mary.MaryBlock
+type MaryBlockHeader = mary.MaryBlockHeader
+type MaryTransaction = mary.MaryTransaction
+type MaryTransactionBody = mary.MaryTransactionBody
+type MaryTransactionOutput = mary.MaryTransactionOutput
+type MaryTransactionOutputValue = mary.MaryTransactionOutputValue
+type MaryTransactionWitnessSet = mary.MaryTransactionWitnessSet
+type MaryProtocolParameters = mary.MaryProtocolParameters
+type MaryProtocolParameterUpdate = mary.MaryProtocolParameterUpdate
+
+// Mary constants
+const (
+	EraIdMary           = mary.EraIdMary
+	BlockTypeMary       = mary.BlockTypeMary
+	BlockHeaderTypeMary = mary.BlockHeaderTypeMary
+	TxTypeMary          = mary.TxTypeMary
+)
+
+// Mary functions
+var (
+	NewMaryBlockFromCbor             = mary.NewMaryBlockFromCbor
+	NewMaryTransactionFromCbor       = mary.NewMaryTransactionFromCbor
+	NewMaryTransactionBodyFromCbor   = mary.NewMaryTransactionBodyFromCbor
+	NewMaryTransactionOutputFromCbor = mary.NewMaryTransactionOutputFromCbor
+)
+
+// Alonzo types
+type AlonzoBlock = alonzo.AlonzoBlock
+type AlonzoBlockHeader = alonzo.AlonzoBlockHeader
+type AlonzoTransaction = alonzo.AlonzoTransaction
+type AlonzoTransactionBody = alonzo.AlonzoTransactionBody
+type AlonzoTransactionOutput = alonzo.AlonzoTransactionOutput
+type AlonzoTransactionWitnessSet = alonzo.AlonzoTransactionWitnessSet
+type AlonzoProtocolParameters = alonzo.AlonzoProtocolParameters
+type AlonzoProtocolParameterUpdate = alonzo.AlonzoProtocolParameterUpdate
+
+// Alonzo constants
+const (
+	EraIdAlonzo           = alonzo.EraIdAlonzo
+	BlockTypeAlonzo       = alonzo.BlockTypeAlonzo
+	BlockHeaderTypeAlonzo = alonzo.BlockHeaderTypeAlonzo
+	TxTypeAlonzo          = alonzo.TxTypeAlonzo
+)
+
+// Alonzo functions
+var (
+	NewAlonzoBlockFromCbor             = alonzo.NewAlonzoBlockFromCbor
+	NewAlonzoTransactionFromCbor       = alonzo.NewAlonzoTransactionFromCbor
+	NewAlonzoTransactionBodyFromCbor   = alonzo.NewAlonzoTransactionBodyFromCbor
+	NewAlonzoTransactionOutputFromCbor = alonzo.NewAlonzoTransactionOutputFromCbor
+)
+
+// Babbage types
+type BabbageBlock = babbage.BabbageBlock
+type BabbageBlockHeader = babbage.BabbageBlockHeader
+type BabbageTransaction = babbage.BabbageTransaction
+type BabbageTransactionBody = babbage.BabbageTransactionBody
+type BabbageTransactionOutput = babbage.BabbageTransactionOutput
+type BabbageTransactionWitnessSet = babbage.BabbageTransactionWitnessSet
+type BabbageProtocolParameters = babbage.BabbageProtocolParameters
+type BabbageProtocolParameterUpdate = babbage.BabbageProtocolParameterUpdate
+
+// Babbage constants
+const (
+	EraIdBabbage           = babbage.EraIdBabbage
+	BlockTypeBabbage       = babbage.BlockTypeBabbage
+	BlockHeaderTypeBabbage = babbage.BlockHeaderTypeBabbage
+	TxTypeBabbage          = babbage.TxTypeBabbage
+)
+
+// Babbage functions
+var (
+	NewBabbageBlockFromCbor             = babbage.NewBabbageBlockFromCbor
+	NewBabbageBlockHeaderFromCbor       = babbage.NewBabbageBlockHeaderFromCbor
+	NewBabbageTransactionFromCbor       = babbage.NewBabbageTransactionFromCbor
+	NewBabbageTransactionBodyFromCbor   = babbage.NewBabbageTransactionBodyFromCbor
+	NewBabbageTransactionOutputFromCbor = babbage.NewBabbageTransactionOutputFromCbor
+)
+
+// Conway types
+type ConwayBlock = conway.ConwayBlock
+type ConwayBlockHeader = conway.ConwayBlockHeader
+type ConwayTransaction = conway.ConwayTransaction
+type ConwayTransactionBody = conway.ConwayTransactionBody
+type ConwayTransactionWitnessSet = conway.ConwayTransactionWitnessSet
+type ConwayProtocolParameters = conway.ConwayProtocolParameters
+type ConwayProtocolParameterUpdate = conway.ConwayProtocolParameterUpdate
+
+// Conway constants
+const (
+	EraIdConway           = conway.EraIdConway
+	BlockTypeConway       = conway.BlockTypeConway
+	BlockHeaderTypeConway = conway.BlockHeaderTypeConway
+	TxTypeConway          = conway.TxTypeConway
+)
+
+// Conway functions
+var (
+	NewConwayBlockFromCbor           = conway.NewConwayBlockFromCbor
+	NewConwayBlockHeaderFromCbor     = conway.NewConwayBlockHeaderFromCbor
+	NewConwayTransactionFromCbor     = conway.NewConwayTransactionFromCbor
+	NewConwayTransactionBodyFromCbor = conway.NewConwayTransactionBodyFromCbor
+)
diff --git a/ledger/conway.go b/ledger/conway/conway.go
similarity index 79%
rename from ledger/conway.go
rename to ledger/conway/conway.go
index 6c93b018..864a4357 100644
--- a/ledger/conway.go
+++ b/ledger/conway/conway.go
@@ -1,4 +1,4 @@
-// Copyright 2023 Blink Labs Software
+// Copyright 2024 Blink Labs Software
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,14 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package ledger
+package conway
 
 import (
 	"encoding/hex"
 	"fmt"
 
 	"github.com/blinklabs-io/gouroboros/cbor"
+	"github.com/blinklabs-io/gouroboros/ledger/alonzo"
+	"github.com/blinklabs-io/gouroboros/ledger/babbage"
 	"github.com/blinklabs-io/gouroboros/ledger/common"
+	"github.com/blinklabs-io/gouroboros/ledger/shelley"
 
 	utxorpc "github.com/utxorpc/go-codegen/utxorpc/v1alpha/cardano"
 )
@@ -72,7 +75,7 @@ func (b *ConwayBlock) SlotNumber() uint64 {
 	return b.Header.SlotNumber()
 }
 
-func (b *ConwayBlock) IssuerVkey() IssuerVkey {
+func (b *ConwayBlock) IssuerVkey() common.IssuerVkey {
 	return b.Header.IssuerVkey()
 }
 
@@ -80,17 +83,17 @@ func (b *ConwayBlock) BlockBodySize() uint64 {
 	return b.Header.BlockBodySize()
 }
 
-func (b *ConwayBlock) Era() Era {
+func (b *ConwayBlock) Era() common.Era {
 	return EraConway
 }
 
-func (b *ConwayBlock) Transactions() []Transaction {
+func (b *ConwayBlock) Transactions() []common.Transaction {
 	invalidTxMap := make(map[uint]bool, len(b.InvalidTransactions))
 	for _, invalidTxIdx := range b.InvalidTransactions {
 		invalidTxMap[invalidTxIdx] = true
 	}
 
-	ret := make([]Transaction, len(b.TransactionBodies))
+	ret := make([]common.Transaction, len(b.TransactionBodies))
 	for idx := range b.TransactionBodies {
 		ret[idx] = &ConwayTransaction{
 			Body:       b.TransactionBodies[idx],
@@ -125,10 +128,10 @@ func (b *ConwayBlock) Utxorpc() *utxorpc.Block {
 }
 
 type ConwayBlockHeader struct {
-	BabbageBlockHeader
+	babbage.BabbageBlockHeader
 }
 
-func (h *ConwayBlockHeader) Era() Era {
+func (h *ConwayBlockHeader) Era() common.Era {
 	return EraConway
 }
 
@@ -141,7 +144,7 @@ type ConwayRedeemerKey struct {
 type ConwayRedeemerValue struct {
 	cbor.StructAsArray
 	Data    cbor.RawMessage
-	ExUnits RedeemerExUnits
+	ExUnits common.RedeemerExUnits
 }
 
 type ConwayRedeemers struct {
@@ -151,7 +154,7 @@ type ConwayRedeemers struct {
 
 func (r *ConwayRedeemers) UnmarshalCBOR(cborData []byte) error {
 	// Try to parse as legacy redeemer first
-	var tmpRedeemers []AlonzoRedeemer
+	var tmpRedeemers []alonzo.AlonzoRedeemer
 	if _, err := cbor.Decode(cborData, &tmpRedeemers); err == nil {
 		// Copy data from legacy redeemer type
 		r.Redeemers = make(map[ConwayRedeemerKey]ConwayRedeemerValue)
@@ -175,7 +178,7 @@ func (r *ConwayRedeemers) UnmarshalCBOR(cborData []byte) error {
 }
 
 type ConwayTransactionWitnessSet struct {
-	BabbageTransactionWitnessSet
+	babbage.BabbageTransactionWitnessSet
 	Redeemers       ConwayRedeemers   `cbor:"5,keyasint,omitempty"`
 	PlutusV3Scripts []cbor.RawMessage `cbor:"7,keyasint,omitempty"`
 }
@@ -185,30 +188,30 @@ func (t *ConwayTransactionWitnessSet) UnmarshalCBOR(cborData []byte) error {
 }
 
 type ConwayTransactionBody struct {
-	BabbageTransactionBody
-	TxVotingProcedures     VotingProcedures    `cbor:"19,keyasint,omitempty"`
-	TxProposalProcedures   []ProposalProcedure `cbor:"20,keyasint,omitempty"`
-	TxCurrentTreasuryValue int64               `cbor:"21,keyasint,omitempty"`
-	TxDonation             uint64              `cbor:"22,keyasint,omitempty"`
+	babbage.BabbageTransactionBody
+	TxVotingProcedures     common.VotingProcedures    `cbor:"19,keyasint,omitempty"`
+	TxProposalProcedures   []common.ProposalProcedure `cbor:"20,keyasint,omitempty"`
+	TxCurrentTreasuryValue int64                      `cbor:"21,keyasint,omitempty"`
+	TxDonation             uint64                     `cbor:"22,keyasint,omitempty"`
 }
 
 func (b *ConwayTransactionBody) UnmarshalCBOR(cborData []byte) error {
 	return b.UnmarshalCbor(cborData, b)
 }
 
-func (b *ConwayTransactionBody) ProtocolParametersUpdate() map[Blake2b224]any {
-	updateMap := make(map[Blake2b224]any)
+func (b *ConwayTransactionBody) ProtocolParametersUpdate() map[common.Blake2b224]any {
+	updateMap := make(map[common.Blake2b224]any)
 	for k, v := range b.Update.ProtocolParamUpdates {
 		updateMap[k] = v
 	}
 	return updateMap
 }
 
-func (b *ConwayTransactionBody) VotingProcedures() VotingProcedures {
+func (b *ConwayTransactionBody) VotingProcedures() common.VotingProcedures {
 	return b.TxVotingProcedures
 }
 
-func (b *ConwayTransactionBody) ProposalProcedures() []ProposalProcedure {
+func (b *ConwayTransactionBody) ProposalProcedures() []common.ProposalProcedure {
 	return b.TxProposalProcedures
 }
 
@@ -221,7 +224,7 @@ func (b *ConwayTransactionBody) Donation() uint64 {
 }
 
 type ConwayProtocolParameters struct {
-	BabbageProtocolParameters
+	babbage.BabbageProtocolParameters
 	PoolVotingThresholds       PoolVotingThresholds
 	DRepVotingThresholds       DRepVotingThresholds
 	MinCommitteeSize           uint
@@ -234,7 +237,7 @@ type ConwayProtocolParameters struct {
 }
 
 type ConwayProtocolParameterUpdate struct {
-	BabbageProtocolParameterUpdate
+	babbage.BabbageProtocolParameterUpdate
 	PoolVotingThresholds       PoolVotingThresholds `cbor:"25,keyasint"`
 	DRepVotingThresholds       DRepVotingThresholds `cbor:"26,keyasint"`
 	MinCommitteeSize           uint                 `cbor:"27,keyasint"`
@@ -282,11 +285,11 @@ func (t ConwayTransaction) Hash() string {
 	return t.Body.Hash()
 }
 
-func (t ConwayTransaction) Inputs() []TransactionInput {
+func (t ConwayTransaction) Inputs() []common.TransactionInput {
 	return t.Body.Inputs()
 }
 
-func (t ConwayTransaction) Outputs() []TransactionOutput {
+func (t ConwayTransaction) Outputs() []common.TransactionOutput {
 	return t.Body.Outputs()
 }
 
@@ -302,19 +305,19 @@ func (t ConwayTransaction) ValidityIntervalStart() uint64 {
 	return t.Body.ValidityIntervalStart()
 }
 
-func (t ConwayTransaction) ProtocolParametersUpdate() map[Blake2b224]any {
+func (t ConwayTransaction) ProtocolParametersUpdate() map[common.Blake2b224]any {
 	return t.Body.ProtocolParametersUpdate()
 }
 
-func (t ConwayTransaction) ReferenceInputs() []TransactionInput {
+func (t ConwayTransaction) ReferenceInputs() []common.TransactionInput {
 	return t.Body.ReferenceInputs()
 }
 
-func (t ConwayTransaction) Collateral() []TransactionInput {
+func (t ConwayTransaction) Collateral() []common.TransactionInput {
 	return t.Body.Collateral()
 }
 
-func (t ConwayTransaction) CollateralReturn() TransactionOutput {
+func (t ConwayTransaction) CollateralReturn() common.TransactionOutput {
 	return t.Body.CollateralReturn()
 }
 
@@ -322,19 +325,19 @@ func (t ConwayTransaction) TotalCollateral() uint64 {
 	return t.Body.TotalCollateral()
 }
 
-func (t ConwayTransaction) Certificates() []Certificate {
+func (t ConwayTransaction) Certificates() []common.Certificate {
 	return t.Body.Certificates()
 }
 
-func (t ConwayTransaction) Withdrawals() map[*Address]uint64 {
+func (t ConwayTransaction) Withdrawals() map[*common.Address]uint64 {
 	return t.Body.Withdrawals()
 }
 
-func (t ConwayTransaction) AuxDataHash() *Blake2b256 {
+func (t ConwayTransaction) AuxDataHash() *common.Blake2b256 {
 	return t.Body.AuxDataHash()
 }
 
-func (t ConwayTransaction) RequiredSigners() []Blake2b224 {
+func (t ConwayTransaction) RequiredSigners() []common.Blake2b224 {
 	return t.Body.RequiredSigners()
 }
 
@@ -342,15 +345,15 @@ func (t ConwayTransaction) AssetMint() *common.MultiAsset[common.MultiAssetTypeM
 	return t.Body.AssetMint()
 }
 
-func (t ConwayTransaction) ScriptDataHash() *Blake2b256 {
+func (t ConwayTransaction) ScriptDataHash() *common.Blake2b256 {
 	return t.Body.ScriptDataHash()
 }
 
-func (t ConwayTransaction) VotingProcedures() VotingProcedures {
+func (t ConwayTransaction) VotingProcedures() common.VotingProcedures {
 	return t.Body.VotingProcedures()
 }
 
-func (t ConwayTransaction) ProposalProcedures() []ProposalProcedure {
+func (t ConwayTransaction) ProposalProcedures() []common.ProposalProcedure {
 	return t.Body.ProposalProcedures()
 }
 
@@ -370,7 +373,7 @@ func (t ConwayTransaction) IsValid() bool {
 	return t.IsTxValid
 }
 
-func (t ConwayTransaction) Consumed() []TransactionInput {
+func (t ConwayTransaction) Consumed() []common.TransactionInput {
 	if t.IsValid() {
 		return t.Inputs()
 	} else {
@@ -378,14 +381,14 @@ func (t ConwayTransaction) Consumed() []TransactionInput {
 	}
 }
 
-func (t ConwayTransaction) Produced() []Utxo {
+func (t ConwayTransaction) Produced() []common.Utxo {
 	if t.IsValid() {
-		var ret []Utxo
+		var ret []common.Utxo
 		for idx, output := range t.Outputs() {
 			ret = append(
 				ret,
-				Utxo{
-					Id:     NewShelleyTransactionInput(t.Hash(), idx),
+				common.Utxo{
+					Id:     shelley.NewShelleyTransactionInput(t.Hash(), idx),
 					Output: output,
 				},
 			)
@@ -393,11 +396,11 @@ func (t ConwayTransaction) Produced() []Utxo {
 		return ret
 	} else {
 		if t.CollateralReturn() == nil {
-			return []Utxo{}
+			return []common.Utxo{}
 		}
-		return []Utxo{
+		return []common.Utxo{
 			{
-				Id:     NewShelleyTransactionInput(t.Hash(), len(t.Outputs())),
+				Id:     shelley.NewShelleyTransactionInput(t.Hash(), len(t.Outputs())),
 				Output: t.CollateralReturn(),
 			},
 		}
diff --git a/ledger/mary.go b/ledger/mary/mary.go
similarity index 79%
rename from ledger/mary.go
rename to ledger/mary/mary.go
index 3394d572..0eefc3fc 100644
--- a/ledger/mary.go
+++ b/ledger/mary/mary.go
@@ -1,4 +1,4 @@
-// Copyright 2023 Blink Labs Software
+// Copyright 2024 Blink Labs Software
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package ledger
+package mary
 
 import (
 	"encoding/hex"
@@ -20,7 +20,9 @@ import (
 	"fmt"
 
 	"github.com/blinklabs-io/gouroboros/cbor"
+	"github.com/blinklabs-io/gouroboros/ledger/allegra"
 	"github.com/blinklabs-io/gouroboros/ledger/common"
+	"github.com/blinklabs-io/gouroboros/ledger/shelley"
 
 	utxorpc "github.com/utxorpc/go-codegen/utxorpc/v1alpha/cardano"
 )
@@ -72,7 +74,7 @@ func (b *MaryBlock) SlotNumber() uint64 {
 	return b.Header.SlotNumber()
 }
 
-func (b *MaryBlock) IssuerVkey() IssuerVkey {
+func (b *MaryBlock) IssuerVkey() common.IssuerVkey {
 	return b.Header.IssuerVkey()
 }
 
@@ -80,12 +82,12 @@ func (b *MaryBlock) BlockBodySize() uint64 {
 	return b.Header.BlockBodySize()
 }
 
-func (b *MaryBlock) Era() Era {
+func (b *MaryBlock) Era() common.Era {
 	return EraMary
 }
 
-func (b *MaryBlock) Transactions() []Transaction {
-	ret := make([]Transaction, len(b.TransactionBodies))
+func (b *MaryBlock) Transactions() []common.Transaction {
+	ret := make([]common.Transaction, len(b.TransactionBodies))
 	for idx := range b.TransactionBodies {
 		ret[idx] = &MaryTransaction{
 			Body:       b.TransactionBodies[idx],
@@ -119,18 +121,18 @@ func (b *MaryBlock) Utxorpc() *utxorpc.Block {
 }
 
 type MaryBlockHeader struct {
-	ShelleyBlockHeader
+	shelley.ShelleyBlockHeader
 }
 
-func (h *MaryBlockHeader) Era() Era {
+func (h *MaryBlockHeader) Era() common.Era {
 	return EraMary
 }
 
 type MaryTransactionBody struct {
-	AllegraTransactionBody
+	allegra.AllegraTransactionBody
 	Update struct {
 		cbor.StructAsArray
-		ProtocolParamUpdates map[Blake2b224]MaryProtocolParameterUpdate
+		ProtocolParamUpdates map[common.Blake2b224]MaryProtocolParameterUpdate
 		Epoch                uint64
 	} `cbor:"6,keyasint,omitempty"`
 	TxOutputs []MaryTransactionOutput                       `cbor:"1,keyasint,omitempty"`
@@ -141,8 +143,8 @@ func (b *MaryTransactionBody) UnmarshalCBOR(cborData []byte) error {
 	return b.UnmarshalCbor(cborData, b)
 }
 
-func (b *MaryTransactionBody) Outputs() []TransactionOutput {
-	ret := []TransactionOutput{}
+func (b *MaryTransactionBody) Outputs() []common.TransactionOutput {
+	ret := []common.TransactionOutput{}
 	for _, output := range b.TxOutputs {
 		output := output
 		ret = append(ret, &output)
@@ -150,8 +152,8 @@ func (b *MaryTransactionBody) Outputs() []TransactionOutput {
 	return ret
 }
 
-func (b *MaryTransactionBody) ProtocolParametersUpdate() map[Blake2b224]any {
-	updateMap := make(map[Blake2b224]any)
+func (b *MaryTransactionBody) ProtocolParametersUpdate() map[common.Blake2b224]any {
+	updateMap := make(map[common.Blake2b224]any)
 	for k, v := range b.Update.ProtocolParamUpdates {
 		updateMap[k] = v
 	}
@@ -171,7 +173,7 @@ type MaryTransaction struct {
 }
 
 type MaryTransactionWitnessSet struct {
-	ShelleyTransactionWitnessSet
+	shelley.ShelleyTransactionWitnessSet
 	Script        []interface{} `cbor:"4,keyasint,omitempty"`
 	PlutusScripts []interface{} `cbor:"5,keyasint,omitempty"`
 }
@@ -180,11 +182,11 @@ func (t MaryTransaction) Hash() string {
 	return t.Body.Hash()
 }
 
-func (t MaryTransaction) Inputs() []TransactionInput {
+func (t MaryTransaction) Inputs() []common.TransactionInput {
 	return t.Body.Inputs()
 }
 
-func (t MaryTransaction) Outputs() []TransactionOutput {
+func (t MaryTransaction) Outputs() []common.TransactionOutput {
 	return t.Body.Outputs()
 }
 
@@ -200,19 +202,19 @@ func (t MaryTransaction) ValidityIntervalStart() uint64 {
 	return t.Body.ValidityIntervalStart()
 }
 
-func (t MaryTransaction) ProtocolParametersUpdate() map[Blake2b224]any {
+func (t MaryTransaction) ProtocolParametersUpdate() map[common.Blake2b224]any {
 	return t.Body.ProtocolParametersUpdate()
 }
 
-func (t MaryTransaction) ReferenceInputs() []TransactionInput {
+func (t MaryTransaction) ReferenceInputs() []common.TransactionInput {
 	return t.Body.ReferenceInputs()
 }
 
-func (t MaryTransaction) Collateral() []TransactionInput {
+func (t MaryTransaction) Collateral() []common.TransactionInput {
 	return t.Body.Collateral()
 }
 
-func (t MaryTransaction) CollateralReturn() TransactionOutput {
+func (t MaryTransaction) CollateralReturn() common.TransactionOutput {
 	return t.Body.CollateralReturn()
 }
 
@@ -220,19 +222,19 @@ func (t MaryTransaction) TotalCollateral() uint64 {
 	return t.Body.TotalCollateral()
 }
 
-func (t MaryTransaction) Certificates() []Certificate {
+func (t MaryTransaction) Certificates() []common.Certificate {
 	return t.Body.Certificates()
 }
 
-func (t MaryTransaction) Withdrawals() map[*Address]uint64 {
+func (t MaryTransaction) Withdrawals() map[*common.Address]uint64 {
 	return t.Body.Withdrawals()
 }
 
-func (t MaryTransaction) AuxDataHash() *Blake2b256 {
+func (t MaryTransaction) AuxDataHash() *common.Blake2b256 {
 	return t.Body.AuxDataHash()
 }
 
-func (t MaryTransaction) RequiredSigners() []Blake2b224 {
+func (t MaryTransaction) RequiredSigners() []common.Blake2b224 {
 	return t.Body.RequiredSigners()
 }
 
@@ -240,15 +242,15 @@ func (t MaryTransaction) AssetMint() *common.MultiAsset[common.MultiAssetTypeMin
 	return t.Body.AssetMint()
 }
 
-func (t MaryTransaction) ScriptDataHash() *Blake2b256 {
+func (t MaryTransaction) ScriptDataHash() *common.Blake2b256 {
 	return t.Body.ScriptDataHash()
 }
 
-func (t MaryTransaction) VotingProcedures() VotingProcedures {
+func (t MaryTransaction) VotingProcedures() common.VotingProcedures {
 	return t.Body.VotingProcedures()
 }
 
-func (t MaryTransaction) ProposalProcedures() []ProposalProcedure {
+func (t MaryTransaction) ProposalProcedures() []common.ProposalProcedure {
 	return t.Body.ProposalProcedures()
 }
 
@@ -268,17 +270,17 @@ func (t MaryTransaction) IsValid() bool {
 	return true
 }
 
-func (t MaryTransaction) Consumed() []TransactionInput {
+func (t MaryTransaction) Consumed() []common.TransactionInput {
 	return t.Inputs()
 }
 
-func (t MaryTransaction) Produced() []Utxo {
-	var ret []Utxo
+func (t MaryTransaction) Produced() []common.Utxo {
+	var ret []common.Utxo
 	for idx, output := range t.Outputs() {
 		ret = append(
 			ret,
-			Utxo{
-				Id:     NewShelleyTransactionInput(t.Hash(), idx),
+			common.Utxo{
+				Id:     shelley.NewShelleyTransactionInput(t.Hash(), idx),
 				Output: output,
 			},
 		)
@@ -319,13 +321,13 @@ func (t *MaryTransaction) Utxorpc() *utxorpc.Tx {
 type MaryTransactionOutput struct {
 	cbor.StructAsArray
 	cbor.DecodeStoreCbor
-	OutputAddress Address
+	OutputAddress common.Address
 	OutputAmount  MaryTransactionOutputValue
 }
 
 func (o MaryTransactionOutput) MarshalJSON() ([]byte, error) {
 	tmpObj := struct {
-		Address Address                                         `json:"address"`
+		Address common.Address                                  `json:"address"`
 		Amount  uint64                                          `json:"amount"`
 		Assets  *common.MultiAsset[common.MultiAssetTypeOutput] `json:"assets,omitempty"`
 	}{
@@ -336,7 +338,7 @@ func (o MaryTransactionOutput) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&tmpObj)
 }
 
-func (o MaryTransactionOutput) Address() Address {
+func (o MaryTransactionOutput) Address() common.Address {
 	return o.OutputAddress
 }
 
@@ -348,7 +350,7 @@ func (o MaryTransactionOutput) Assets() *common.MultiAsset[common.MultiAssetType
 	return o.OutputAmount.Assets
 }
 
-func (o MaryTransactionOutput) DatumHash() *Blake2b256 {
+func (o MaryTransactionOutput) DatumHash() *common.Blake2b256 {
 	return nil
 }
 
@@ -390,11 +392,11 @@ func (v *MaryTransactionOutputValue) MarshalCBOR() ([]byte, error) {
 }
 
 type MaryProtocolParameters struct {
-	AllegraProtocolParameters
+	allegra.AllegraProtocolParameters
 }
 
 type MaryProtocolParameterUpdate struct {
-	AllegraProtocolParameterUpdate
+	allegra.AllegraProtocolParameterUpdate
 }
 
 func NewMaryBlockFromCbor(data []byte) (*MaryBlock, error) {
diff --git a/ledger/mary_test.go b/ledger/mary/mary_test.go
similarity index 95%
rename from ledger/mary_test.go
rename to ledger/mary/mary_test.go
index d337a569..720ca1ed 100644
--- a/ledger/mary_test.go
+++ b/ledger/mary/mary_test.go
@@ -1,4 +1,4 @@
-// Copyright 2023 Blink Labs Software
+// Copyright 2024 Blink Labs Software
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package ledger
+package mary
 
 import (
 	"encoding/hex"
@@ -29,8 +29,8 @@ func createMaryTransactionOutputValueAssets(
 	assetName []byte,
 	amount uint64,
 ) *common.MultiAsset[common.MultiAssetTypeOutput] {
-	data := map[Blake2b224]map[cbor.ByteString]uint64{}
-	policyIdKey := Blake2b224{}
+	data := map[common.Blake2b224]map[cbor.ByteString]uint64{}
+	policyIdKey := common.Blake2b224{}
 	copy(policyIdKey[:], policyId)
 	assetKey := cbor.NewByteString(assetName)
 	data[policyIdKey] = map[cbor.ByteString]uint64{
diff --git a/ledger/shelley.go b/ledger/shelley/shelley.go
similarity index 78%
rename from ledger/shelley.go
rename to ledger/shelley/shelley.go
index ecdce789..03924f23 100644
--- a/ledger/shelley.go
+++ b/ledger/shelley/shelley.go
@@ -1,4 +1,4 @@
-// Copyright 2023 Blink Labs Software
+// Copyright 2024 Blink Labs Software
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package ledger
+package shelley
 
 import (
 	"encoding/hex"
@@ -71,7 +71,7 @@ func (b *ShelleyBlock) SlotNumber() uint64 {
 	return b.Header.SlotNumber()
 }
 
-func (b *ShelleyBlock) IssuerVkey() IssuerVkey {
+func (b *ShelleyBlock) IssuerVkey() common.IssuerVkey {
 	return b.Header.IssuerVkey()
 }
 
@@ -79,12 +79,12 @@ func (b *ShelleyBlock) BlockBodySize() uint64 {
 	return b.Header.BlockBodySize()
 }
 
-func (b *ShelleyBlock) Era() Era {
+func (b *ShelleyBlock) Era() common.Era {
 	return EraShelley
 }
 
-func (b *ShelleyBlock) Transactions() []Transaction {
-	ret := make([]Transaction, len(b.TransactionBodies))
+func (b *ShelleyBlock) Transactions() []common.Transaction {
+	ret := make([]common.Transaction, len(b.TransactionBodies))
 	for idx := range b.TransactionBodies {
 		ret[idx] = &ShelleyTransaction{
 			Body:       b.TransactionBodies[idx],
@@ -125,13 +125,13 @@ type ShelleyBlockHeader struct {
 		cbor.StructAsArray
 		BlockNumber          uint64
 		Slot                 uint64
-		PrevHash             Blake2b256
-		IssuerVkey           IssuerVkey
+		PrevHash             common.Blake2b256
+		IssuerVkey           common.IssuerVkey
 		VrfKey               []byte
 		NonceVrf             interface{}
 		LeaderVrf            interface{}
 		BlockBodySize        uint64
-		BlockBodyHash        Blake2b256
+		BlockBodyHash        common.Blake2b256
 		OpCertHotVkey        []byte
 		OpCertSequenceNumber uint32
 		OpCertKesPeriod      uint32
@@ -148,7 +148,8 @@ func (h *ShelleyBlockHeader) UnmarshalCBOR(cborData []byte) error {
 
 func (h *ShelleyBlockHeader) Hash() string {
 	if h.hash == "" {
-		h.hash = generateBlockHeaderHash(h.Cbor(), nil)
+		tmpHash := common.Blake2b256Hash(h.Cbor())
+		h.hash = hex.EncodeToString(tmpHash.Bytes())
 	}
 	return h.hash
 }
@@ -161,7 +162,7 @@ func (h *ShelleyBlockHeader) SlotNumber() uint64 {
 	return h.Body.Slot
 }
 
-func (h *ShelleyBlockHeader) IssuerVkey() IssuerVkey {
+func (h *ShelleyBlockHeader) IssuerVkey() common.IssuerVkey {
 	return h.Body.IssuerVkey
 }
 
@@ -169,25 +170,25 @@ func (h *ShelleyBlockHeader) BlockBodySize() uint64 {
 	return h.Body.BlockBodySize
 }
 
-func (h *ShelleyBlockHeader) Era() Era {
+func (h *ShelleyBlockHeader) Era() common.Era {
 	return EraShelley
 }
 
 type ShelleyTransactionBody struct {
 	cbor.DecodeStoreCbor
 	hash           string
-	TxInputs       []ShelleyTransactionInput  `cbor:"0,keyasint,omitempty"`
-	TxOutputs      []ShelleyTransactionOutput `cbor:"1,keyasint,omitempty"`
-	TxFee          uint64                     `cbor:"2,keyasint,omitempty"`
-	Ttl            uint64                     `cbor:"3,keyasint,omitempty"`
-	TxCertificates []CertificateWrapper       `cbor:"4,keyasint,omitempty"`
-	TxWithdrawals  map[*Address]uint64        `cbor:"5,keyasint,omitempty"`
+	TxInputs       []ShelleyTransactionInput   `cbor:"0,keyasint,omitempty"`
+	TxOutputs      []ShelleyTransactionOutput  `cbor:"1,keyasint,omitempty"`
+	TxFee          uint64                      `cbor:"2,keyasint,omitempty"`
+	Ttl            uint64                      `cbor:"3,keyasint,omitempty"`
+	TxCertificates []common.CertificateWrapper `cbor:"4,keyasint,omitempty"`
+	TxWithdrawals  map[*common.Address]uint64  `cbor:"5,keyasint,omitempty"`
 	Update         struct {
 		cbor.StructAsArray
-		ProtocolParamUpdates map[Blake2b224]ShelleyProtocolParameterUpdate
+		ProtocolParamUpdates map[common.Blake2b224]ShelleyProtocolParameterUpdate
 		Epoch                uint64
 	} `cbor:"6,keyasint,omitempty"`
-	TxAuxDataHash *Blake2b256 `cbor:"7,keyasint,omitempty"`
+	TxAuxDataHash *common.Blake2b256 `cbor:"7,keyasint,omitempty"`
 }
 
 func (b *ShelleyTransactionBody) UnmarshalCBOR(cborData []byte) error {
@@ -196,21 +197,22 @@ func (b *ShelleyTransactionBody) UnmarshalCBOR(cborData []byte) error {
 
 func (b *ShelleyTransactionBody) Hash() string {
 	if b.hash == "" {
-		b.hash = generateTransactionHash(b.Cbor(), nil)
+		tmpHash := common.Blake2b256Hash(b.Cbor())
+		b.hash = hex.EncodeToString(tmpHash.Bytes())
 	}
 	return b.hash
 }
 
-func (b *ShelleyTransactionBody) Inputs() []TransactionInput {
-	ret := []TransactionInput{}
+func (b *ShelleyTransactionBody) Inputs() []common.TransactionInput {
+	ret := []common.TransactionInput{}
 	for _, input := range b.TxInputs {
 		ret = append(ret, input)
 	}
 	return ret
 }
 
-func (b *ShelleyTransactionBody) Outputs() []TransactionOutput {
-	ret := []TransactionOutput{}
+func (b *ShelleyTransactionBody) Outputs() []common.TransactionOutput {
+	ret := []common.TransactionOutput{}
 	for _, output := range b.TxOutputs {
 		output := output
 		ret = append(ret, &output)
@@ -231,24 +233,24 @@ func (b *ShelleyTransactionBody) ValidityIntervalStart() uint64 {
 	return 0
 }
 
-func (b *ShelleyTransactionBody) ProtocolParametersUpdate() map[Blake2b224]any {
-	updateMap := make(map[Blake2b224]any)
+func (b *ShelleyTransactionBody) ProtocolParametersUpdate() map[common.Blake2b224]any {
+	updateMap := make(map[common.Blake2b224]any)
 	for k, v := range b.Update.ProtocolParamUpdates {
 		updateMap[k] = v
 	}
 	return updateMap
 }
 
-func (b *ShelleyTransactionBody) ReferenceInputs() []TransactionInput {
-	return []TransactionInput{}
+func (b *ShelleyTransactionBody) ReferenceInputs() []common.TransactionInput {
+	return []common.TransactionInput{}
 }
 
-func (b *ShelleyTransactionBody) Collateral() []TransactionInput {
+func (b *ShelleyTransactionBody) Collateral() []common.TransactionInput {
 	// No collateral in Shelley
 	return nil
 }
 
-func (b *ShelleyTransactionBody) CollateralReturn() TransactionOutput {
+func (b *ShelleyTransactionBody) CollateralReturn() common.TransactionOutput {
 	// No collateral in Shelley
 	return nil
 }
@@ -258,23 +260,23 @@ func (b *ShelleyTransactionBody) TotalCollateral() uint64 {
 	return 0
 }
 
-func (b *ShelleyTransactionBody) Certificates() []Certificate {
-	ret := make([]Certificate, len(b.TxCertificates))
+func (b *ShelleyTransactionBody) Certificates() []common.Certificate {
+	ret := make([]common.Certificate, len(b.TxCertificates))
 	for i, cert := range b.TxCertificates {
 		ret[i] = cert.Certificate
 	}
 	return ret
 }
 
-func (b *ShelleyTransactionBody) Withdrawals() map[*Address]uint64 {
+func (b *ShelleyTransactionBody) Withdrawals() map[*common.Address]uint64 {
 	return b.TxWithdrawals
 }
 
-func (b *ShelleyTransactionBody) AuxDataHash() *Blake2b256 {
+func (b *ShelleyTransactionBody) AuxDataHash() *common.Blake2b256 {
 	return b.TxAuxDataHash
 }
 
-func (b *ShelleyTransactionBody) RequiredSigners() []Blake2b224 {
+func (b *ShelleyTransactionBody) RequiredSigners() []common.Blake2b224 {
 	// No required signers in Shelley
 	return nil
 }
@@ -284,17 +286,17 @@ func (b *ShelleyTransactionBody) AssetMint() *common.MultiAsset[common.MultiAsse
 	return nil
 }
 
-func (b *ShelleyTransactionBody) ScriptDataHash() *Blake2b256 {
+func (b *ShelleyTransactionBody) ScriptDataHash() *common.Blake2b256 {
 	// No script data hash in Shelley
 	return nil
 }
 
-func (b *ShelleyTransactionBody) VotingProcedures() VotingProcedures {
+func (b *ShelleyTransactionBody) VotingProcedures() common.VotingProcedures {
 	// No voting procedures in Shelley
 	return nil
 }
 
-func (b *ShelleyTransactionBody) ProposalProcedures() []ProposalProcedure {
+func (b *ShelleyTransactionBody) ProposalProcedures() []common.ProposalProcedure {
 	// No proposal procedures in Shelley
 	return nil
 }
@@ -341,7 +343,7 @@ func (b *ShelleyTransactionBody) Utxorpc() *utxorpc.Tx {
 
 type ShelleyTransactionInput struct {
 	cbor.StructAsArray
-	TxId        Blake2b256
+	TxId        common.Blake2b256
 	OutputIndex uint32
 }
 
@@ -351,12 +353,12 @@ func NewShelleyTransactionInput(hash string, idx int) ShelleyTransactionInput {
 		panic(fmt.Sprintf("failed to decode transaction hash: %s", err))
 	}
 	return ShelleyTransactionInput{
-		TxId:        Blake2b256(tmpHash),
+		TxId:        common.Blake2b256(tmpHash),
 		OutputIndex: uint32(idx),
 	}
 }
 
-func (i ShelleyTransactionInput) Id() Blake2b256 {
+func (i ShelleyTransactionInput) Id() common.Blake2b256 {
 	return i.TxId
 }
 
@@ -384,11 +386,11 @@ func (i ShelleyTransactionInput) MarshalJSON() ([]byte, error) {
 type ShelleyTransactionOutput struct {
 	cbor.StructAsArray
 	cbor.DecodeStoreCbor
-	OutputAddress Address `json:"address"`
-	OutputAmount  uint64  `json:"amount"`
+	OutputAddress common.Address `json:"address"`
+	OutputAmount  uint64         `json:"amount"`
 }
 
-func (o ShelleyTransactionOutput) Address() Address {
+func (o ShelleyTransactionOutput) Address() common.Address {
 	return o.OutputAddress
 }
 
@@ -400,7 +402,7 @@ func (o ShelleyTransactionOutput) Assets() *common.MultiAsset[common.MultiAssetT
 	return nil
 }
 
-func (o ShelleyTransactionOutput) DatumHash() *Blake2b256 {
+func (o ShelleyTransactionOutput) DatumHash() *common.Blake2b256 {
 	return nil
 }
 
@@ -438,11 +440,11 @@ func (t ShelleyTransaction) Hash() string {
 	return t.Body.Hash()
 }
 
-func (t ShelleyTransaction) Inputs() []TransactionInput {
+func (t ShelleyTransaction) Inputs() []common.TransactionInput {
 	return t.Body.Inputs()
 }
 
-func (t ShelleyTransaction) Outputs() []TransactionOutput {
+func (t ShelleyTransaction) Outputs() []common.TransactionOutput {
 	return t.Body.Outputs()
 }
 
@@ -458,15 +460,15 @@ func (t ShelleyTransaction) ValidityIntervalStart() uint64 {
 	return t.Body.ValidityIntervalStart()
 }
 
-func (t ShelleyTransaction) ReferenceInputs() []TransactionInput {
+func (t ShelleyTransaction) ReferenceInputs() []common.TransactionInput {
 	return t.Body.ReferenceInputs()
 }
 
-func (t ShelleyTransaction) Collateral() []TransactionInput {
+func (t ShelleyTransaction) Collateral() []common.TransactionInput {
 	return t.Body.Collateral()
 }
 
-func (t ShelleyTransaction) CollateralReturn() TransactionOutput {
+func (t ShelleyTransaction) CollateralReturn() common.TransactionOutput {
 	return t.Body.CollateralReturn()
 }
 
@@ -474,19 +476,19 @@ func (t ShelleyTransaction) TotalCollateral() uint64 {
 	return t.Body.TotalCollateral()
 }
 
-func (t ShelleyTransaction) Certificates() []Certificate {
+func (t ShelleyTransaction) Certificates() []common.Certificate {
 	return t.Body.Certificates()
 }
 
-func (t ShelleyTransaction) Withdrawals() map[*Address]uint64 {
+func (t ShelleyTransaction) Withdrawals() map[*common.Address]uint64 {
 	return t.Body.Withdrawals()
 }
 
-func (t ShelleyTransaction) AuxDataHash() *Blake2b256 {
+func (t ShelleyTransaction) AuxDataHash() *common.Blake2b256 {
 	return t.Body.AuxDataHash()
 }
 
-func (t ShelleyTransaction) RequiredSigners() []Blake2b224 {
+func (t ShelleyTransaction) RequiredSigners() []common.Blake2b224 {
 	return t.Body.RequiredSigners()
 }
 
@@ -494,15 +496,15 @@ func (t ShelleyTransaction) AssetMint() *common.MultiAsset[common.MultiAssetType
 	return t.Body.AssetMint()
 }
 
-func (t ShelleyTransaction) ScriptDataHash() *Blake2b256 {
+func (t ShelleyTransaction) ScriptDataHash() *common.Blake2b256 {
 	return t.Body.ScriptDataHash()
 }
 
-func (t ShelleyTransaction) VotingProcedures() VotingProcedures {
+func (t ShelleyTransaction) VotingProcedures() common.VotingProcedures {
 	return t.Body.VotingProcedures()
 }
 
-func (t ShelleyTransaction) ProposalProcedures() []ProposalProcedure {
+func (t ShelleyTransaction) ProposalProcedures() []common.ProposalProcedure {
 	return t.Body.ProposalProcedures()
 }
 
@@ -522,16 +524,16 @@ func (t ShelleyTransaction) IsValid() bool {
 	return true
 }
 
-func (t ShelleyTransaction) Consumed() []TransactionInput {
+func (t ShelleyTransaction) Consumed() []common.TransactionInput {
 	return t.Inputs()
 }
 
-func (t ShelleyTransaction) Produced() []Utxo {
-	var ret []Utxo
+func (t ShelleyTransaction) Produced() []common.Utxo {
+	var ret []common.Utxo
 	for idx, output := range t.Outputs() {
 		ret = append(
 			ret,
-			Utxo{
+			common.Utxo{
 				Id:     NewShelleyTransactionInput(t.Hash(), idx),
 				Output: output,
 			},
@@ -544,7 +546,7 @@ func (t ShelleyTransaction) Utxorpc() *utxorpc.Tx {
 	return t.Body.Utxorpc()
 }
 
-func (t *ShelleyTransaction) ProtocolParametersUpdate() map[Blake2b224]any {
+func (t *ShelleyTransaction) ProtocolParametersUpdate() map[common.Blake2b224]any {
 	return t.Body.ProtocolParametersUpdate()
 }
 
diff --git a/ledger/shelley_test.go b/ledger/shelley/shelley_test.go
similarity index 56%
rename from ledger/shelley_test.go
rename to ledger/shelley/shelley_test.go
index b38785cb..40f0749d 100644
--- a/ledger/shelley_test.go
+++ b/ledger/shelley/shelley_test.go
@@ -1,4 +1,18 @@
-package ledger
+// Copyright 2024 Blink Labs Software
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package shelley
 
 import (
 	"testing"
diff --git a/ledger/tx.go b/ledger/tx.go
index eff131bd..21358a2a 100644
--- a/ledger/tx.go
+++ b/ledger/tx.go
@@ -15,12 +15,9 @@
 package ledger
 
 import (
-	"encoding/hex"
 	"fmt"
 
 	"github.com/blinklabs-io/gouroboros/ledger/common"
-
-	"golang.org/x/crypto/blake2b"
 )
 
 // Compatablity aliases
@@ -120,20 +117,3 @@ func DetermineTransactionType(data []byte) (uint, error) {
 	}
 	return 0, fmt.Errorf("unknown transaction type")
 }
-
-func generateTransactionHash(data []byte, prefix []byte) string {
-	tmpHash, err := blake2b.New256(nil)
-	if err != nil {
-		panic(
-			fmt.Sprintf(
-				"unexpected error generating empty blake2b hash: %s",
-				err,
-			),
-		)
-	}
-	if prefix != nil {
-		tmpHash.Write(prefix)
-	}
-	tmpHash.Write(data)
-	return hex.EncodeToString(tmpHash.Sum(nil))
-}