diff --git a/cmd/last.msg b/cmd/last.msg
deleted file mode 100755
index 84fa13f..0000000
--- a/cmd/last.msg
+++ /dev/null
@@ -1 +0,0 @@
-wcBMA1Z2i1z86bGuAQgAZ1hb8CH2dcUuKWfstpILJqaonxEsinE2KgrzqHjEtogawL8pqNCWXPYgFxPh2sj4z9zI4/7+jcAcd3wz/mXj/FdaBUpFyMaC1cV9OmD8jSTvamBpG5KI2HHxuHRv0Y19rgjcXUjtZSJcu1ZYj6yMn2+KdDTHScRBXsiapOHc5S9nKrXJ69cFF7jvQRIgnn8KNVWmcau5BXKYrXa9XnwqZtNTFYBaPgyOWb8TMnBK93T4NegMTRj/XeGQ4NAT/5sfHNRvC84mYxZQFojuUTnT3zVgdET7o6AKrtsbHstL8mzaPjM9nMPZfTotSCzsXBE07Dt1zLmPXeo4eT0VyOUtpdLgAeMsLYZM1RdSXeECzuBk4EThv3zgP+IDH09o4OzkfKlNi862TzMNh6rMpCvBGuA14x4vOzvLsDLZ4MDiagQM2eCA4LzgQeQO24U6HvCz7cdAy22h7BqG4pOs1Hfhj8oA
\ No newline at end of file
diff --git a/cmd/go.mod b/cmd/recv/go.mod
similarity index 61%
rename from cmd/go.mod
rename to cmd/recv/go.mod
index 679bd52..74234ce 100644
--- a/cmd/go.mod
+++ b/cmd/recv/go.mod
@@ -1,11 +1,11 @@
-module gogs.inhome.blapointe.com/local-sandbox/contact
+module gogs.inhome.blapointe.com/contact/cmd/recv
 
-go 1.20
+go 1.21.0
 
-replace gogs.inhome.blapointe.com/local-sandbox/contact/contact => ./contact
+replace gogs.inhome.blapointe.com/local-sandbox/contact => ../../
 
 require (
-	gogs.inhome.blapointe.com/local-sandbox/contact/contact v0.0.0-00010101000000-000000000000
+	gogs.inhome.blapointe.com/local-sandbox/contact v0.0.0-00010101000000-000000000000
 	gogs.inhome.blapointe.com/local/args v0.0.0-20230410154220-44370f257b34
 )
 
diff --git a/cmd/recv/go.sh b/cmd/recv/go.sh
new file mode 100755
index 0000000..fae3ecc
--- /dev/null
+++ b/cmd/recv/go.sh
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+GOPRIVATE= GONOSUMDB=\* GONOPROXY=\* GOPROXY= go "$@"
diff --git a/cmd/go.sum b/cmd/recv/go.sum
similarity index 100%
rename from cmd/go.sum
rename to cmd/recv/go.sum
diff --git a/cmd/recv.go b/cmd/recv/main.go
similarity index 94%
rename from cmd/recv.go
rename to cmd/recv/main.go
index 1ff3340..d7cd523 100755
--- a/cmd/recv.go
+++ b/cmd/recv/main.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"gogs.inhome.blapointe.com/local-sandbox/contact/contact"
+	"gogs.inhome.blapointe.com/local-sandbox/contact"
 	"gogs.inhome.blapointe.com/local/args"
 )
 
diff --git a/cmd/send/go.mod b/cmd/send/go.mod
new file mode 100644
index 0000000..4213f3e
--- /dev/null
+++ b/cmd/send/go.mod
@@ -0,0 +1,18 @@
+module gogs.inhome.blapointe.com/contact/cmd/send
+
+go 1.21.0
+
+replace gogs.inhome.blapointe.com/local-sandbox/contact => ../../
+
+require (
+	gogs.inhome.blapointe.com/local-sandbox/contact v0.0.1
+	gogs.inhome.blapointe.com/local/args v0.0.0-20230410154220-44370f257b34
+)
+
+require (
+	github.com/bytbox/go-pop3 v0.0.0-20120201222208-3046caf0763e // indirect
+	github.com/emersion/go-imap v1.2.0 // indirect
+	github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+)
diff --git a/cmd/send/go.sum b/cmd/send/go.sum
new file mode 100644
index 0000000..eef4926
--- /dev/null
+++ b/cmd/send/go.sum
@@ -0,0 +1,18 @@
+github.com/bytbox/go-pop3 v0.0.0-20120201222208-3046caf0763e h1:mQTN05gz0rDZSABqKMzAPMb5ATWcvvdMljRzEh0LjBo=
+github.com/bytbox/go-pop3 v0.0.0-20120201222208-3046caf0763e/go.mod h1:alXX+s7a4cKaIprgjeEboqi4Tm7XR/HXEwUTxUV/ywU=
+github.com/emersion/go-imap v1.2.0 h1:lyUQ3+EVM21/qbWE/4Ya5UG9r5+usDxlg4yfp3TgHFA=
+github.com/emersion/go-imap v1.2.0/go.mod h1:Qlx1FSx2FTxjnjWpIlVNEuX+ylerZQNFE5NsmKFSejY=
+github.com/emersion/go-message v0.15.0/go.mod h1:wQUEfE+38+7EW8p8aZ96ptg6bAb1iwdgej19uXASlE4=
+github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21 h1:OJyUGMJTzHTd1XQp98QTaHernxMYzRaOasRir9hUlFQ=
+github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
+github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594/go.mod h1:aqO8z8wPrjkscevZJFVE1wXJrLpC5LtJG7fqLOsPb2U=
+gogs.inhome.blapointe.com/local/args v0.0.0-20230410154220-44370f257b34 h1:0tuX5dfOksiOQD1vbJjVNVTVxTTIng7UrUdSLF5T+Ao=
+gogs.inhome.blapointe.com/local/args v0.0.0-20230410154220-44370f257b34/go.mod h1:YG9n3Clg7683ohkVnJK2hdX8bBS9EojIsd1qPZumX0Y=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
diff --git a/cmd/send.go b/cmd/send/main.go
similarity index 94%
rename from cmd/send.go
rename to cmd/send/main.go
index 147f600..216eb5d 100755
--- a/cmd/send.go
+++ b/cmd/send/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"gogs.inhome.blapointe.com/local-sandbox/contact/contact"
+	"gogs.inhome.blapointe.com/local-sandbox/contact"
 	"gogs.inhome.blapointe.com/local/args"
 )