diff --git a/Makefile b/Makefile
index c631bb3..68c880c 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@ GOOS := $(GOOS)
 FLAGS := -ldflags "-s -w"
 
 all:
-	GOARCH=$$GOARCH GOOS=$$GOOS go build $(FLAGS) meshnamed.go
-	GOARCH=$$GOARCH GOOS=$$GOOS go build $(FLAGS) meshname.go
+	GOARCH=$$GOARCH GOOS=$$GOOS go build $(FLAGS) ./cmd/meshnamed
+	GOARCH=$$GOARCH GOOS=$$GOOS go build $(FLAGS) ./cmd/meshname
 
 clean:
 	$(RM) meshnamed meshname meshnamed.exe meshname.exe
diff --git a/meshname.go b/cmd/meshname/main.go
similarity index 100%
rename from meshname.go
rename to cmd/meshname/main.go
diff --git a/meshnamed.go b/cmd/meshnamed/main.go
similarity index 100%
rename from meshnamed.go
rename to cmd/meshnamed/main.go
diff --git a/go.mod b/go.mod
index 0782da1..04189a1 100644
--- a/go.mod
+++ b/go.mod
@@ -2,4 +2,4 @@ module github.com/zhoreeq/meshname
 
 go 1.13
 
-require github.com/miekg/dns v1.1.27 // indirect
+require github.com/miekg/dns v1.1.27