diff --git a/cmd/yarndumper.go b/cmd/yarndumper/yarndumper.go
similarity index 94%
rename from cmd/yarndumper.go
rename to cmd/yarndumper/yarndumper.go
index ff2eb90..c44bdd1 100644
--- a/cmd/yarndumper.go
+++ b/cmd/yarndumper/yarndumper.go
@@ -19,7 +19,7 @@
 //
 // Quick usage from the root of the repo:
 //
-//	go run -tags example cmd/yarndumper.go testdata/Example.yarn.yarnc
+//	go run -tags example cmd/yarndumper/yarndumper.go testdata/Example.yarn.yarnc
 //
 // The "example" build tag is used to prevent this being installed to ~/go/bin
 // if you use the go get command. If for some reason you want to install it to
diff --git a/cmd/terminal.yarn b/cmd/yarnrunner/terminal.yarn
similarity index 100%
rename from cmd/terminal.yarn
rename to cmd/yarnrunner/terminal.yarn
diff --git a/cmd/terminal.yarn.csv b/cmd/yarnrunner/terminal.yarn.csv
similarity index 100%
rename from cmd/terminal.yarn.csv
rename to cmd/yarnrunner/terminal.yarn.csv
diff --git a/cmd/terminal.yarn.yarnc b/cmd/yarnrunner/terminal.yarn.yarnc
similarity index 100%
rename from cmd/terminal.yarn.yarnc
rename to cmd/yarnrunner/terminal.yarn.yarnc
diff --git a/cmd/yarnrunner.go b/cmd/yarnrunner/yarnrunner.go
similarity index 97%
rename from cmd/yarnrunner.go
rename to cmd/yarnrunner/yarnrunner.go
index f6094e7..64dc269 100644
--- a/cmd/yarnrunner.go
+++ b/cmd/yarnrunner/yarnrunner.go
@@ -20,8 +20,8 @@
 //
 // Quick usage from the root of the repo:
 //
-//	go run -tags example cmd/yarnrunner.go \
-//	    --program=testdata/Example.yarn.yarnc
+//	go run -tags example cmd/yarnrunner/yarnrunner.go \
+//	    --program=cmd/yarnrunner/terminal.yarn.yarnc
 //
 // The "example" build tag is used to prevent this being installed to ~/go/bin
 // if you use the go get command. If for some reason you want to install it to