diff --git a/lnd.go b/lnd.go
index 6d00fe3e..34233371 100644
--- a/lnd.go
+++ b/lnd.go
@@ -10,8 +10,8 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/grpclog"
 
-	"li.lan/labs/plasma/lnrpc"
-	"li.lan/labs/plasma/lnwallet"
+	"github.com/lightningnetwork/lnd/lnrpc"
+	"github.com/lightningnetwork/lnd/lnwallet"
 )
 
 var (
diff --git a/omnihandler.go b/omnihandler.go
index a314eb4e..b92ab46c 100644
--- a/omnihandler.go
+++ b/omnihandler.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net"
 
-	"li.lan/labs/plasma/lnwire"
+	"github.com/lightningnetwork/lnd/lnwire"
 )
 
 // it listens for incoming messages on the lndc and hands it over
diff --git a/rpcserver.go b/rpcserver.go
index f87ebe38..175918e6 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -9,12 +9,11 @@ import (
 	"github.com/btcsuite/btcd/btcec"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwallet/waddrmgr"
+	"github.com/lightningnetwork/lnd/lndc"
+	"github.com/lightningnetwork/lnd/lnrpc"
+	"github.com/lightningnetwork/lnd/lnwallet"
+	"github.com/lightningnetwork/lnd/lnwire"
 	"golang.org/x/net/context"
-	"li.lan/labs/plasma/lndc"
-	"li.lan/labs/plasma/lnrpc"
-	"li.lan/labs/plasma/lnwallet"
-	"li.lan/labs/plasma/lnwire"
-	"li.lan/labs/strux"
 )
 
 var (
@@ -29,6 +28,16 @@ type rpcServer struct { // doesn't count as globals I think
 	// can split the OmniChan up if that is helpful.  So far 1 seems OK.
 }
 
+type LNAdr struct {
+	LNId   [16]byte // redundant because adr contains it
+	Adr    btcutil.Address
+	PubKey *btcec.PublicKey
+
+	Name        string
+	Host        string
+	Endorsement []byte
+}
+
 var _ lnrpc.LightningServer = (*rpcServer)(nil)
 
 // newRpcServer...
@@ -101,7 +110,7 @@ func (r *rpcServer) LNConnect(ctx context.Context,
 	if len(in.IdAtHost) == 0 {
 		return nil, fmt.Errorf("need: lnc pubkeyhash@hostname")
 	}
-	var newNode strux.LNAdr
+	var newNode LNAdr
 
 	err = newNode.ParseFromString(in.IdAtHost)
 	if err != nil {
diff --git a/server.go b/server.go
index 8b9d94d2..f3d80893 100644
--- a/server.go
+++ b/server.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"li.lan/labs/plasma/lnwallet"
+	"github.com/lightningnetwork/lnd/lnwallet"
 
 	"github.com/btcsuite/btcd/chaincfg"
 	"github.com/btcsuite/btcwallet/walletdb"