diff --git a/tools/Cargo.toml b/tools/Cargo.toml
index a123473..fc616a0 100644
--- a/tools/Cargo.toml
+++ b/tools/Cargo.toml
@@ -12,6 +12,10 @@ edition = "2018"
 repository = "https://gitlab.com/openpgp-card/openpgp-card"
 documentation = "https://docs.rs/crate/openpgp-card-tools"
 
+[[bin]]
+name = "opgpcard"
+path = "src/opgpcard.rs"
+
 [dependencies]
 sequoia-openpgp = "1.3"
 openpgp-card-pcsc = { path = "../pcsc", version = "0.3" }
diff --git a/tools/src/bin/opgpcard/cli.rs b/tools/src/cli.rs
similarity index 100%
rename from tools/src/bin/opgpcard/cli.rs
rename to tools/src/cli.rs
diff --git a/tools/src/bin/opgpcard/commands/admin.rs b/tools/src/commands/admin.rs
similarity index 100%
rename from tools/src/bin/opgpcard/commands/admin.rs
rename to tools/src/commands/admin.rs
diff --git a/tools/src/bin/opgpcard/commands/attestation.rs b/tools/src/commands/attestation.rs
similarity index 100%
rename from tools/src/bin/opgpcard/commands/attestation.rs
rename to tools/src/commands/attestation.rs
diff --git a/tools/src/bin/opgpcard/commands/decrypt.rs b/tools/src/commands/decrypt.rs
similarity index 100%
rename from tools/src/bin/opgpcard/commands/decrypt.rs
rename to tools/src/commands/decrypt.rs
diff --git a/tools/src/bin/opgpcard/commands/factory_reset.rs b/tools/src/commands/factory_reset.rs
similarity index 100%
rename from tools/src/bin/opgpcard/commands/factory_reset.rs
rename to tools/src/commands/factory_reset.rs
diff --git a/tools/src/bin/opgpcard/commands/info.rs b/tools/src/commands/info.rs
similarity index 100%
rename from tools/src/bin/opgpcard/commands/info.rs
rename to tools/src/commands/info.rs
diff --git a/tools/src/bin/opgpcard/commands/mod.rs b/tools/src/commands/mod.rs
similarity index 100%
rename from tools/src/bin/opgpcard/commands/mod.rs
rename to tools/src/commands/mod.rs
diff --git a/tools/src/bin/opgpcard/commands/pin.rs b/tools/src/commands/pin.rs
similarity index 100%
rename from tools/src/bin/opgpcard/commands/pin.rs
rename to tools/src/commands/pin.rs
diff --git a/tools/src/bin/opgpcard/commands/pubkey.rs b/tools/src/commands/pubkey.rs
similarity index 100%
rename from tools/src/bin/opgpcard/commands/pubkey.rs
rename to tools/src/commands/pubkey.rs
diff --git a/tools/src/bin/opgpcard/commands/set_identity.rs b/tools/src/commands/set_identity.rs
similarity index 100%
rename from tools/src/bin/opgpcard/commands/set_identity.rs
rename to tools/src/commands/set_identity.rs
diff --git a/tools/src/bin/opgpcard/commands/sign.rs b/tools/src/commands/sign.rs
similarity index 100%
rename from tools/src/bin/opgpcard/commands/sign.rs
rename to tools/src/commands/sign.rs
diff --git a/tools/src/bin/opgpcard/commands/ssh.rs b/tools/src/commands/ssh.rs
similarity index 100%
rename from tools/src/bin/opgpcard/commands/ssh.rs
rename to tools/src/commands/ssh.rs
diff --git a/tools/src/bin/opgpcard/commands/status.rs b/tools/src/commands/status.rs
similarity index 100%
rename from tools/src/bin/opgpcard/commands/status.rs
rename to tools/src/commands/status.rs
diff --git a/tools/src/bin/opgpcard/main.rs b/tools/src/opgpcard.rs
similarity index 100%
rename from tools/src/bin/opgpcard/main.rs
rename to tools/src/opgpcard.rs
diff --git a/tools/src/bin/opgpcard/output/attest.rs b/tools/src/output/attest.rs
similarity index 100%
rename from tools/src/bin/opgpcard/output/attest.rs
rename to tools/src/output/attest.rs
diff --git a/tools/src/bin/opgpcard/output/generate.rs b/tools/src/output/generate.rs
similarity index 100%
rename from tools/src/bin/opgpcard/output/generate.rs
rename to tools/src/output/generate.rs
diff --git a/tools/src/bin/opgpcard/output/info.rs b/tools/src/output/info.rs
similarity index 100%
rename from tools/src/bin/opgpcard/output/info.rs
rename to tools/src/output/info.rs
diff --git a/tools/src/bin/opgpcard/output/list.rs b/tools/src/output/list.rs
similarity index 100%
rename from tools/src/bin/opgpcard/output/list.rs
rename to tools/src/output/list.rs
diff --git a/tools/src/bin/opgpcard/output/mod.rs b/tools/src/output/mod.rs
similarity index 100%
rename from tools/src/bin/opgpcard/output/mod.rs
rename to tools/src/output/mod.rs
diff --git a/tools/src/bin/opgpcard/output/pubkey.rs b/tools/src/output/pubkey.rs
similarity index 100%
rename from tools/src/bin/opgpcard/output/pubkey.rs
rename to tools/src/output/pubkey.rs
diff --git a/tools/src/bin/opgpcard/output/ssh.rs b/tools/src/output/ssh.rs
similarity index 100%
rename from tools/src/bin/opgpcard/output/ssh.rs
rename to tools/src/output/ssh.rs
diff --git a/tools/src/bin/opgpcard/output/status.rs b/tools/src/output/status.rs
similarity index 100%
rename from tools/src/bin/opgpcard/output/status.rs
rename to tools/src/output/status.rs
diff --git a/tools/src/bin/opgpcard/util.rs b/tools/src/util.rs
similarity index 100%
rename from tools/src/bin/opgpcard/util.rs
rename to tools/src/util.rs
diff --git a/tools/src/bin/opgpcard/versioned_output.rs b/tools/src/versioned_output.rs
similarity index 100%
rename from tools/src/bin/opgpcard/versioned_output.rs
rename to tools/src/versioned_output.rs