diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index d84ce897..da512968 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -79,8 +79,6 @@ jobs:
 
       - name: Execute choco packaging script
         run: |
-          # Do not include the tools folder
-          rm -rf tools/
           python "./scripts/windows/choco/choco_packager.py" "./release/bottom_x86_64-pc-windows-msvc.zip" ${{ env.RELEASE_VERSION }} "./scripts/windows/choco/bottom.nuspec.template" "./scripts/windows/choco/chocolateyinstall.ps1.template" "bottom.nuspec" "tools/chocolateyinstall.ps1" "tools/"
           zip -r choco.zip "bottom.nuspec" "tools"
 
diff --git a/.github/workflows/validate_schema.yml b/.github/workflows/validate_schema.yml
index e33bde4a..14e334ef 100644
--- a/.github/workflows/validate_schema.yml
+++ b/.github/workflows/validate_schema.yml
@@ -11,7 +11,7 @@ on:
     paths:
       - "schema/**"
       - "scripts/schema/**"
-      - "tools/schema_gen/**"
+      - "scripts/schema_gen/**"
       - ".github/workflows/validate_schema.yml"
       - "Cargo.toml"
 
@@ -31,7 +31,7 @@ jobs:
         uses: ClementTsang/skip-duplicate-actions@41b0a75f656d455934ffa6a46b779d8d996ac47c
         with:
           skip_after_successful_duplicate: "true"
-          paths: '["schema/**", "scripts/schema/**", ".github/actions/**", ".github/ci/**", ".github/workflows/validate_schema.yml", "tools/schema_gen/**", "Cargo.toml"]'
+          paths: '["schema/**", "scripts/schema/**", ".github/actions/**", ".github/ci/**", ".github/workflows/validate_schema.yml", "scripts/schema_gen/**", "Cargo.toml"]'
           do_not_skip: '["workflow_dispatch"]'
 
   test-build-documentation:
diff --git a/Cargo.lock b/Cargo.lock
index 286c19d9..46e6cbd8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1786,9 +1786,9 @@ dependencies = [
 
 [[package]]
 name = "timeless"
-version = "0.0.1"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cc3e5eaa88cd8a3e3cbfc3d3f2183252f8b65c40bc5dfe7bb7345c1de42e99e"
+checksum = "767209b4e74b65405f4d46898c1a4fb344fe0182becc4c3ebf647663d68884c9"
 
 [[package]]
 name = "toml_datetime"
diff --git a/Cargo.toml b/Cargo.toml
index a707c495..28467962 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,7 +24,6 @@ exclude = [
     "sample_configs/",
     "schema/",
     "scripts/",
-    "tools/",
     "wix/",
     ".all-contributorsrc",
     ".gitignore",
@@ -89,7 +88,7 @@ rustc-hash = "2.1.3"
 serde = { version = "1.0.228", features = ["derive"] }
 starship-battery = { version = "0.11.1", optional = true }
 sysinfo = "=0.39.6"
-timeless = "0.0.1"
+timeless = "0.1.0"
 toml_edit = { version = "0.25.12", features = ["serde"] }
 unicode-ellipsis = "0.6.0"
 unicode-segmentation = "1.13.3"
diff --git a/schema/README.md b/schema/README.md
index 914b6ca4..d7dc4b09 100644
--- a/schema/README.md
+++ b/schema/README.md
@@ -4,18 +4,18 @@
 
 These are automatically generated from the code using [`schemars`](https://github.com/GREsau/schemars). The `schemars`
 derives are locked behind the `generate_schema` feature flag to avoid building unnecessary code for normal builds.
-Meanwhile, the generator itself lives in a separate `tools/schema_gen` helper crate. You can
+Meanwhile, the generator itself lives in a separate `scripts/schema_gen` helper crate. You can
 generate them like so:
 
 ```bash
 # Will print out to stdout
-cargo run --manifest-path tools/schema_gen/Cargo.toml
+cargo run --manifest-path scripts/schema_gen/Cargo.toml
 
 # e.g. for nightly
-cargo run --manifest-path tools/schema_gen/Cargo.toml > schema/nightly/bottom.json
+cargo run --manifest-path scripts/schema_gen/Cargo.toml > schema/nightly/bottom.json
 
 # e.g. for a specific version
-cargo run --manifest-path tools/schema_gen/Cargo.toml -- 0.12.0 > schema/v0.12.0/bottom.json
+cargo run --manifest-path scripts/schema_gen/Cargo.toml -- 0.12.0 > schema/v0.12.0/bottom.json
 ```
 
 Alternatively, run the `scripts/schema/generate.sh` script (for stable releases) or `scripts/schema/nightly.sh`
diff --git a/scripts/schema/generate.sh b/scripts/schema/generate.sh
index 2f15e16b..3521fe43 100755
--- a/scripts/schema/generate.sh
+++ b/scripts/schema/generate.sh
@@ -6,4 +6,4 @@ cd "$(dirname "$0")";
 cd ../..
 
 mkdir -p schema/v$1
-cargo run --manifest-path tools/schema_gen/Cargo.toml -- $1 > schema/v$1/bottom.json
+cargo run --manifest-path scripts/schema_gen/Cargo.toml -- $1 > schema/v$1/bottom.json
diff --git a/scripts/schema/nightly.sh b/scripts/schema/nightly.sh
index ed96765c..ef097454 100755
--- a/scripts/schema/nightly.sh
+++ b/scripts/schema/nightly.sh
@@ -5,4 +5,4 @@ set -e
 cd "$(dirname "$0")";
 cd ../..
 
-cargo run --manifest-path tools/schema_gen/Cargo.toml > schema/nightly/bottom.json
+cargo run --manifest-path scripts/schema_gen/Cargo.toml > schema/nightly/bottom.json
diff --git a/tools/schema_gen/.gitignore b/scripts/schema_gen/.gitignore
similarity index 100%
rename from tools/schema_gen/.gitignore
rename to scripts/schema_gen/.gitignore
diff --git a/tools/schema_gen/Cargo.lock b/scripts/schema_gen/Cargo.lock
similarity index 99%
rename from tools/schema_gen/Cargo.lock
rename to scripts/schema_gen/Cargo.lock
index 1d617212..0ab3daae 100644
--- a/tools/schema_gen/Cargo.lock
+++ b/scripts/schema_gen/Cargo.lock
@@ -1577,9 +1577,9 @@ dependencies = [
 
 [[package]]
 name = "timeless"
-version = "0.0.1"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cc3e5eaa88cd8a3e3cbfc3d3f2183252f8b65c40bc5dfe7bb7345c1de42e99e"
+checksum = "767209b4e74b65405f4d46898c1a4fb344fe0182becc4c3ebf647663d68884c9"
 
 [[package]]
 name = "toml_datetime"
diff --git a/tools/schema_gen/Cargo.toml b/scripts/schema_gen/Cargo.toml
similarity index 100%
rename from tools/schema_gen/Cargo.toml
rename to scripts/schema_gen/Cargo.toml
diff --git a/tools/schema_gen/README.md b/scripts/schema_gen/README.md
similarity index 100%
rename from tools/schema_gen/README.md
rename to scripts/schema_gen/README.md
diff --git a/tools/schema_gen/src/main.rs b/scripts/schema_gen/src/main.rs
similarity index 100%
rename from tools/schema_gen/src/main.rs
rename to scripts/schema_gen/src/main.rs