diff --git a/README.md b/README.md
index 11aec22fd..f01309437 100644
--- a/README.md
+++ b/README.md
@@ -25,10 +25,10 @@ task lint:cpp-configs
 Certain file types need to be added to our linting rules manually:
 
 * **CMake**. If adding a CMake file, add it (or its parent directory) as an argument to the
-  `gersemi` command in [lint-tasks.yaml](lint-tasks.yaml).
+  `gersemi` command in [taskfiles/lint.yaml](taskfiles/lint.yaml).
   * If adding a directory, the file must be named `CMakeLists.txt` or use the `.cmake` extension.
 * **YAML**. If adding a YAML file (regardless of its extension), add it as an argument to the
-  `yamllint` command in [lint-tasks.yaml](lint-tasks.yaml).
+  `yamllint` command in [taskfiles/lint.yaml](taskfiles/lint.yaml).
 
 ## Linting
 Before submitting a pull request, ensure you’ve run the linting commands below and either fixed any
diff --git a/docs/src/user-docs/guides-quick-start.md b/docs/src/user-docs/guides-quick-start.md
index ca4c5411c..9379669ac 100644
--- a/docs/src/user-docs/guides-quick-start.md
+++ b/docs/src/user-docs/guides-quick-start.md
@@ -77,7 +77,7 @@ task deps:lib_install
 This will install all dependencies in the `build/deps` directory.
 
 Alternatively, you can install the dependencies to the system. See the `install-all-run` task in
-[deps-task.yaml] for the list of dependencies to install.
+[taskfiles/deps.yaml][deps-task] for the list of dependencies to install.
 
 # Building the task into a shared library
 
@@ -257,7 +257,7 @@ task, and the worker handles the task output as usual. Then the worker exits wit
 In future guides, we'll explain how to write more complex tasks, as well as how to leverage Spider's
 support for fault tolerance.
 
-[deps-task.yaml]: https://github.com/y-scope/spider/blob/main/dep-tasks.yaml
+[deps-task]: https://github.com/y-scope/spider/blob/main/taskfiles/deps.yaml
 [Docker]: https://docs.docker.com/engine/install/
 [docker-non-root]: https://docs.docker.com/engine/install/linux-postinstall/#manage-docker-as-a-non-root-user
 [examples/quick-start]: https://github.com/y-scope/spider/tree/main/examples/quick-start
diff --git a/taskfile.yaml b/taskfile.yaml
index 8c872dafe..3121d56b6 100644
--- a/taskfile.yaml
+++ b/taskfile.yaml
@@ -1,11 +1,11 @@
 version: "3"
 
 includes:
-  build: "build-tasks.yaml"
-  deps: "dep-tasks.yaml"
+  build: "taskfiles/build.yaml"
+  deps: "taskfiles/deps.yaml"
   docs: "docs/tasks.yaml"
-  lint: "lint-tasks.yaml"
-  test: "test-tasks.yaml"
+  lint: "taskfiles/lint.yaml"
+  test: "taskfiles/test.yaml"
   utils: "tools/yscope-dev-utils/exports/taskfiles/utils/utils.yaml"
 
 vars:
diff --git a/build-tasks.yaml b/taskfiles/build.yaml
similarity index 100%
rename from build-tasks.yaml
rename to taskfiles/build.yaml
diff --git a/dep-tasks.yaml b/taskfiles/deps.yaml
similarity index 100%
rename from dep-tasks.yaml
rename to taskfiles/deps.yaml
diff --git a/lint-tasks.yaml b/taskfiles/lint.yaml
similarity index 97%
rename from lint-tasks.yaml
rename to taskfiles/lint.yaml
index d194d951a..9ce97f1b4 100644
--- a/lint-tasks.yaml
+++ b/taskfiles/lint.yaml
@@ -177,12 +177,8 @@ tasks:
           --strict \
           .gersemirc \
           .github/ \
-          build-tasks.yaml \
-          dep-tasks.yaml \
-          docs/tasks.yaml \
-          lint-tasks.yaml \
           taskfile.yaml \
-          test-tasks.yaml
+          taskfiles/
 
   toml-check:
     cmds:
diff --git a/test-tasks.yaml b/taskfiles/test.yaml
similarity index 100%
rename from test-tasks.yaml
rename to taskfiles/test.yaml