diff --git a/main.go b/main.go
new file mode 100644
index 0000000..749f300
--- /dev/null
+++ b/main.go
@@ -0,0 +1,51 @@
+package main
+
+import (
+	"fmt"
+	"log"
+	"os"
+
+	"github.com/btcsuite/btcd/btcec/v2"
+)
+
+func main() {
+	if len(os.Args) > 1 && os.Args[1] == "genkey" {
+		p, err := btcec.NewPrivateKey()
+		if err != nil {
+			log.Fatalf("btcec.NewPrivateKey() error: %v", err)
+		}
+		fmt.Printf("LSPD_PRIVATE_KEY=\"%x\"\n", p.Serialize())
+		return
+	}
+
+	err := pgConnect()
+	if err != nil {
+		log.Fatalf("pgConnect() error: %v", err)
+	}
+
+	client = NewLndClient()
+
+	info, err := client.GetInfo()
+	if err != nil {
+		log.Fatalf("client.GetInfo() error: %v", err)
+	}
+	if nodeName == "" {
+		nodeName = info.Alias
+	}
+	if nodePubkey == "" {
+		nodePubkey = info.Pubkey
+	}
+
+	go intercept(client)
+
+	go forwardingHistorySynchronize(client)
+	go channelsSynchronize(client)
+
+	s := NewGrpcServer()
+	err = s.Start()
+	if err != nil {
+		log.Fatalf("%v", err)
+	}
+
+	log.Printf("lspd exited")
+}
diff --git a/server.go b/server.go
index 2577e04..9d2de8e 100644
--- a/server.go
+++ b/server.go
@@ -304,45 +304,3 @@ func (s *server) Stop() {
 		srv.GracefulStop()
 	}
 }
-
-func main() {
-	if len(os.Args) > 1 && os.Args[1] == "genkey" {
-		p, err := btcec.NewPrivateKey()
-		if err != nil {
-			log.Fatalf("btcec.NewPrivateKey() error: %v", err)
-		}
-		fmt.Printf("LSPD_PRIVATE_KEY=\"%x\"\n", p.Serialize())
-		return
-	}
-
-	err := pgConnect()
-	if err != nil {
-		log.Fatalf("pgConnect() error: %v", err)
-	}
-
-	client = NewLndClient()
-
-	info, err := client.GetInfo()
-	if err != nil {
-		log.Fatalf("client.GetInfo() error: %v", err)
-	}
-	if nodeName == "" {
-		nodeName = info.Alias
-	}
-	if nodePubkey == "" {
-		nodePubkey = info.Pubkey
-	}
-
-	go intercept(client)
-
-	go forwardingHistorySynchronize(client)
-	go channelsSynchronize(client)
-
-	s := NewGrpcServer()
-	err = s.Start()
-	if err != nil {
-		log.Fatalf("%v", err)
-	}
-
-	log.Printf("lspd exited")
-}