diff --git a/outpoint.go b/basetypes/outpoint.go
similarity index 95%
rename from outpoint.go
rename to basetypes/outpoint.go
index a25bf8b..cdfa979 100644
--- a/outpoint.go
+++ b/basetypes/outpoint.go
@@ -1,4 +1,4 @@
-package main
+package basetypes
 
 import (
 	"log"
diff --git a/cln_client.go b/cln_client.go
index b04e99f..a9ee908 100644
--- a/cln_client.go
+++ b/cln_client.go
@@ -131,7 +131,7 @@ func (c *ClnClient) OpenChannel(req *OpenChannelRequest) (*wire.OutPoint, error)
 		return nil, err
 	}
 
-	channelPoint, err := NewOutPoint(fundingTxId[:], uint32(fundResult.FundingTxOutputNum))
+	channelPoint, err := basetypes.NewOutPoint(fundingTxId[:], uint32(fundResult.FundingTxOutputNum))
 	if err != nil {
 		log.Printf("CLN: NewOutPoint(%s, %d) error: %v", fundingTxId.String(), fundResult.FundingTxOutputNum, err)
 		return nil, err
diff --git a/db.go b/db.go
index b0332ec..cdd2b43 100644
--- a/db.go
+++ b/db.go
@@ -6,6 +6,7 @@ import (
 	"log"
 	"time"
 
+	"github.com/breez/lspd/basetypes"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/jackc/pgtype"
 	"github.com/jackc/pgx/v4"
@@ -46,7 +47,7 @@ func paymentInfo(htlcPaymentHash []byte) ([]byte, []byte, []byte, int64, int64,
 
 	var cp *wire.OutPoint
 	if fundingTxID != nil {
-		cp, err = NewOutPoint(fundingTxID, uint32(fundingTxOutnum.Int))
+		cp, err = basetypes.NewOutPoint(fundingTxID, uint32(fundingTxOutnum.Int))
 		if err != nil {
 			log.Printf("invalid funding txid in database %x", fundingTxID)
 		}
diff --git a/lnd_client.go b/lnd_client.go
index cdf7e48..113cb6a 100644
--- a/lnd_client.go
+++ b/lnd_client.go
@@ -126,7 +126,7 @@ func (c *LndClient) OpenChannel(req *OpenChannelRequest) (*wire.OutPoint, error)
 		return nil, fmt.Errorf("LND: OpenChannel() error: %w", err)
 	}
 
-	result, err := NewOutPoint(channelPoint.GetFundingTxidBytes(), channelPoint.OutputIndex)
+	result, err := basetypes.NewOutPoint(channelPoint.GetFundingTxidBytes(), channelPoint.OutputIndex)
 	if err != nil {
 		log.Printf("LND: OpenChannel returned invalid outpoint. error: %v", err)
 		return nil, err