diff --git a/Makefile b/Makefile
index 9c1537e8..63ed005e 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ GIT_COMMIT := $(shell git rev-parse HEAD 2> /dev/null || true)
 all: binary
 
 binary:
-	go build -ldflags "-X main.gitCommit=${GIT_COMMIT}" -o ${DEST}skopeo .
+	go build -ldflags "-X main.gitCommit=${GIT_COMMIT}" -o ${DEST}skopeo ./cmd/skopeo
 
 build-container:
 	docker build ${DOCKER_BUILD_ARGS} -t "$(DOCKER_IMAGE)" .
diff --git a/cgo_pthread_ordering_workaround.go b/cmd/skopeo/cgo_pthread_ordering_workaround.go
similarity index 100%
rename from cgo_pthread_ordering_workaround.go
rename to cmd/skopeo/cgo_pthread_ordering_workaround.go
diff --git a/copy.go b/cmd/skopeo/copy.go
similarity index 100%
rename from copy.go
rename to cmd/skopeo/copy.go
diff --git a/directory.go b/cmd/skopeo/directory.go
similarity index 100%
rename from directory.go
rename to cmd/skopeo/directory.go
diff --git a/docker_client.go b/cmd/skopeo/docker_client.go
similarity index 100%
rename from docker_client.go
rename to cmd/skopeo/docker_client.go
diff --git a/docker_image.go b/cmd/skopeo/docker_image.go
similarity index 100%
rename from docker_image.go
rename to cmd/skopeo/docker_image.go
diff --git a/docker_image_dest.go b/cmd/skopeo/docker_image_dest.go
similarity index 100%
rename from docker_image_dest.go
rename to cmd/skopeo/docker_image_dest.go
diff --git a/docker_image_src.go b/cmd/skopeo/docker_image_src.go
similarity index 100%
rename from docker_image_src.go
rename to cmd/skopeo/docker_image_src.go
diff --git a/docker_utils.go b/cmd/skopeo/docker_utils.go
similarity index 100%
rename from docker_utils.go
rename to cmd/skopeo/docker_utils.go
diff --git a/inspect.go b/cmd/skopeo/inspect.go
similarity index 100%
rename from inspect.go
rename to cmd/skopeo/inspect.go
diff --git a/layers.go b/cmd/skopeo/layers.go
similarity index 100%
rename from layers.go
rename to cmd/skopeo/layers.go
diff --git a/main.go b/cmd/skopeo/main.go
similarity index 100%
rename from main.go
rename to cmd/skopeo/main.go
diff --git a/openshift-copies.go b/cmd/skopeo/openshift-copies.go
similarity index 100%
rename from openshift-copies.go
rename to cmd/skopeo/openshift-copies.go
diff --git a/openshift.go b/cmd/skopeo/openshift.go
similarity index 100%
rename from openshift.go
rename to cmd/skopeo/openshift.go
diff --git a/signing.go b/cmd/skopeo/signing.go
similarity index 100%
rename from signing.go
rename to cmd/skopeo/signing.go
diff --git a/utils.go b/cmd/skopeo/utils.go
similarity index 100%
rename from utils.go
rename to cmd/skopeo/utils.go