diff --git a/.gitignore b/.gitignore
index ec3842d0..ad906369 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,9 +29,6 @@ output*.log
 loop
 !cmd/loop/
 
-loopd
-!cmd/loopd/
-
 *.key
 *.hex
 
diff --git a/cmd/loopd/config.go b/loopd/config.go
similarity index 99%
rename from cmd/loopd/config.go
rename to loopd/config.go
index 690665b9..fdeb4961 100644
--- a/cmd/loopd/config.go
+++ b/loopd/config.go
@@ -1,4 +1,4 @@
-package main
+package loopd
 
 import (
 	"path/filepath"
diff --git a/cmd/loopd/daemon.go b/loopd/daemon.go
similarity index 99%
rename from cmd/loopd/daemon.go
rename to loopd/daemon.go
index 11f07902..eb063608 100644
--- a/cmd/loopd/daemon.go
+++ b/loopd/daemon.go
@@ -1,4 +1,4 @@
-package main
+package loopd
 
 import (
 	"context"
diff --git a/cmd/loopd/log.go b/loopd/log.go
similarity index 98%
rename from cmd/loopd/log.go
rename to loopd/log.go
index d0ff0294..dd1811a8 100644
--- a/cmd/loopd/log.go
+++ b/loopd/log.go
@@ -1,4 +1,4 @@
-package main
+package loopd
 
 import (
 	"github.com/btcsuite/btclog"
diff --git a/cmd/loopd/main.go b/loopd/main.go
similarity index 99%
rename from cmd/loopd/main.go
rename to loopd/main.go
index 3be43450..4398334b 100644
--- a/cmd/loopd/main.go
+++ b/loopd/main.go
@@ -1,4 +1,4 @@
-package main
+package loopd
 
 import (
 	"fmt"
diff --git a/cmd/loopd/swapclient_server.go b/loopd/swapclient_server.go
similarity index 99%
rename from cmd/loopd/swapclient_server.go
rename to loopd/swapclient_server.go
index 4c1ae4d1..232061f8 100644
--- a/cmd/loopd/swapclient_server.go
+++ b/loopd/swapclient_server.go
@@ -1,4 +1,4 @@
-package main
+package loopd
 
 import (
 	"context"
diff --git a/cmd/loopd/utils.go b/loopd/utils.go
similarity index 98%
rename from cmd/loopd/utils.go
rename to loopd/utils.go
index 601957e0..a2c44af3 100644
--- a/cmd/loopd/utils.go
+++ b/loopd/utils.go
@@ -1,4 +1,4 @@
-package main
+package loopd
 
 import (
 	"os"
diff --git a/cmd/loopd/view.go b/loopd/view.go
similarity index 99%
rename from cmd/loopd/view.go
rename to loopd/view.go
index 50e3f4e0..dabe82c2 100644
--- a/cmd/loopd/view.go
+++ b/loopd/view.go
@@ -1,4 +1,4 @@
-package main
+package loopd
 
 import (
 	"fmt"