diff --git a/src/restic/cmd/restic-server/.gitignore b/src/cmds/restic-server/.gitignore similarity index 100% rename from src/restic/cmd/restic-server/.gitignore rename to src/cmds/restic-server/.gitignore diff --git a/src/restic/cmd/restic-server/LICENSE b/src/cmds/restic-server/LICENSE similarity index 100% rename from src/restic/cmd/restic-server/LICENSE rename to src/cmds/restic-server/LICENSE diff --git a/src/restic/cmd/restic-server/README.md b/src/cmds/restic-server/README.md similarity index 100% rename from src/restic/cmd/restic-server/README.md rename to src/cmds/restic-server/README.md diff --git a/src/restic/cmd/restic-server/handlers.go b/src/cmds/restic-server/handlers.go similarity index 100% rename from src/restic/cmd/restic-server/handlers.go rename to src/cmds/restic-server/handlers.go diff --git a/src/restic/cmd/restic-server/htpasswd.go b/src/cmds/restic-server/htpasswd.go similarity index 100% rename from src/restic/cmd/restic-server/htpasswd.go rename to src/cmds/restic-server/htpasswd.go diff --git a/src/restic/cmd/restic-server/router.go b/src/cmds/restic-server/router.go similarity index 100% rename from src/restic/cmd/restic-server/router.go rename to src/cmds/restic-server/router.go diff --git a/src/restic/cmd/restic-server/router_test.go b/src/cmds/restic-server/router_test.go similarity index 100% rename from src/restic/cmd/restic-server/router_test.go rename to src/cmds/restic-server/router_test.go diff --git a/src/restic/cmd/restic-server/server.go b/src/cmds/restic-server/server.go similarity index 100% rename from src/restic/cmd/restic-server/server.go rename to src/cmds/restic-server/server.go diff --git a/src/restic/cmd/restic/.gitignore b/src/cmds/restic/.gitignore similarity index 100% rename from src/restic/cmd/restic/.gitignore rename to src/cmds/restic/.gitignore diff --git a/src/restic/cmd/restic/cleanup.go b/src/cmds/restic/cleanup.go similarity index 100% rename from src/restic/cmd/restic/cleanup.go rename to src/cmds/restic/cleanup.go diff --git a/src/restic/cmd/restic/cmd_backup.go b/src/cmds/restic/cmd_backup.go similarity index 100% rename from src/restic/cmd/restic/cmd_backup.go rename to src/cmds/restic/cmd_backup.go diff --git a/src/restic/cmd/restic/cmd_cache.go b/src/cmds/restic/cmd_cache.go similarity index 100% rename from src/restic/cmd/restic/cmd_cache.go rename to src/cmds/restic/cmd_cache.go diff --git a/src/restic/cmd/restic/cmd_cat.go b/src/cmds/restic/cmd_cat.go similarity index 100% rename from src/restic/cmd/restic/cmd_cat.go rename to src/cmds/restic/cmd_cat.go diff --git a/src/restic/cmd/restic/cmd_check.go b/src/cmds/restic/cmd_check.go similarity index 100% rename from src/restic/cmd/restic/cmd_check.go rename to src/cmds/restic/cmd_check.go diff --git a/src/restic/cmd/restic/cmd_dump.go b/src/cmds/restic/cmd_dump.go similarity index 100% rename from src/restic/cmd/restic/cmd_dump.go rename to src/cmds/restic/cmd_dump.go diff --git a/src/restic/cmd/restic/cmd_find.go b/src/cmds/restic/cmd_find.go similarity index 100% rename from src/restic/cmd/restic/cmd_find.go rename to src/cmds/restic/cmd_find.go diff --git a/src/restic/cmd/restic/cmd_init.go b/src/cmds/restic/cmd_init.go similarity index 100% rename from src/restic/cmd/restic/cmd_init.go rename to src/cmds/restic/cmd_init.go diff --git a/src/restic/cmd/restic/cmd_key.go b/src/cmds/restic/cmd_key.go similarity index 100% rename from src/restic/cmd/restic/cmd_key.go rename to src/cmds/restic/cmd_key.go diff --git a/src/restic/cmd/restic/cmd_list.go b/src/cmds/restic/cmd_list.go similarity index 100% rename from src/restic/cmd/restic/cmd_list.go rename to src/cmds/restic/cmd_list.go diff --git a/src/restic/cmd/restic/cmd_ls.go b/src/cmds/restic/cmd_ls.go similarity index 100% rename from src/restic/cmd/restic/cmd_ls.go rename to src/cmds/restic/cmd_ls.go diff --git a/src/restic/cmd/restic/cmd_mount.go b/src/cmds/restic/cmd_mount.go similarity index 100% rename from src/restic/cmd/restic/cmd_mount.go rename to src/cmds/restic/cmd_mount.go diff --git a/src/restic/cmd/restic/cmd_optimize.go b/src/cmds/restic/cmd_optimize.go similarity index 100% rename from src/restic/cmd/restic/cmd_optimize.go rename to src/cmds/restic/cmd_optimize.go diff --git a/src/restic/cmd/restic/cmd_rebuild_index.go b/src/cmds/restic/cmd_rebuild_index.go similarity index 100% rename from src/restic/cmd/restic/cmd_rebuild_index.go rename to src/cmds/restic/cmd_rebuild_index.go diff --git a/src/restic/cmd/restic/cmd_restore.go b/src/cmds/restic/cmd_restore.go similarity index 100% rename from src/restic/cmd/restic/cmd_restore.go rename to src/cmds/restic/cmd_restore.go diff --git a/src/restic/cmd/restic/cmd_snapshots.go b/src/cmds/restic/cmd_snapshots.go similarity index 100% rename from src/restic/cmd/restic/cmd_snapshots.go rename to src/cmds/restic/cmd_snapshots.go diff --git a/src/restic/cmd/restic/cmd_unlock.go b/src/cmds/restic/cmd_unlock.go similarity index 100% rename from src/restic/cmd/restic/cmd_unlock.go rename to src/cmds/restic/cmd_unlock.go diff --git a/src/restic/cmd/restic/cmd_version.go b/src/cmds/restic/cmd_version.go similarity index 100% rename from src/restic/cmd/restic/cmd_version.go rename to src/cmds/restic/cmd_version.go diff --git a/src/restic/cmd/restic/doc.go b/src/cmds/restic/doc.go similarity index 100% rename from src/restic/cmd/restic/doc.go rename to src/cmds/restic/doc.go diff --git a/src/restic/cmd/restic/global.go b/src/cmds/restic/global.go similarity index 100% rename from src/restic/cmd/restic/global.go rename to src/cmds/restic/global.go diff --git a/src/restic/cmd/restic/integration_fuse_test.go b/src/cmds/restic/integration_fuse_test.go similarity index 100% rename from src/restic/cmd/restic/integration_fuse_test.go rename to src/cmds/restic/integration_fuse_test.go diff --git a/src/restic/cmd/restic/integration_helpers_test.go b/src/cmds/restic/integration_helpers_test.go similarity index 100% rename from src/restic/cmd/restic/integration_helpers_test.go rename to src/cmds/restic/integration_helpers_test.go diff --git a/src/restic/cmd/restic/integration_helpers_unix_test.go b/src/cmds/restic/integration_helpers_unix_test.go similarity index 100% rename from src/restic/cmd/restic/integration_helpers_unix_test.go rename to src/cmds/restic/integration_helpers_unix_test.go diff --git a/src/restic/cmd/restic/integration_helpers_windows_test.go b/src/cmds/restic/integration_helpers_windows_test.go similarity index 100% rename from src/restic/cmd/restic/integration_helpers_windows_test.go rename to src/cmds/restic/integration_helpers_windows_test.go diff --git a/src/restic/cmd/restic/integration_test.go b/src/cmds/restic/integration_test.go similarity index 100% rename from src/restic/cmd/restic/integration_test.go rename to src/cmds/restic/integration_test.go diff --git a/src/restic/cmd/restic/lock.go b/src/cmds/restic/lock.go similarity index 100% rename from src/restic/cmd/restic/lock.go rename to src/cmds/restic/lock.go diff --git a/src/restic/cmd/restic/main.go b/src/cmds/restic/main.go similarity index 100% rename from src/restic/cmd/restic/main.go rename to src/cmds/restic/main.go diff --git a/src/restic/cmd/restic/testdata/backup-data.tar.gz b/src/cmds/restic/testdata/backup-data.tar.gz similarity index 100% rename from src/restic/cmd/restic/testdata/backup-data.tar.gz rename to src/cmds/restic/testdata/backup-data.tar.gz diff --git a/src/restic/cmd/restic/testdata/old-index-repo.tar.gz b/src/cmds/restic/testdata/old-index-repo.tar.gz similarity index 100% rename from src/restic/cmd/restic/testdata/old-index-repo.tar.gz rename to src/cmds/restic/testdata/old-index-repo.tar.gz diff --git a/src/restic/cmd/restic/testdata/repo-restore-permissions-test.tar.gz b/src/cmds/restic/testdata/repo-restore-permissions-test.tar.gz similarity index 100% rename from src/restic/cmd/restic/testdata/repo-restore-permissions-test.tar.gz rename to src/cmds/restic/testdata/repo-restore-permissions-test.tar.gz diff --git a/src/restic/cmd/restic/testdata/small-repo.tar.gz b/src/cmds/restic/testdata/small-repo.tar.gz similarity index 100% rename from src/restic/cmd/restic/testdata/small-repo.tar.gz rename to src/cmds/restic/testdata/small-repo.tar.gz