diff --git a/.gitignore b/.gitignore
index b97b0a3..6419b78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,104 @@
+# This file should only ignore things that are generated during a `x.py` build,
+# generated by common IDEs, and optional files controlled by the user that
+# affect the build (such as bootstrap.toml).
+# In particular, things like `mir_dump` should not be listed here; they are only
+# created during manual debugging and many people like to clean up instead of
+# having git ignore such leftovers. You can use `.git/info/exclude` to
+# configure your local ignore list.
+
+## File system
+.DS_Store
+desktop.ini
+
+## Editor
+*.swp
+*.swo
+Session.vim
+.cproject
+.idea
+*.iml
+.vscode
+.project
+.vim/
+.helix/
+.zed/
+.favorites.json
+.settings/
+.vs/
+.dir-locals.el
+
+## Tool
+.valgrindrc
+.cargo
+# Included because it is part of the test case
+!/tests/run-make/thumb-none-qemu/example/.cargo
+
+## Configuration
+/bootstrap.toml
+/config.toml
+/Makefile
+config.mk
+config.stamp
+no_llvm_build
+
+## Build
+/dl/
+/doc/
+/inst/
+/llvm/
+/mingw-build/
+/build
+/build-rust-analyzer/
+/dist/
+/unicode-downloads
 /target
-.aider*
-.env
+/library/target
+/src/bootstrap/target
+/src/ci/citool/target
+/src/tools/x/target
+# Created by `x vendor`
+/vendor
+# Created by default with `src/ci/docker/run.sh`
+/obj/
+# Created by nix dev shell / .envrc
+src/tools/nix-dev-shell/flake.lock
+
+## ICE reports
+rustc-ice-*.txt
+
+## Temporary files
+*~
+\#*
+\#*\#
+.#*
+
+## Tags
+tags
+tags.*
+TAGS
+TAGS.*
+
+## Python
+__pycache__/
+*.py[cod]
+*$py.class
+
+## Node
+node_modules
+package-lock.json
+package.json
+/src/doc/rustc-dev-guide/mermaid.min.js
+
+## Rustdoc GUI tests
+tests/rustdoc-gui/src/**.lock
+
+## direnv
+/.envrc
+/.direnv/
+
+## nix
+/flake.nix
+flake.lock
+/default.nix
+
+# Before adding new lines, see the comment at the top.
\ No newline at end of file
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 0000000..dd2df77
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,3 @@
+[workspace]
+resolver = "3"
+members = ["r2client", "r2cli", "r2python", "aws_sigv4"]
diff --git a/r2cli/.gitignore b/r2cli/.gitignore
deleted file mode 100644
index b97b0a3..0000000
--- a/r2cli/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/target
-.aider*
-.env
diff --git a/r2python/.gitignore b/r2python/.gitignore
deleted file mode 100644
index b5d2ef8..0000000
--- a/r2python/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target
-.aider*