diff --git a/Makefile b/Makefile
index e789e7c372c..91895afc538 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ endif
 .DEFAULT: runc
 
 runc:
-	$(GO_BUILD) -o runc .
+	$(GO_BUILD) -o runc ./cmd/runc
 
 all: runc recvtty sd-helper seccompagent
 
@@ -66,7 +66,7 @@ recvtty sd-helper seccompagent:
 	$(GO_BUILD) -o contrib/cmd/$@/$@ ./contrib/cmd/$@
 
 static:
-	$(GO_BUILD_STATIC) -o runc .
+	$(GO_BUILD_STATIC) -o runc ./cmd/runc
 
 releaseall: RELEASE_ARGS := "-a arm64 -a armel -a armhf -a ppc64le -a riscv64 -a s390x"
 releaseall: release
diff --git a/checkpoint.go b/cmd/runc/checkpoint.go
similarity index 100%
rename from checkpoint.go
rename to cmd/runc/checkpoint.go
diff --git a/create.go b/cmd/runc/create.go
similarity index 100%
rename from create.go
rename to cmd/runc/create.go
diff --git a/delete.go b/cmd/runc/delete.go
similarity index 100%
rename from delete.go
rename to cmd/runc/delete.go
diff --git a/events.go b/cmd/runc/events.go
similarity index 100%
rename from events.go
rename to cmd/runc/events.go
diff --git a/exec.go b/cmd/runc/exec.go
similarity index 100%
rename from exec.go
rename to cmd/runc/exec.go
diff --git a/features.go b/cmd/runc/features.go
similarity index 100%
rename from features.go
rename to cmd/runc/features.go
diff --git a/init.go b/cmd/runc/init.go
similarity index 100%
rename from init.go
rename to cmd/runc/init.go
diff --git a/kill.go b/cmd/runc/kill.go
similarity index 100%
rename from kill.go
rename to cmd/runc/kill.go
diff --git a/list.go b/cmd/runc/list.go
similarity index 100%
rename from list.go
rename to cmd/runc/list.go
diff --git a/main.go b/cmd/runc/main.go
similarity index 100%
rename from main.go
rename to cmd/runc/main.go
diff --git a/notify_socket.go b/cmd/runc/notify_socket.go
similarity index 100%
rename from notify_socket.go
rename to cmd/runc/notify_socket.go
diff --git a/pause.go b/cmd/runc/pause.go
similarity index 100%
rename from pause.go
rename to cmd/runc/pause.go
diff --git a/ps.go b/cmd/runc/ps.go
similarity index 100%
rename from ps.go
rename to cmd/runc/ps.go
diff --git a/restore.go b/cmd/runc/restore.go
similarity index 100%
rename from restore.go
rename to cmd/runc/restore.go
diff --git a/rlimit_linux.go b/cmd/runc/rlimit_linux.go
similarity index 100%
rename from rlimit_linux.go
rename to cmd/runc/rlimit_linux.go
diff --git a/rootless_linux.go b/cmd/runc/rootless_linux.go
similarity index 100%
rename from rootless_linux.go
rename to cmd/runc/rootless_linux.go
diff --git a/run.go b/cmd/runc/run.go
similarity index 100%
rename from run.go
rename to cmd/runc/run.go
diff --git a/signals.go b/cmd/runc/signals.go
similarity index 100%
rename from signals.go
rename to cmd/runc/signals.go
diff --git a/spec.go b/cmd/runc/spec.go
similarity index 100%
rename from spec.go
rename to cmd/runc/spec.go
diff --git a/start.go b/cmd/runc/start.go
similarity index 100%
rename from start.go
rename to cmd/runc/start.go
diff --git a/state.go b/cmd/runc/state.go
similarity index 100%
rename from state.go
rename to cmd/runc/state.go
diff --git a/tty.go b/cmd/runc/tty.go
similarity index 100%
rename from tty.go
rename to cmd/runc/tty.go
diff --git a/update.go b/cmd/runc/update.go
similarity index 100%
rename from update.go
rename to cmd/runc/update.go
diff --git a/utils.go b/cmd/runc/utils.go
similarity index 100%
rename from utils.go
rename to cmd/runc/utils.go
diff --git a/utils_linux.go b/cmd/runc/utils_linux.go
similarity index 100%
rename from utils_linux.go
rename to cmd/runc/utils_linux.go