diff --git a/.air.toml b/.air.toml
index 2175f53d..c4755c12 100644
--- a/.air.toml
+++ b/.air.toml
@@ -1,51 +1,23 @@
 root = "."
-testdata_dir = "testdata"
 tmp_dir = "tmp"
 
 [build]
-  args_bin = []
-  bin = "./tmp/main"
   cmd = "go build -o ./tmp/main ./cmd"
-  delay = 1000
-  exclude_dir = ["assets", "tmp", "vendor", "testdata"]
-  exclude_file = []
+  entrypoint = ["./tmp/main"]
+  delay = 500
+  include_dir = ["api", "cmd", "pkg"]
+  include_ext = ["go"]
   exclude_regex = ["_test.go"]
-  exclude_unchanged = false
-  follow_symlink = false
-  full_bin = ""
-  include_dir = []
-  include_ext = ["go", "tpl", "tmpl", "html"]
-  include_file = []
-  kill_delay = "0s"
-  log = "build-errors.log"
-  poll = false
-  poll_interval = 0
-  post_cmd = []
-  pre_cmd = []
-  rerun = false
-  rerun_delay = 500
-  send_interrupt = false
-  stop_on_error = false
-
-[color]
-  app = ""
-  build = "yellow"
-  main = "magenta"
-  runner = "green"
-  watcher = "cyan"
+  exclude_unchanged = true
+  send_interrupt = true
+  kill_delay = "500ms"
+  stop_on_error = true
 
 [log]
-  main_only = false
-  silent = false
-  time = false
+  time = true
 
 [misc]
-  clean_on_exit = false
-
-[proxy]
-  app_port = 0
-  enabled = false
-  proxy_port = 0
+  clean_on_exit = true
 
 [screen]
   clear_on_rebuild = false
diff --git a/.docs/readme/images/1.png b/.docs/readme/images/1.png
deleted file mode 100644
index e9f6e5e1..00000000
Binary files a/.docs/readme/images/1.png and /dev/null differ
diff --git a/.docs/readme/images/10.png b/.docs/readme/images/10.png
deleted file mode 100644
index a322078e..00000000
Binary files a/.docs/readme/images/10.png and /dev/null differ
diff --git a/.docs/readme/images/2.png b/.docs/readme/images/2.png
deleted file mode 100644
index a08c2e6e..00000000
Binary files a/.docs/readme/images/2.png and /dev/null differ
diff --git a/.docs/readme/images/3.png b/.docs/readme/images/3.png
deleted file mode 100644
index 23b7654a..00000000
Binary files a/.docs/readme/images/3.png and /dev/null differ
diff --git a/.docs/readme/images/4.png b/.docs/readme/images/4.png
deleted file mode 100644
index 7504a4b9..00000000
Binary files a/.docs/readme/images/4.png and /dev/null differ
diff --git a/.docs/readme/images/5.png b/.docs/readme/images/5.png
deleted file mode 100644
index dbc91a96..00000000
Binary files a/.docs/readme/images/5.png and /dev/null differ
diff --git a/.docs/readme/images/6.png b/.docs/readme/images/6.png
deleted file mode 100644
index d4da29d1..00000000
Binary files a/.docs/readme/images/6.png and /dev/null differ
diff --git a/.docs/readme/images/7.png b/.docs/readme/images/7.png
deleted file mode 100644
index 8d1eff45..00000000
Binary files a/.docs/readme/images/7.png and /dev/null differ
diff --git a/.docs/readme/images/8.png b/.docs/readme/images/8.png
deleted file mode 100644
index c3bd8f48..00000000
Binary files a/.docs/readme/images/8.png and /dev/null differ
diff --git a/.docs/readme/images/9.png b/.docs/readme/images/9.png
deleted file mode 100644
index 76527f17..00000000
Binary files a/.docs/readme/images/9.png and /dev/null differ
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index c0bce2f4..057ac350 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -26,8 +26,8 @@ updates:
           - '*'
   - package-ecosystem: 'docker'
     directories:
-      - '/.docker/js'
-      - '/.docker/go'
+      - '/docker/js'
+      - '/docker/go'
     schedule:
       interval: 'monthly'
     groups:
diff --git a/README.md b/README.md
index e7e0323b..1c41e941 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 
 </div>
 
-![2](/.docs/readme/images/title.png)
+![2](/docs/assets/readme/images/title.png)
 
 ## 目次
 
@@ -209,15 +209,7 @@ pnpm test:e2e:report
 ❯ tree -a -I "node_modules|.next|.git|out|.vercel|_|.DS_Store|.env|next-env.d.ts|tmp|coverage|tsconfig.tsbuildinfo|playwright-report|test-results|.pnpm-store|.terraform|terraform.tfstate|terraform.tfstate.backup|terraform.tfvars" -L 3
 .
 ├── .air.toml
-├── .docker
-│   ├── go
-│   │   └── Dockerfile
-│   └── js
-│       └── Dockerfile
 ├── .dockerignore
-├── .docs
-│   └── readme
-│       └── images
 ├── .env.example
 ├── .github
 │   ├── dependabot.yml
@@ -247,6 +239,14 @@ pnpm test:e2e:report
 ├── cmd
 │   └── main.go
 ├── docker-compose.yml
+├── docker
+│   ├── go
+│   │   └── Dockerfile
+│   └── js
+│       └── Dockerfile
+├── docs
+│   └── assets
+│       └── readme
 ├── e2e
 │   ├── contact.spec.ts
 │   ├── feeds.spec.ts
diff --git a/docker-compose.yml b/docker-compose.yml
index 35f6e2b2..7ed8fdba 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,9 +1,8 @@
 services:
   js:
-    container_name: js
     build:
       context: .
-      dockerfile: ./.docker/js/Dockerfile
+      dockerfile: ./docker/js/Dockerfile
     volumes:
       - './:/var/www/html/js'
       - '/var/www/html/js/node_modules'
@@ -15,10 +14,9 @@ services:
       - network
 
   go:
-    container_name: go
     build:
       context: .
-      dockerfile: ./.docker/go/Dockerfile
+      dockerfile: ./docker/go/Dockerfile
     volumes:
       - './:/app'
     working_dir: '/app'
diff --git a/.docker/go/Dockerfile b/docker/go/Dockerfile
similarity index 66%
rename from .docker/go/Dockerfile
rename to docker/go/Dockerfile
index 2ec05c32..1db8440f 100644
--- a/.docker/go/Dockerfile
+++ b/docker/go/Dockerfile
@@ -2,7 +2,8 @@ FROM golang:1.26.3-alpine
 
 WORKDIR /app
 
-RUN go install github.com/air-verse/air@latest
+ARG AIR_VERSION=v1.65.1
+RUN go install github.com/air-verse/air@${AIR_VERSION}
 
 COPY ./go.mod ./go.sum ./
 RUN go mod download
@@ -10,6 +11,7 @@ RUN go mod download
 COPY ./.air.toml ./
 COPY ./api/ ./api/
 COPY ./cmd/ ./cmd/
+COPY ./pkg/ ./pkg/
 
 EXPOSE 8000
 
diff --git a/.docker/js/Dockerfile b/docker/js/Dockerfile
similarity index 100%
rename from .docker/js/Dockerfile
rename to docker/js/Dockerfile
diff --git a/.docs/readme/images/title.png b/docs/assets/readme/images/title.png
similarity index 100%
rename from .docs/readme/images/title.png
rename to docs/assets/readme/images/title.png