diff --git a/wallet/channel.go b/lnwallet/channel.go
similarity index 100%
rename from wallet/channel.go
rename to lnwallet/channel.go
diff --git a/wallet/coin_select.go b/lnwallet/coin_select.go
similarity index 100%
rename from wallet/coin_select.go
rename to lnwallet/coin_select.go
diff --git a/wallet/reservation.go b/lnwallet/reservation.go
similarity index 100%
rename from wallet/reservation.go
rename to lnwallet/reservation.go
diff --git a/wallet/setup.go b/lnwallet/setup.go
similarity index 100%
rename from wallet/setup.go
rename to lnwallet/setup.go
diff --git a/wallet/wallet.go b/lnwallet/wallet.go
similarity index 100%
rename from wallet/wallet.go
rename to lnwallet/wallet.go
diff --git a/wallet/wallet_test.go b/lnwallet/wallet_test.go
similarity index 100%
rename from wallet/wallet_test.go
rename to lnwallet/wallet_test.go
diff --git a/revocation/shachain.go b/revocation/shachain.go
index 57a2e8f5..1d28931a 100644
--- a/revocation/shachain.go
+++ b/revocation/shachain.go
@@ -1,6 +1,10 @@
 package revocation
 
-import "github.com/btcsuite/btcd/wire"
+import (
+	"sync"
+
+	"github.com/btcsuite/btcd/wire"
+)
 
 // chainFragment...
 type chainFragment struct {
@@ -11,6 +15,8 @@ type chainFragment struct {
 // HyperShaChain...
 // * https://github.com/rustyrussell/ccan/blob/master/ccan/crypto/shachain/design.txt
 type HyperShaChain struct {
+	sync.RWMutex
+
 	lastChainIndex uint64
 
 	chainFragments []chainFragment