diff --git a/.bazelignore b/.bazelignore
index ec27918fdc..b3958fcab4 100644
--- a/.bazelignore
+++ b/.bazelignore
@@ -7,4 +7,4 @@ vendor
 .github
 hack
 template
-pkg/app/web/node_modules
\ No newline at end of file
+web/node_modules
\ No newline at end of file
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index d4ccb18f6a..bdc9a69b7d 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -39,8 +39,8 @@ jobs:
             ${{ runner.os }}-yarn-
 
       - name: Yarn install
-        working-directory: pkg/app/web
+        working-directory: web
         run: yarn install
       - name: Run unit tests
-        working-directory: pkg/app/web
+        working-directory: web
         run: echo "WIP"
diff --git a/.gitignore b/.gitignore
index 2c885af9ee..b795b7424d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,13 +32,11 @@
 node_modules
 
 # web
-pkg/app/web/dist
+web/dist
+web/.env
+web/.cache
+web/coverage
 pkg/app/web/.env
-pkg/app/web/.cache
-pkg/app/web/coverage
-
-# generated by hack/gen-grpc-web-client.sh
-pkg/app/web/src/service
 
 # IDE config files
 .ijwb
diff --git a/.kapetanios/presubmit.yaml b/.kapetanios/presubmit.yaml
index cb0a7d97b0..2b5695e4e3 100644
--- a/.kapetanios/presubmit.yaml
+++ b/.kapetanios/presubmit.yaml
@@ -31,7 +31,7 @@ spec:
     - description: Run coverage for unit tests
       runner: gcr.io/pipecd/runner:1.0.0
       commands:
-        - bazelisk --output_base=/workspace/bazel_out coverage --config=ci --config=linux -- //pkg/... -//pkg/app/web/...
+        - bazelisk --output_base=/workspace/bazel_out coverage --config=ci --config=linux -- //pkg/...
       secrets:
       - name: bazel_cache_service_account
         type: PROJECT
@@ -61,7 +61,7 @@ spec:
   - name: web-test
     timeout: 30m
     whenChanged:
-      - pkg/app/web/**
+      - web/**
     steps:
     - name: restore-cache
       description: Restore node modules cache
@@ -72,7 +72,7 @@ spec:
     - name: install-dependencies
       runner: gcr.io/kapetanios/node:16.13.1
       commands:
-        - cd pkg/app/web
+        - cd web
         - yarn install --frozen-lockfile
     - description: Save node modules cache
       runner: kapetanios@save-cache
@@ -83,7 +83,7 @@ spec:
       description: Generate API client code
       runner: gcr.io/pipecd/runner:1.0.0
       commands:
-        - bazelisk --output_base=/workspace/bazel_out build --config=ci //pkg/app/web:build_api //pkg/app/web:build_model
+        - bazelisk --output_base=/workspace/bazel_out build --config=ci //web:build_api //web:build_model
       secrets:
       - name: bazel_cache_service_account
         type: PROJECT
@@ -91,7 +91,7 @@ spec:
       description: Run all web tests
       runner: gcr.io/kapetanios/node:16.13.1
       commands:
-        - cd pkg/app/web
+        - cd web
         - yarn test:coverage --coverageDirectory=/artifact --runInBand
         - yarn typecheck
       requires:
diff --git a/BUILD.bazel b/BUILD.bazel
index ce0093c017..88d0cdac74 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -7,7 +7,7 @@ load("@bazel_gazelle//:def.bzl", "gazelle")
 # gazelle:exclude terraform
 # gazelle:exclude template
 # gazelle:exclude vendor
-# gazelle:exclude pkg/app/web/node_modules
+# gazelle:exclude web/node_modules
 # gazelle:exclude pkg/plugin/golinter/gofmt/testdata
 # gazelle:exclude pkg/app/kapetool/cmd/godifflinter/pkg/linters/unusedparam/testdata
 # gazelle:exclude pkg/app/kapetool/cmd/godifflinter/pkg/linters/ineffassign/testdata
diff --git a/Makefile b/Makefile
index d9cac251b2..54115e518f 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ test-integration:
 
 .PHONY: coverage
 coverage:
-	bazelisk ${BAZEL_FLAGS} coverage ${BAZEL_COMMAND_FLAGS} -- //pkg/... -//pkg/app/web/...
+	bazelisk ${BAZEL_FLAGS} coverage ${BAZEL_COMMAND_FLAGS} -- //pkg/...
 
 .PHONY: dep
 dep:
@@ -80,19 +80,19 @@ site:
 
 .PHONY: web-dep
 web-dep:
-	bazelisk build //pkg/app/web:build_api //pkg/app/web:build_model
+	bazelisk build //web:build_api //web:build_model
 
 .PHONY: web-dev
 web-dev:
-	cd pkg/app/web; yarn dev
+	cd web; yarn dev
 
 .PHONY: web-test
 web-test:
-	cd pkg/app/web; yarn test:coverage --runInBand
+	cd web; yarn test:coverage --runInBand
 
 .PHONY: web-lint
 web-lint:
-	cd pkg/app/web; yarn lint:fix
+	cd web; yarn lint:fix
 
 .PHONY: generate-test-tls
 generate-test-tls:
@@ -129,4 +129,4 @@ update-docsy:
 
 .PHONY: codegen
 codegen:
-	docker run --rm -v ${PWD}:/repo -it gcr.io/pipecd/codegen:0.5.0 /repo
+	docker run --rm -v ${PWD}:/repo -it gcr.io/pipecd/codegen:0.6.0 /repo
diff --git a/WORKSPACE b/WORKSPACE
index 6814cc4b48..7cd69863b1 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,6 +1,6 @@
 workspace(
     name = "pipecd",
-    managed_directories = {"@npm": ["pkg/app/web/node_modules"]},
+    managed_directories = {"@npm": ["web/node_modules"]},
 )
 
 load(
@@ -178,15 +178,15 @@ load(
 ### https://bazelbuild.github.io/rules_nodejs/Built-ins.html#usage
 node_repositories(
     node_version = "16.13.0",
-    package_json = ["//pkg/app/web:package.json"],
+    package_json = ["//web:package.json"],
     yarn_version = "1.22.4",
 )
 
 yarn_install(
     name = "npm",
     frozen_lockfile = False,
-    package_json = "//pkg/app/web:package.json",
-    yarn_lock = "//pkg/app/web:yarn.lock",
+    package_json = "//web:package.json",
+    yarn_lock = "//web:yarn.lock",
 )
 
 load("@npm//@bazel/labs:package.bzl", "npm_bazel_labs_dependencies")
diff --git a/cmd/pipecd/BUILD.bazel b/cmd/pipecd/BUILD.bazel
index 577af0704e..948978263f 100644
--- a/cmd/pipecd/BUILD.bazel
+++ b/cmd/pipecd/BUILD.bazel
@@ -66,7 +66,7 @@ go_library(
 go_binary(
     name = "pipecd",
     data = [
-        "//pkg/app/web:public_files",
+        "//web:public_files",
     ],
     embed = [":go_default_library"],
     visibility = ["//visibility:public"],
diff --git a/cmd/pipecd/server.go b/cmd/pipecd/server.go
index d8baea39c1..5d2f3cbe08 100644
--- a/cmd/pipecd/server.go
+++ b/cmd/pipecd/server.go
@@ -97,7 +97,7 @@ func NewServerCommand() *cobra.Command {
 		httpPort:     9082,
 		apiPort:      9083,
 		adminPort:    9085,
-		staticDir:    "pkg/app/web/public_files",
+		staticDir:    "web/public_files",
 		cacheAddress: "cache:6379",
 		gracePeriod:  30 * time.Second,
 	}
diff --git a/dockers/codegen/DOCKER_BUILD b/dockers/codegen/DOCKER_BUILD
index 0c78340102..6624f31602 100644
--- a/dockers/codegen/DOCKER_BUILD
+++ b/dockers/codegen/DOCKER_BUILD
@@ -1,2 +1,2 @@
-version: 0.5.0
+version: 0.6.0
 registry: gcr.io/pipecd/codegen
diff --git a/dockers/codegen/codegen.sh b/dockers/codegen/codegen.sh
index e522faa7cb..b1ea455d30 100755
--- a/dockers/codegen/codegen.sh
+++ b/dockers/codegen/codegen.sh
@@ -48,8 +48,8 @@ jsProtoDirs=(
   "pkg/app/server/service/webservice"
 )
 jsOutDirs=(
-  "pkg/app/web/model"
-  "pkg/app/web/api_client"
+  "web/model"
+  "web/api_client"
 )
 
 i=0
@@ -76,8 +76,8 @@ while [ $i -lt ${#jsProtoDirs[*]} ]; do
   mv ${inDir}/*.ts ${outDir}
 
   find ${outDir} -type f -exec sed -i 's:.*validate_pb.*::g' {} \;
-  find ${outDir} -type f -exec sed -i "s:'.*pkg:'pipecd\/pkg\/app\/web:g;" {} \;
-  find ${outDir} -type f -exec sed -i "s:'.*\/model\/:'pipecd\/pkg\/app\/web\/model\/:g;" {} \;
+  find ${outDir} -type f -exec sed -i "s:'.*pkg:'pipecd\/web:g;" {} \;
+  find ${outDir} -type f -exec sed -i "s:'.*\/model\/:'pipecd\/web\/model\/:g;" {} \;
   echo "successfully generated"
 done
 
diff --git a/pkg/app/web/.editorconfig b/web/.editorconfig
similarity index 100%
rename from pkg/app/web/.editorconfig
rename to web/.editorconfig
diff --git a/pkg/app/web/.env.example b/web/.env.example
similarity index 100%
rename from pkg/app/web/.env.example
rename to web/.env.example
diff --git a/pkg/app/web/.eslintrc.js b/web/.eslintrc.js
similarity index 100%
rename from pkg/app/web/.eslintrc.js
rename to web/.eslintrc.js
diff --git a/pkg/app/web/.prettierrc b/web/.prettierrc
similarity index 100%
rename from pkg/app/web/.prettierrc
rename to web/.prettierrc
diff --git a/pkg/app/web/.scaffdog/component.md b/web/.scaffdog/component.md
similarity index 100%
rename from pkg/app/web/.scaffdog/component.md
rename to web/.scaffdog/component.md
diff --git a/pkg/app/web/.scaffdog/config.js b/web/.scaffdog/config.js
similarity index 100%
rename from pkg/app/web/.scaffdog/config.js
rename to web/.scaffdog/config.js
diff --git a/pkg/app/web/.scaffdog/module.md b/web/.scaffdog/module.md
similarity index 100%
rename from pkg/app/web/.scaffdog/module.md
rename to web/.scaffdog/module.md
diff --git a/pkg/app/web/.scaffdog/page.md b/web/.scaffdog/page.md
similarity index 100%
rename from pkg/app/web/.scaffdog/page.md
rename to web/.scaffdog/page.md
diff --git a/pkg/app/web/BUILD.bazel b/web/BUILD.bazel
similarity index 98%
rename from pkg/app/web/BUILD.bazel
rename to web/BUILD.bazel
index 57d5a341ce..e3f2417599 100644
--- a/pkg/app/web/BUILD.bazel
+++ b/web/BUILD.bazel
@@ -85,7 +85,7 @@ webpack(
         "--env bazelBinPath=./$(BINDIR)",
         "--output-path",
         "$(@D)",
-        "./$(BINDIR)/pkg/app/web/src/index.js",
+        "./$(BINDIR)/web/src/index.js",
     ],
     configuration_env_vars = ["ENABLE_MOCK"],
     data = [
diff --git a/pkg/app/web/OWNERS b/web/OWNERS
similarity index 100%
rename from pkg/app/web/OWNERS
rename to web/OWNERS
diff --git a/pkg/app/web/README.md b/web/README.md
similarity index 100%
rename from pkg/app/web/README.md
rename to web/README.md
diff --git a/pkg/app/web/api_client/service_grpc_web_pb.d.ts b/web/api_client/service_grpc_web_pb.d.ts
similarity index 99%
rename from pkg/app/web/api_client/service_grpc_web_pb.d.ts
rename to web/api_client/service_grpc_web_pb.d.ts
index fefabe235a..5970bfe2a1 100644
--- a/pkg/app/web/api_client/service_grpc_web_pb.d.ts
+++ b/web/api_client/service_grpc_web_pb.d.ts
@@ -1,6 +1,6 @@
 import * as grpcWeb from 'grpc-web';
 
-import * as pkg_app_server_service_webservice_service_pb from 'pipecd/pkg/app/web/app/server/service/webservice/service_pb';
+import * as pkg_app_server_service_webservice_service_pb from 'pipecd/web/app/server/service/webservice/service_pb';
 
 
 export class WebServiceClient {
diff --git a/pkg/app/web/api_client/service_grpc_web_pb.js b/web/api_client/service_grpc_web_pb.js
similarity index 98%
rename from pkg/app/web/api_client/service_grpc_web_pb.js
rename to web/api_client/service_grpc_web_pb.js
index 288a9ec3f9..fb61b831e1 100644
--- a/pkg/app/web/api_client/service_grpc_web_pb.js
+++ b/web/api_client/service_grpc_web_pb.js
@@ -18,31 +18,31 @@ grpc.web = require('grpc-web');
 
 
 
-var pkg_model_common_pb = require('pipecd/pkg/app/web/model/common_pb.js')
+var pkg_model_common_pb = require('pipecd/web/model/common_pb.js')
 
-var pkg_model_insight_pb = require('pipecd/pkg/app/web/model/insight_pb.js')
+var pkg_model_insight_pb = require('pipecd/web/model/insight_pb.js')
 
-var pkg_model_application_pb = require('pipecd/pkg/app/web/model/application_pb.js')
+var pkg_model_application_pb = require('pipecd/web/model/application_pb.js')
 
-var pkg_model_application_live_state_pb = require('pipecd/pkg/app/web/model/application_live_state_pb.js')
+var pkg_model_application_live_state_pb = require('pipecd/web/model/application_live_state_pb.js')
 
-var pkg_model_command_pb = require('pipecd/pkg/app/web/model/command_pb.js')
+var pkg_model_command_pb = require('pipecd/web/model/command_pb.js')
 
-var pkg_model_deployment_pb = require('pipecd/pkg/app/web/model/deployment_pb.js')
+var pkg_model_deployment_pb = require('pipecd/web/model/deployment_pb.js')
 
-var pkg_model_deployment_chain_pb = require('pipecd/pkg/app/web/model/deployment_chain_pb.js')
+var pkg_model_deployment_chain_pb = require('pipecd/web/model/deployment_chain_pb.js')
 
-var pkg_model_logblock_pb = require('pipecd/pkg/app/web/model/logblock_pb.js')
+var pkg_model_logblock_pb = require('pipecd/web/model/logblock_pb.js')
 
-var pkg_model_piped_pb = require('pipecd/pkg/app/web/model/piped_pb.js')
+var pkg_model_piped_pb = require('pipecd/web/model/piped_pb.js')
 
-var pkg_model_role_pb = require('pipecd/pkg/app/web/model/role_pb.js')
+var pkg_model_role_pb = require('pipecd/web/model/role_pb.js')
 
-var pkg_model_project_pb = require('pipecd/pkg/app/web/model/project_pb.js')
+var pkg_model_project_pb = require('pipecd/web/model/project_pb.js')
 
-var pkg_model_apikey_pb = require('pipecd/pkg/app/web/model/apikey_pb.js')
+var pkg_model_apikey_pb = require('pipecd/web/model/apikey_pb.js')
 
-var pkg_model_event_pb = require('pipecd/pkg/app/web/model/event_pb.js')
+var pkg_model_event_pb = require('pipecd/web/model/event_pb.js')
 
 var google_protobuf_wrappers_pb = require('google-protobuf/google/protobuf/wrappers_pb.js')
 const proto = {};
diff --git a/pkg/app/web/api_client/service_pb.d.ts b/web/api_client/service_pb.d.ts
similarity index 98%
rename from pkg/app/web/api_client/service_pb.d.ts
rename to web/api_client/service_pb.d.ts
index 3d134b2684..65ada88204 100644
--- a/pkg/app/web/api_client/service_pb.d.ts
+++ b/web/api_client/service_pb.d.ts
@@ -1,19 +1,19 @@
 import * as jspb from 'google-protobuf'
 
 
-import * as pkg_model_common_pb from 'pipecd/pkg/app/web/model/common_pb';
-import * as pkg_model_insight_pb from 'pipecd/pkg/app/web/model/insight_pb';
-import * as pkg_model_application_pb from 'pipecd/pkg/app/web/model/application_pb';
-import * as pkg_model_application_live_state_pb from 'pipecd/pkg/app/web/model/application_live_state_pb';
-import * as pkg_model_command_pb from 'pipecd/pkg/app/web/model/command_pb';
-import * as pkg_model_deployment_pb from 'pipecd/pkg/app/web/model/deployment_pb';
-import * as pkg_model_deployment_chain_pb from 'pipecd/pkg/app/web/model/deployment_chain_pb';
-import * as pkg_model_logblock_pb from 'pipecd/pkg/app/web/model/logblock_pb';
-import * as pkg_model_piped_pb from 'pipecd/pkg/app/web/model/piped_pb';
-import * as pkg_model_role_pb from 'pipecd/pkg/app/web/model/role_pb';
-import * as pkg_model_project_pb from 'pipecd/pkg/app/web/model/project_pb';
-import * as pkg_model_apikey_pb from 'pipecd/pkg/app/web/model/apikey_pb';
-import * as pkg_model_event_pb from 'pipecd/pkg/app/web/model/event_pb';
+import * as pkg_model_common_pb from 'pipecd/web/model/common_pb';
+import * as pkg_model_insight_pb from 'pipecd/web/model/insight_pb';
+import * as pkg_model_application_pb from 'pipecd/web/model/application_pb';
+import * as pkg_model_application_live_state_pb from 'pipecd/web/model/application_live_state_pb';
+import * as pkg_model_command_pb from 'pipecd/web/model/command_pb';
+import * as pkg_model_deployment_pb from 'pipecd/web/model/deployment_pb';
+import * as pkg_model_deployment_chain_pb from 'pipecd/web/model/deployment_chain_pb';
+import * as pkg_model_logblock_pb from 'pipecd/web/model/logblock_pb';
+import * as pkg_model_piped_pb from 'pipecd/web/model/piped_pb';
+import * as pkg_model_role_pb from 'pipecd/web/model/role_pb';
+import * as pkg_model_project_pb from 'pipecd/web/model/project_pb';
+import * as pkg_model_apikey_pb from 'pipecd/web/model/apikey_pb';
+import * as pkg_model_event_pb from 'pipecd/web/model/event_pb';
 import * as google_protobuf_wrappers_pb from 'google-protobuf/google/protobuf/wrappers_pb';
 
 
diff --git a/pkg/app/web/api_client/service_pb.js b/web/api_client/service_pb.js
similarity index 99%
rename from pkg/app/web/api_client/service_pb.js
rename to web/api_client/service_pb.js
index 5569445628..89ed24f6a9 100644
--- a/pkg/app/web/api_client/service_pb.js
+++ b/web/api_client/service_pb.js
@@ -23,31 +23,31 @@ var global = (function() {
 
 
 
-var pkg_model_common_pb = require('pipecd/pkg/app/web/model/common_pb.js');
+var pkg_model_common_pb = require('pipecd/web/model/common_pb.js');
 goog.object.extend(proto, pkg_model_common_pb);
-var pkg_model_insight_pb = require('pipecd/pkg/app/web/model/insight_pb.js');
+var pkg_model_insight_pb = require('pipecd/web/model/insight_pb.js');
 goog.object.extend(proto, pkg_model_insight_pb);
-var pkg_model_application_pb = require('pipecd/pkg/app/web/model/application_pb.js');
+var pkg_model_application_pb = require('pipecd/web/model/application_pb.js');
 goog.object.extend(proto, pkg_model_application_pb);
-var pkg_model_application_live_state_pb = require('pipecd/pkg/app/web/model/application_live_state_pb.js');
+var pkg_model_application_live_state_pb = require('pipecd/web/model/application_live_state_pb.js');
 goog.object.extend(proto, pkg_model_application_live_state_pb);
-var pkg_model_command_pb = require('pipecd/pkg/app/web/model/command_pb.js');
+var pkg_model_command_pb = require('pipecd/web/model/command_pb.js');
 goog.object.extend(proto, pkg_model_command_pb);
-var pkg_model_deployment_pb = require('pipecd/pkg/app/web/model/deployment_pb.js');
+var pkg_model_deployment_pb = require('pipecd/web/model/deployment_pb.js');
 goog.object.extend(proto, pkg_model_deployment_pb);
-var pkg_model_deployment_chain_pb = require('pipecd/pkg/app/web/model/deployment_chain_pb.js');
+var pkg_model_deployment_chain_pb = require('pipecd/web/model/deployment_chain_pb.js');
 goog.object.extend(proto, pkg_model_deployment_chain_pb);
-var pkg_model_logblock_pb = require('pipecd/pkg/app/web/model/logblock_pb.js');
+var pkg_model_logblock_pb = require('pipecd/web/model/logblock_pb.js');
 goog.object.extend(proto, pkg_model_logblock_pb);
-var pkg_model_piped_pb = require('pipecd/pkg/app/web/model/piped_pb.js');
+var pkg_model_piped_pb = require('pipecd/web/model/piped_pb.js');
 goog.object.extend(proto, pkg_model_piped_pb);
-var pkg_model_role_pb = require('pipecd/pkg/app/web/model/role_pb.js');
+var pkg_model_role_pb = require('pipecd/web/model/role_pb.js');
 goog.object.extend(proto, pkg_model_role_pb);
-var pkg_model_project_pb = require('pipecd/pkg/app/web/model/project_pb.js');
+var pkg_model_project_pb = require('pipecd/web/model/project_pb.js');
 goog.object.extend(proto, pkg_model_project_pb);
-var pkg_model_apikey_pb = require('pipecd/pkg/app/web/model/apikey_pb.js');
+var pkg_model_apikey_pb = require('pipecd/web/model/apikey_pb.js');
 goog.object.extend(proto, pkg_model_apikey_pb);
-var pkg_model_event_pb = require('pipecd/pkg/app/web/model/event_pb.js');
+var pkg_model_event_pb = require('pipecd/web/model/event_pb.js');
 goog.object.extend(proto, pkg_model_event_pb);
 var google_protobuf_wrappers_pb = require('google-protobuf/google/protobuf/wrappers_pb.js');
 goog.object.extend(proto, google_protobuf_wrappers_pb);
diff --git a/pkg/app/web/assets/favicon.ico b/web/assets/favicon.ico
similarity index 100%
rename from pkg/app/web/assets/favicon.ico
rename to web/assets/favicon.ico
diff --git a/pkg/app/web/assets/logo.svg b/web/assets/logo.svg
similarity index 100%
rename from pkg/app/web/assets/logo.svg
rename to web/assets/logo.svg
diff --git a/pkg/app/web/base.html b/web/base.html
similarity index 100%
rename from pkg/app/web/base.html
rename to web/base.html
diff --git a/pkg/app/web/custom-jsdom.js b/web/custom-jsdom.js
similarity index 100%
rename from pkg/app/web/custom-jsdom.js
rename to web/custom-jsdom.js
diff --git a/pkg/app/web/file-transformer.js b/web/file-transformer.js
similarity index 100%
rename from pkg/app/web/file-transformer.js
rename to web/file-transformer.js
diff --git a/pkg/app/web/jest.after-env.ts b/web/jest.after-env.ts
similarity index 100%
rename from pkg/app/web/jest.after-env.ts
rename to web/jest.after-env.ts
diff --git a/pkg/app/web/jest.bzl b/web/jest.bzl
similarity index 100%
rename from pkg/app/web/jest.bzl
rename to web/jest.bzl
diff --git a/pkg/app/web/jest.config.js b/web/jest.config.js
similarity index 94%
rename from pkg/app/web/jest.config.js
rename to web/jest.config.js
index 4f1b05c3a0..c459f17604 100644
--- a/pkg/app/web/jest.config.js
+++ b/web/jest.config.js
@@ -6,7 +6,7 @@ module.exports = {
       "<rootDir>/file-transformer.js",
   },
   moduleNameMapper: {
-    "^pipecd/(.*)$": "<rootDir>/../../../$1",
+    "^pipecd/(.*)$": "<rootDir>/../$1",
     "^~/(.*)$": "<rootDir>/src/$1",
     "^~~/(.*)$": "<rootDir>/$1",
   },
diff --git a/pkg/app/web/jest.config.local.js b/web/jest.config.local.js
similarity index 93%
rename from pkg/app/web/jest.config.local.js
rename to web/jest.config.local.js
index 3f425d7ae7..7931e97508 100644
--- a/pkg/app/web/jest.config.local.js
+++ b/web/jest.config.local.js
@@ -6,7 +6,7 @@ module.exports = {
       "<rootDir>/file-transformer.js",
   },
   moduleNameMapper: {
-    "^pipecd/(.*)$": "<rootDir>/../../../bazel-bin/$1",
+    "^pipecd/(.*)$": "<rootDir>/../bazel-bin/$1",
     "^~/(.*)$": "<rootDir>/src/$1",
     "^~~/(.*)$": "<rootDir>/$1",
   },
diff --git a/pkg/app/web/jest.setup.js b/web/jest.setup.js
similarity index 100%
rename from pkg/app/web/jest.setup.js
rename to web/jest.setup.js
diff --git a/pkg/app/web/model/analysis_result_pb.d.ts b/web/model/analysis_result_pb.d.ts
similarity index 100%
rename from pkg/app/web/model/analysis_result_pb.d.ts
rename to web/model/analysis_result_pb.d.ts
diff --git a/pkg/app/web/model/analysis_result_pb.js b/web/model/analysis_result_pb.js
similarity index 100%
rename from pkg/app/web/model/analysis_result_pb.js
rename to web/model/analysis_result_pb.js
diff --git a/pkg/app/web/model/apikey_pb.d.ts b/web/model/apikey_pb.d.ts
similarity index 100%
rename from pkg/app/web/model/apikey_pb.d.ts
rename to web/model/apikey_pb.d.ts
diff --git a/pkg/app/web/model/apikey_pb.js b/web/model/apikey_pb.js
similarity index 100%
rename from pkg/app/web/model/apikey_pb.js
rename to web/model/apikey_pb.js
diff --git a/pkg/app/web/model/application_live_state_pb.d.ts b/web/model/application_live_state_pb.d.ts
similarity index 99%
rename from pkg/app/web/model/application_live_state_pb.d.ts
rename to web/model/application_live_state_pb.d.ts
index bdb153bdbe..e5822e2c1a 100644
--- a/pkg/app/web/model/application_live_state_pb.d.ts
+++ b/web/model/application_live_state_pb.d.ts
@@ -1,7 +1,7 @@
 import * as jspb from 'google-protobuf'
 
 
-import * as pkg_model_common_pb from 'pipecd/pkg/app/web/model/common_pb';
+import * as pkg_model_common_pb from 'pipecd/web/model/common_pb';
 
 
 export class ApplicationLiveStateSnapshot extends jspb.Message {
diff --git a/pkg/app/web/model/application_live_state_pb.js b/web/model/application_live_state_pb.js
similarity index 99%
rename from pkg/app/web/model/application_live_state_pb.js
rename to web/model/application_live_state_pb.js
index 2b494f093d..0814015648 100644
--- a/pkg/app/web/model/application_live_state_pb.js
+++ b/web/model/application_live_state_pb.js
@@ -23,7 +23,7 @@ var global = (function() {
 
 
 
-var pkg_model_common_pb = require('pipecd/pkg/app/web/model/common_pb.js');
+var pkg_model_common_pb = require('pipecd/web/model/common_pb.js');
 goog.object.extend(proto, pkg_model_common_pb);
 goog.exportSymbol('proto.model.ApplicationLiveStateSnapshot', null, global);
 goog.exportSymbol('proto.model.ApplicationLiveStateSnapshot.Status', null, global);
diff --git a/pkg/app/web/model/application_pb.d.ts b/web/model/application_pb.d.ts
similarity index 97%
rename from pkg/app/web/model/application_pb.d.ts
rename to web/model/application_pb.d.ts
index 94cebb58b2..9d1bb39e26 100644
--- a/pkg/app/web/model/application_pb.d.ts
+++ b/web/model/application_pb.d.ts
@@ -1,8 +1,8 @@
 import * as jspb from 'google-protobuf'
 
 
-import * as pkg_model_common_pb from 'pipecd/pkg/app/web/model/common_pb';
-import * as pkg_model_deployment_pb from 'pipecd/pkg/app/web/model/deployment_pb';
+import * as pkg_model_common_pb from 'pipecd/web/model/common_pb';
+import * as pkg_model_deployment_pb from 'pipecd/web/model/deployment_pb';
 
 
 export class Application extends jspb.Message {
diff --git a/pkg/app/web/model/application_pb.js b/web/model/application_pb.js
similarity index 99%
rename from pkg/app/web/model/application_pb.js
rename to web/model/application_pb.js
index 2da30574e1..3911751260 100644
--- a/pkg/app/web/model/application_pb.js
+++ b/web/model/application_pb.js
@@ -23,9 +23,9 @@ var global = (function() {
 
 
 
-var pkg_model_common_pb = require('pipecd/pkg/app/web/model/common_pb.js');
+var pkg_model_common_pb = require('pipecd/web/model/common_pb.js');
 goog.object.extend(proto, pkg_model_common_pb);
-var pkg_model_deployment_pb = require('pipecd/pkg/app/web/model/deployment_pb.js');
+var pkg_model_deployment_pb = require('pipecd/web/model/deployment_pb.js');
 goog.object.extend(proto, pkg_model_deployment_pb);
 goog.exportSymbol('proto.model.Application', null, global);
 goog.exportSymbol('proto.model.ApplicationDeploymentReference', null, global);
diff --git a/pkg/app/web/model/command_pb.d.ts b/web/model/command_pb.d.ts
similarity index 99%
rename from pkg/app/web/model/command_pb.d.ts
rename to web/model/command_pb.d.ts
index 33ac8f6709..d2d4a40721 100644
--- a/pkg/app/web/model/command_pb.d.ts
+++ b/web/model/command_pb.d.ts
@@ -1,7 +1,7 @@
 import * as jspb from 'google-protobuf'
 
 
-import * as pkg_model_common_pb from 'pipecd/pkg/app/web/model/common_pb';
+import * as pkg_model_common_pb from 'pipecd/web/model/common_pb';
 
 
 export class Command extends jspb.Message {
diff --git a/pkg/app/web/model/command_pb.js b/web/model/command_pb.js
similarity index 99%
rename from pkg/app/web/model/command_pb.js
rename to web/model/command_pb.js
index e3bdd3242f..c9dfe77c95 100644
--- a/pkg/app/web/model/command_pb.js
+++ b/web/model/command_pb.js
@@ -23,7 +23,7 @@ var global = (function() {
 
 
 
-var pkg_model_common_pb = require('pipecd/pkg/app/web/model/common_pb.js');
+var pkg_model_common_pb = require('pipecd/web/model/common_pb.js');
 goog.object.extend(proto, pkg_model_common_pb);
 goog.exportSymbol('proto.model.Command', null, global);
 goog.exportSymbol('proto.model.Command.ApproveStage', null, global);
diff --git a/pkg/app/web/model/common_pb.d.ts b/web/model/common_pb.d.ts
similarity index 100%
rename from pkg/app/web/model/common_pb.d.ts
rename to web/model/common_pb.d.ts
diff --git a/pkg/app/web/model/common_pb.js b/web/model/common_pb.js
similarity index 100%
rename from pkg/app/web/model/common_pb.js
rename to web/model/common_pb.js
diff --git a/pkg/app/web/model/deployment_chain_pb.d.ts b/web/model/deployment_chain_pb.d.ts
similarity index 98%
rename from pkg/app/web/model/deployment_chain_pb.d.ts
rename to web/model/deployment_chain_pb.d.ts
index 9df002cc7c..fbbab26898 100644
--- a/pkg/app/web/model/deployment_chain_pb.d.ts
+++ b/web/model/deployment_chain_pb.d.ts
@@ -1,7 +1,7 @@
 import * as jspb from 'google-protobuf'
 
 
-import * as pkg_model_deployment_pb from 'pipecd/pkg/app/web/model/deployment_pb';
+import * as pkg_model_deployment_pb from 'pipecd/web/model/deployment_pb';
 
 
 export class DeploymentChain extends jspb.Message {
diff --git a/pkg/app/web/model/deployment_chain_pb.js b/web/model/deployment_chain_pb.js
similarity index 99%
rename from pkg/app/web/model/deployment_chain_pb.js
rename to web/model/deployment_chain_pb.js
index 34e031aa4b..1636f327e9 100644
--- a/pkg/app/web/model/deployment_chain_pb.js
+++ b/web/model/deployment_chain_pb.js
@@ -23,7 +23,7 @@ var global = (function() {
 
 
 
-var pkg_model_deployment_pb = require('pipecd/pkg/app/web/model/deployment_pb.js');
+var pkg_model_deployment_pb = require('pipecd/web/model/deployment_pb.js');
 goog.object.extend(proto, pkg_model_deployment_pb);
 goog.exportSymbol('proto.model.ChainApplicationRef', null, global);
 goog.exportSymbol('proto.model.ChainBlock', null, global);
diff --git a/pkg/app/web/model/deployment_pb.d.ts b/web/model/deployment_pb.d.ts
similarity index 99%
rename from pkg/app/web/model/deployment_pb.d.ts
rename to web/model/deployment_pb.d.ts
index 5e3218fc1c..0cb5651dbd 100644
--- a/pkg/app/web/model/deployment_pb.d.ts
+++ b/web/model/deployment_pb.d.ts
@@ -1,7 +1,7 @@
 import * as jspb from 'google-protobuf'
 
 
-import * as pkg_model_common_pb from 'pipecd/pkg/app/web/model/common_pb';
+import * as pkg_model_common_pb from 'pipecd/web/model/common_pb';
 
 
 export class Deployment extends jspb.Message {
diff --git a/pkg/app/web/model/deployment_pb.js b/web/model/deployment_pb.js
similarity index 99%
rename from pkg/app/web/model/deployment_pb.js
rename to web/model/deployment_pb.js
index d091029f0e..a46a71e990 100644
--- a/pkg/app/web/model/deployment_pb.js
+++ b/web/model/deployment_pb.js
@@ -23,7 +23,7 @@ var global = (function() {
 
 
 
-var pkg_model_common_pb = require('pipecd/pkg/app/web/model/common_pb.js');
+var pkg_model_common_pb = require('pipecd/web/model/common_pb.js');
 goog.object.extend(proto, pkg_model_common_pb);
 goog.exportSymbol('proto.model.Commit', null, global);
 goog.exportSymbol('proto.model.Deployment', null, global);
diff --git a/pkg/app/web/model/event_pb.d.ts b/web/model/event_pb.d.ts
similarity index 100%
rename from pkg/app/web/model/event_pb.d.ts
rename to web/model/event_pb.d.ts
diff --git a/pkg/app/web/model/event_pb.js b/web/model/event_pb.js
similarity index 100%
rename from pkg/app/web/model/event_pb.js
rename to web/model/event_pb.js
diff --git a/pkg/app/web/model/insight_pb.d.ts b/web/model/insight_pb.d.ts
similarity index 100%
rename from pkg/app/web/model/insight_pb.d.ts
rename to web/model/insight_pb.d.ts
diff --git a/pkg/app/web/model/insight_pb.js b/web/model/insight_pb.js
similarity index 100%
rename from pkg/app/web/model/insight_pb.js
rename to web/model/insight_pb.js
diff --git a/pkg/app/web/model/logblock_pb.d.ts b/web/model/logblock_pb.d.ts
similarity index 100%
rename from pkg/app/web/model/logblock_pb.d.ts
rename to web/model/logblock_pb.d.ts
diff --git a/pkg/app/web/model/logblock_pb.js b/web/model/logblock_pb.js
similarity index 100%
rename from pkg/app/web/model/logblock_pb.js
rename to web/model/logblock_pb.js
diff --git a/pkg/app/web/model/notificationevent_pb.d.ts b/web/model/notificationevent_pb.d.ts
similarity index 99%
rename from pkg/app/web/model/notificationevent_pb.d.ts
rename to web/model/notificationevent_pb.d.ts
index 8b5166c5dd..8781509207 100644
--- a/pkg/app/web/model/notificationevent_pb.d.ts
+++ b/web/model/notificationevent_pb.d.ts
@@ -1,8 +1,8 @@
 import * as jspb from 'google-protobuf'
 
 
-import * as pkg_model_application_pb from 'pipecd/pkg/app/web/model/application_pb';
-import * as pkg_model_deployment_pb from 'pipecd/pkg/app/web/model/deployment_pb';
+import * as pkg_model_application_pb from 'pipecd/web/model/application_pb';
+import * as pkg_model_deployment_pb from 'pipecd/web/model/deployment_pb';
 
 
 export class NotificationEventDeploymentTriggered extends jspb.Message {
diff --git a/pkg/app/web/model/notificationevent_pb.js b/web/model/notificationevent_pb.js
similarity index 99%
rename from pkg/app/web/model/notificationevent_pb.js
rename to web/model/notificationevent_pb.js
index 3ed723aef7..841dc81605 100644
--- a/pkg/app/web/model/notificationevent_pb.js
+++ b/web/model/notificationevent_pb.js
@@ -23,9 +23,9 @@ var global = (function() {
 
 
 
-var pkg_model_application_pb = require('pipecd/pkg/app/web/model/application_pb.js');
+var pkg_model_application_pb = require('pipecd/web/model/application_pb.js');
 goog.object.extend(proto, pkg_model_application_pb);
-var pkg_model_deployment_pb = require('pipecd/pkg/app/web/model/deployment_pb.js');
+var pkg_model_deployment_pb = require('pipecd/web/model/deployment_pb.js');
 goog.object.extend(proto, pkg_model_deployment_pb);
 goog.exportSymbol('proto.model.NotificationEventApplicationOutOfSync', null, global);
 goog.exportSymbol('proto.model.NotificationEventApplicationSynced', null, global);
diff --git a/pkg/app/web/model/piped_pb.d.ts b/web/model/piped_pb.d.ts
similarity index 98%
rename from pkg/app/web/model/piped_pb.d.ts
rename to web/model/piped_pb.d.ts
index 943096e2c8..04c0c7618f 100644
--- a/pkg/app/web/model/piped_pb.d.ts
+++ b/web/model/piped_pb.d.ts
@@ -1,7 +1,7 @@
 import * as jspb from 'google-protobuf'
 
 
-import * as pkg_model_common_pb from 'pipecd/pkg/app/web/model/common_pb';
+import * as pkg_model_common_pb from 'pipecd/web/model/common_pb';
 
 
 export class Piped extends jspb.Message {
diff --git a/pkg/app/web/model/piped_pb.js b/web/model/piped_pb.js
similarity index 99%
rename from pkg/app/web/model/piped_pb.js
rename to web/model/piped_pb.js
index ff71efc4c1..2da177bbfd 100644
--- a/pkg/app/web/model/piped_pb.js
+++ b/web/model/piped_pb.js
@@ -23,7 +23,7 @@ var global = (function() {
 
 
 
-var pkg_model_common_pb = require('pipecd/pkg/app/web/model/common_pb.js');
+var pkg_model_common_pb = require('pipecd/web/model/common_pb.js');
 goog.object.extend(proto, pkg_model_common_pb);
 goog.exportSymbol('proto.model.Piped', null, global);
 goog.exportSymbol('proto.model.Piped.CloudProvider', null, global);
diff --git a/pkg/app/web/model/piped_stat_pb.d.ts b/web/model/piped_stat_pb.d.ts
similarity index 100%
rename from pkg/app/web/model/piped_stat_pb.d.ts
rename to web/model/piped_stat_pb.d.ts
diff --git a/pkg/app/web/model/piped_stat_pb.js b/web/model/piped_stat_pb.js
similarity index 100%
rename from pkg/app/web/model/piped_stat_pb.js
rename to web/model/piped_stat_pb.js
diff --git a/pkg/app/web/model/planpreview_pb.d.ts b/web/model/planpreview_pb.d.ts
similarity index 98%
rename from pkg/app/web/model/planpreview_pb.d.ts
rename to web/model/planpreview_pb.d.ts
index 30237c786f..dccc9962c4 100644
--- a/pkg/app/web/model/planpreview_pb.d.ts
+++ b/web/model/planpreview_pb.d.ts
@@ -1,7 +1,7 @@
 import * as jspb from 'google-protobuf'
 
 
-import * as pkg_model_common_pb from 'pipecd/pkg/app/web/model/common_pb';
+import * as pkg_model_common_pb from 'pipecd/web/model/common_pb';
 
 
 export class PlanPreviewCommandResult extends jspb.Message {
diff --git a/pkg/app/web/model/planpreview_pb.js b/web/model/planpreview_pb.js
similarity index 99%
rename from pkg/app/web/model/planpreview_pb.js
rename to web/model/planpreview_pb.js
index 8bc7d0811e..d40670d598 100644
--- a/pkg/app/web/model/planpreview_pb.js
+++ b/web/model/planpreview_pb.js
@@ -23,7 +23,7 @@ var global = (function() {
 
 
 
-var pkg_model_common_pb = require('pipecd/pkg/app/web/model/common_pb.js');
+var pkg_model_common_pb = require('pipecd/web/model/common_pb.js');
 goog.object.extend(proto, pkg_model_common_pb);
 goog.exportSymbol('proto.model.ApplicationPlanPreviewResult', null, global);
 goog.exportSymbol('proto.model.PlanPreviewCommandResult', null, global);
diff --git a/pkg/app/web/model/project_pb.d.ts b/web/model/project_pb.d.ts
similarity index 100%
rename from pkg/app/web/model/project_pb.d.ts
rename to web/model/project_pb.d.ts
diff --git a/pkg/app/web/model/project_pb.js b/web/model/project_pb.js
similarity index 100%
rename from pkg/app/web/model/project_pb.js
rename to web/model/project_pb.js
diff --git a/pkg/app/web/model/role_pb.d.ts b/web/model/role_pb.d.ts
similarity index 100%
rename from pkg/app/web/model/role_pb.d.ts
rename to web/model/role_pb.d.ts
diff --git a/pkg/app/web/model/role_pb.js b/web/model/role_pb.js
similarity index 100%
rename from pkg/app/web/model/role_pb.js
rename to web/model/role_pb.js
diff --git a/pkg/app/web/model/user_pb.d.ts b/web/model/user_pb.d.ts
similarity index 92%
rename from pkg/app/web/model/user_pb.d.ts
rename to web/model/user_pb.d.ts
index 8d1bfd7860..03544df57e 100644
--- a/pkg/app/web/model/user_pb.d.ts
+++ b/web/model/user_pb.d.ts
@@ -1,7 +1,7 @@
 import * as jspb from 'google-protobuf'
 
 
-import * as pkg_model_role_pb from 'pipecd/pkg/app/web/model/role_pb';
+import * as pkg_model_role_pb from 'pipecd/web/model/role_pb';
 
 
 export class User extends jspb.Message {
diff --git a/pkg/app/web/model/user_pb.js b/web/model/user_pb.js
similarity index 98%
rename from pkg/app/web/model/user_pb.js
rename to web/model/user_pb.js
index d6ba299ed9..f7cf847909 100644
--- a/pkg/app/web/model/user_pb.js
+++ b/web/model/user_pb.js
@@ -23,7 +23,7 @@ var global = (function() {
 
 
 
-var pkg_model_role_pb = require('pipecd/pkg/app/web/model/role_pb.js');
+var pkg_model_role_pb = require('pipecd/web/model/role_pb.js');
 goog.object.extend(proto, pkg_model_role_pb);
 goog.exportSymbol('proto.model.User', null, global);
 /**
diff --git a/pkg/app/web/package.json b/web/package.json
similarity index 100%
rename from pkg/app/web/package.json
rename to web/package.json
diff --git a/pkg/app/web/public/README.md b/web/public/README.md
similarity index 100%
rename from pkg/app/web/public/README.md
rename to web/public/README.md
diff --git a/pkg/app/web/public/mockServiceWorker.js b/web/public/mockServiceWorker.js
similarity index 100%
rename from pkg/app/web/public/mockServiceWorker.js
rename to web/public/mockServiceWorker.js
diff --git a/pkg/app/web/src/__fixtures__/common.ts b/web/src/__fixtures__/common.ts
similarity index 85%
rename from pkg/app/web/src/__fixtures__/common.ts
rename to web/src/__fixtures__/common.ts
index 7281c8f67f..4bebe39937 100644
--- a/pkg/app/web/src/__fixtures__/common.ts
+++ b/web/src/__fixtures__/common.ts
@@ -1,4 +1,4 @@
-import { ApplicationGitPath } from "pipecd/pkg/app/web/model/common_pb";
+import { ApplicationGitPath } from "pipecd/web/model/common_pb";
 import { createApplicationGitRepository } from "./dummy-repo";
 
 export function createGitPathFromObject(
diff --git a/pkg/app/web/src/__fixtures__/dummy-api-key.ts b/web/src/__fixtures__/dummy-api-key.ts
similarity index 100%
rename from pkg/app/web/src/__fixtures__/dummy-api-key.ts
rename to web/src/__fixtures__/dummy-api-key.ts
diff --git a/pkg/app/web/src/__fixtures__/dummy-application-counts.ts b/web/src/__fixtures__/dummy-application-counts.ts
similarity index 100%
rename from pkg/app/web/src/__fixtures__/dummy-application-counts.ts
rename to web/src/__fixtures__/dummy-application-counts.ts
diff --git a/pkg/app/web/src/__fixtures__/dummy-application-live-state.ts b/web/src/__fixtures__/dummy-application-live-state.ts
similarity index 97%
rename from pkg/app/web/src/__fixtures__/dummy-application-live-state.ts
rename to web/src/__fixtures__/dummy-application-live-state.ts
index ba0f1a1d28..243bc5950f 100644
--- a/pkg/app/web/src/__fixtures__/dummy-application-live-state.ts
+++ b/web/src/__fixtures__/dummy-application-live-state.ts
@@ -1,9 +1,9 @@
-import { ApplicationKind } from "pipecd/pkg/app/web/model/common_pb";
+import { ApplicationKind } from "pipecd/web/model/common_pb";
 import {
   ApplicationLiveStateVersion,
   KubernetesApplicationLiveState,
   KubernetesResourceState,
-} from "pipecd/pkg/app/web/model/application_live_state_pb";
+} from "pipecd/web/model/application_live_state_pb";
 import {
   ApplicationLiveState,
   ApplicationLiveStateSnapshot,
diff --git a/pkg/app/web/src/__fixtures__/dummy-application.ts b/web/src/__fixtures__/dummy-application.ts
similarity index 98%
rename from pkg/app/web/src/__fixtures__/dummy-application.ts
rename to web/src/__fixtures__/dummy-application.ts
index ee57b6aeee..07ac02044a 100644
--- a/pkg/app/web/src/__fixtures__/dummy-application.ts
+++ b/web/src/__fixtures__/dummy-application.ts
@@ -1,4 +1,4 @@
-import { ApplicationKind } from "pipecd/pkg/app/web/model/common_pb";
+import { ApplicationKind } from "pipecd/web/model/common_pb";
 import {
   Application,
   ApplicationDeploymentReference,
diff --git a/pkg/app/web/src/__fixtures__/dummy-command.ts b/web/src/__fixtures__/dummy-command.ts
similarity index 93%
rename from pkg/app/web/src/__fixtures__/dummy-command.ts
rename to web/src/__fixtures__/dummy-command.ts
index f438825307..fbe0984f94 100644
--- a/pkg/app/web/src/__fixtures__/dummy-command.ts
+++ b/web/src/__fixtures__/dummy-command.ts
@@ -1,4 +1,4 @@
-import { SyncStrategy } from "pipecd/pkg/app/web/model/common_pb";
+import { SyncStrategy } from "pipecd/web/model/common_pb";
 import { Command, CommandStatus } from "~/modules/commands";
 import { dummyDeployment } from "./dummy-deployment";
 import { createRandTimes } from "./utils";
diff --git a/pkg/app/web/src/__fixtures__/dummy-deployment.ts b/web/src/__fixtures__/dummy-deployment.ts
similarity index 97%
rename from pkg/app/web/src/__fixtures__/dummy-deployment.ts
rename to web/src/__fixtures__/dummy-deployment.ts
index e8091bbc9b..bffd69b38a 100644
--- a/pkg/app/web/src/__fixtures__/dummy-deployment.ts
+++ b/web/src/__fixtures__/dummy-deployment.ts
@@ -1,4 +1,4 @@
-import { ApplicationKind } from "pipecd/pkg/app/web/model/common_pb";
+import { ApplicationKind } from "pipecd/web/model/common_pb";
 import { Deployment, DeploymentStatus } from "~/modules/deployments";
 import { createGitPathFromObject } from "./common";
 import { dummyApplication } from "./dummy-application";
diff --git a/pkg/app/web/src/__fixtures__/dummy-insight.ts b/web/src/__fixtures__/dummy-insight.ts
similarity index 100%
rename from pkg/app/web/src/__fixtures__/dummy-insight.ts
rename to web/src/__fixtures__/dummy-insight.ts
diff --git a/pkg/app/web/src/__fixtures__/dummy-me.ts b/web/src/__fixtures__/dummy-me.ts
similarity index 100%
rename from pkg/app/web/src/__fixtures__/dummy-me.ts
rename to web/src/__fixtures__/dummy-me.ts
diff --git a/pkg/app/web/src/__fixtures__/dummy-piped.ts b/web/src/__fixtures__/dummy-piped.ts
similarity index 100%
rename from pkg/app/web/src/__fixtures__/dummy-piped.ts
rename to web/src/__fixtures__/dummy-piped.ts
diff --git a/pkg/app/web/src/__fixtures__/dummy-pipeline.ts b/web/src/__fixtures__/dummy-pipeline.ts
similarity index 100%
rename from pkg/app/web/src/__fixtures__/dummy-pipeline.ts
rename to web/src/__fixtures__/dummy-pipeline.ts
diff --git a/pkg/app/web/src/__fixtures__/dummy-project.ts b/web/src/__fixtures__/dummy-project.ts
similarity index 96%
rename from pkg/app/web/src/__fixtures__/dummy-project.ts
rename to web/src/__fixtures__/dummy-project.ts
index de65c2a8a2..0733035c76 100644
--- a/pkg/app/web/src/__fixtures__/dummy-project.ts
+++ b/web/src/__fixtures__/dummy-project.ts
@@ -2,7 +2,7 @@ import {
   Project,
   ProjectRBACConfig,
   ProjectStaticUser,
-} from "pipecd/pkg/app/web/model/project_pb";
+} from "pipecd/web/model/project_pb";
 import {
   createRandTimes,
   randomKeyHash,
diff --git a/pkg/app/web/src/__fixtures__/dummy-repo.ts b/web/src/__fixtures__/dummy-repo.ts
similarity index 83%
rename from pkg/app/web/src/__fixtures__/dummy-repo.ts
rename to web/src/__fixtures__/dummy-repo.ts
index cd2af96f8c..0a228ed4a2 100644
--- a/pkg/app/web/src/__fixtures__/dummy-repo.ts
+++ b/web/src/__fixtures__/dummy-repo.ts
@@ -1,4 +1,4 @@
-import { ApplicationGitRepository } from "pipecd/pkg/app/web/model/common_pb";
+import { ApplicationGitRepository } from "pipecd/web/model/common_pb";
 
 export function createApplicationGitRepository(
   o: ApplicationGitRepository.AsObject
diff --git a/pkg/app/web/src/__fixtures__/dummy-stage-log.ts b/web/src/__fixtures__/dummy-stage-log.ts
similarity index 100%
rename from pkg/app/web/src/__fixtures__/dummy-stage-log.ts
rename to web/src/__fixtures__/dummy-stage-log.ts
diff --git a/pkg/app/web/src/__fixtures__/dummy-trigger.ts b/web/src/__fixtures__/dummy-trigger.ts
similarity index 91%
rename from pkg/app/web/src/__fixtures__/dummy-trigger.ts
rename to web/src/__fixtures__/dummy-trigger.ts
index e4ccf85f4f..22bdb83731 100644
--- a/pkg/app/web/src/__fixtures__/dummy-trigger.ts
+++ b/web/src/__fixtures__/dummy-trigger.ts
@@ -1,8 +1,8 @@
-import { SyncStrategy } from "pipecd/pkg/app/web/model/common_pb";
+import { SyncStrategy } from "pipecd/web/model/common_pb";
 import {
   DeploymentTrigger,
   Commit,
-} from "pipecd/pkg/app/web/model/deployment_pb";
+} from "pipecd/web/model/deployment_pb";
 import { createRandTime, randomUUID } from "./utils";
 
 const commitTimestamp = createRandTime();
diff --git a/pkg/app/web/src/__fixtures__/utils.ts b/web/src/__fixtures__/utils.ts
similarity index 100%
rename from pkg/app/web/src/__fixtures__/utils.ts
rename to web/src/__fixtures__/utils.ts
diff --git a/pkg/app/web/src/api/api-keys.ts b/web/src/api/api-keys.ts
similarity index 96%
rename from pkg/app/web/src/api/api-keys.ts
rename to web/src/api/api-keys.ts
index 2d03174260..d13f04172f 100644
--- a/pkg/app/web/src/api/api-keys.ts
+++ b/web/src/api/api-keys.ts
@@ -6,7 +6,7 @@ import {
   DisableAPIKeyResponse,
   ListAPIKeysRequest,
   ListAPIKeysResponse,
-} from "pipecd/pkg/app/web/api_client/service_pb";
+} from "pipecd/web/api_client/service_pb";
 import * as google_protobuf_wrappers_pb from "google-protobuf/google/protobuf/wrappers_pb";
 
 export const getAPIKeys = ({
diff --git a/pkg/app/web/src/api/applications.ts b/web/src/api/applications.ts
similarity index 96%
rename from pkg/app/web/src/api/applications.ts
rename to web/src/api/applications.ts
index 5674cc7f48..bd0f06040a 100644
--- a/pkg/app/web/src/api/applications.ts
+++ b/web/src/api/applications.ts
@@ -20,9 +20,9 @@ import {
   DeleteApplicationResponse,
   ListUnregisteredApplicationsRequest,
   ListUnregisteredApplicationsResponse,
-} from "pipecd/pkg/app/web/api_client/service_pb";
-import { ApplicationGitPath } from "pipecd/pkg/app/web/model/common_pb";
-import { ApplicationGitRepository } from "pipecd/pkg/app/web/model/common_pb";
+} from "pipecd/web/api_client/service_pb";
+import { ApplicationGitPath } from "pipecd/web/model/common_pb";
+import { ApplicationGitRepository } from "pipecd/web/model/common_pb";
 import * as google_protobuf_wrappers_pb from "google-protobuf/google/protobuf/wrappers_pb";
 
 export const getApplicationLiveState = ({
diff --git a/pkg/app/web/src/api/client.ts b/web/src/api/client.ts
similarity index 88%
rename from pkg/app/web/src/api/client.ts
rename to web/src/api/client.ts
index 6173dd805c..88cfe71a71 100644
--- a/pkg/app/web/src/api/client.ts
+++ b/web/src/api/client.ts
@@ -1,5 +1,5 @@
 import * as grpcWeb from "grpc-web";
-import { WebServiceClient } from "pipecd/pkg/app/web/api_client/service_grpc_web_pb";
+import { WebServiceClient } from "pipecd/web/api_client/service_grpc_web_pb";
 import { apiEndpoint } from "~/constants/api-endpoint";
 
 export const apiClient = new WebServiceClient(apiEndpoint, null, {
diff --git a/pkg/app/web/src/api/commands.ts b/web/src/api/commands.ts
similarity index 86%
rename from pkg/app/web/src/api/commands.ts
rename to web/src/api/commands.ts
index 09e468a0e2..1a0b3417e2 100644
--- a/pkg/app/web/src/api/commands.ts
+++ b/web/src/api/commands.ts
@@ -2,7 +2,7 @@ import { apiClient, apiRequest } from "./client";
 import {
   GetCommandRequest,
   GetCommandResponse,
-} from "pipecd/pkg/app/web/api_client/service_pb";
+} from "pipecd/web/api_client/service_pb";
 
 export const getCommand = ({
   commandId,
diff --git a/pkg/app/web/src/api/deployments.ts b/web/src/api/deployments.ts
similarity index 97%
rename from pkg/app/web/src/api/deployments.ts
rename to web/src/api/deployments.ts
index a7dabfc3db..bfd08b696c 100644
--- a/pkg/app/web/src/api/deployments.ts
+++ b/web/src/api/deployments.ts
@@ -8,7 +8,7 @@ import {
   CancelDeploymentResponse,
   ApproveStageRequest,
   ApproveStageResponse,
-} from "pipecd/pkg/app/web/api_client/service_pb";
+} from "pipecd/web/api_client/service_pb";
 
 export const getDeployment = ({
   deploymentId,
diff --git a/pkg/app/web/src/api/events.ts b/web/src/api/events.ts
similarity index 93%
rename from pkg/app/web/src/api/events.ts
rename to web/src/api/events.ts
index bf0a5b330b..5ae8645dca 100644
--- a/pkg/app/web/src/api/events.ts
+++ b/web/src/api/events.ts
@@ -2,7 +2,7 @@ import { apiClient, apiRequest } from "./client";
 import {
   ListEventsRequest,
   ListEventsResponse,
-} from "pipecd/pkg/app/web/api_client/service_pb";
+} from "pipecd/web/api_client/service_pb";
 
 export const getEvents = ({
   options,
diff --git a/pkg/app/web/src/api/insight.ts b/web/src/api/insight.ts
similarity index 94%
rename from pkg/app/web/src/api/insight.ts
rename to web/src/api/insight.ts
index dbb0a781a4..c89b491eb1 100644
--- a/pkg/app/web/src/api/insight.ts
+++ b/web/src/api/insight.ts
@@ -4,7 +4,7 @@ import {
   GetInsightDataResponse,
   GetInsightApplicationCountRequest,
   GetInsightApplicationCountResponse,
-} from "pipecd/pkg/app/web/api_client/service_pb";
+} from "pipecd/web/api_client/service_pb";
 
 export const getInsightData = ({
   applicationId,
diff --git a/pkg/app/web/src/api/me.test.ts b/web/src/api/me.test.ts
similarity index 100%
rename from pkg/app/web/src/api/me.test.ts
rename to web/src/api/me.test.ts
diff --git a/pkg/app/web/src/api/me.ts b/web/src/api/me.ts
similarity index 82%
rename from pkg/app/web/src/api/me.ts
rename to web/src/api/me.ts
index b31f773dab..c8a17d2625 100644
--- a/pkg/app/web/src/api/me.ts
+++ b/web/src/api/me.ts
@@ -2,7 +2,7 @@ import { apiClient, apiRequest } from "./client";
 import {
   GetMeRequest,
   GetMeResponse,
-} from "pipecd/pkg/app/web/api_client/service_pb";
+} from "pipecd/web/api_client/service_pb";
 
 export const getMe = (): Promise<GetMeResponse.AsObject> => {
   const req = new GetMeRequest();
diff --git a/pkg/app/web/src/api/piped.ts b/web/src/api/piped.ts
similarity index 98%
rename from pkg/app/web/src/api/piped.ts
rename to web/src/api/piped.ts
index a63b6eb71a..5cfbb5b801 100644
--- a/pkg/app/web/src/api/piped.ts
+++ b/web/src/api/piped.ts
@@ -18,7 +18,7 @@ import {
   DeleteOldPipedKeysResponse,
   UpdatePipedDesiredVersionRequest,
   UpdatePipedDesiredVersionResponse,
-} from "pipecd/pkg/app/web/api_client/service_pb";
+} from "pipecd/web/api_client/service_pb";
 
 export const getPipeds = ({
   withStatus,
diff --git a/pkg/app/web/src/api/project.ts b/web/src/api/project.ts
similarity index 96%
rename from pkg/app/web/src/api/project.ts
rename to web/src/api/project.ts
index aa45380ee6..b53a08e8ea 100644
--- a/pkg/app/web/src/api/project.ts
+++ b/web/src/api/project.ts
@@ -11,11 +11,11 @@ import {
   UpdateProjectSSOConfigResponse,
   UpdateProjectStaticAdminRequest,
   UpdateProjectStaticAdminResponse,
-} from "pipecd/pkg/app/web/api_client/service_pb";
+} from "pipecd/web/api_client/service_pb";
 import {
   ProjectRBACConfig,
   ProjectSSOConfig,
-} from "pipecd/pkg/app/web/model/project_pb";
+} from "pipecd/web/model/project_pb";
 import { apiClient, apiRequest } from "./client";
 
 export const getProject = (): Promise<GetProjectResponse.AsObject> => {
diff --git a/pkg/app/web/src/api/stage-log.ts b/web/src/api/stage-log.ts
similarity index 90%
rename from pkg/app/web/src/api/stage-log.ts
rename to web/src/api/stage-log.ts
index 4448a40aca..d6960d4042 100644
--- a/pkg/app/web/src/api/stage-log.ts
+++ b/web/src/api/stage-log.ts
@@ -2,7 +2,7 @@ import { apiClient, apiRequest } from "./client";
 import {
   GetStageLogRequest,
   GetStageLogResponse,
-} from "pipecd/pkg/app/web/api_client/service_pb";
+} from "pipecd/web/api_client/service_pb";
 
 export const getStageLog = ({
   deploymentId,
diff --git a/pkg/app/web/src/app.d.ts b/web/src/app.d.ts
similarity index 100%
rename from pkg/app/web/src/app.d.ts
rename to web/src/app.d.ts
diff --git a/pkg/app/web/src/components/app-sync-status/index.tsx b/web/src/components/app-sync-status/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/app-sync-status/index.tsx
rename to web/src/components/app-sync-status/index.tsx
diff --git a/pkg/app/web/src/components/app-sync-status/sync-status-icon/index.tsx b/web/src/components/app-sync-status/sync-status-icon/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/app-sync-status/sync-status-icon/index.tsx
rename to web/src/components/app-sync-status/sync-status-icon/index.tsx
diff --git a/pkg/app/web/src/components/application-detail-page/application-detail/app-live-state/index.tsx b/web/src/components/application-detail-page/application-detail/app-live-state/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/application-detail-page/application-detail/app-live-state/index.tsx
rename to web/src/components/application-detail-page/application-detail/app-live-state/index.tsx
diff --git a/pkg/app/web/src/components/application-detail-page/application-detail/health-status-icon/index.tsx b/web/src/components/application-detail-page/application-detail/health-status-icon/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/application-detail-page/application-detail/health-status-icon/index.tsx
rename to web/src/components/application-detail-page/application-detail/health-status-icon/index.tsx
diff --git a/pkg/app/web/src/components/application-detail-page/application-detail/index.test.tsx b/web/src/components/application-detail-page/application-detail/index.test.tsx
similarity index 100%
rename from pkg/app/web/src/components/application-detail-page/application-detail/index.test.tsx
rename to web/src/components/application-detail-page/application-detail/index.test.tsx
diff --git a/pkg/app/web/src/components/application-detail-page/application-detail/index.tsx b/web/src/components/application-detail-page/application-detail/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/application-detail-page/application-detail/index.tsx
rename to web/src/components/application-detail-page/application-detail/index.tsx
diff --git a/pkg/app/web/src/components/application-detail-page/application-detail/sync-state-reason/diff-view/index.test.tsx b/web/src/components/application-detail-page/application-detail/sync-state-reason/diff-view/index.test.tsx
similarity index 100%
rename from pkg/app/web/src/components/application-detail-page/application-detail/sync-state-reason/diff-view/index.test.tsx
rename to web/src/components/application-detail-page/application-detail/sync-state-reason/diff-view/index.test.tsx
diff --git a/pkg/app/web/src/components/application-detail-page/application-detail/sync-state-reason/diff-view/index.tsx b/web/src/components/application-detail-page/application-detail/sync-state-reason/diff-view/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/application-detail-page/application-detail/sync-state-reason/diff-view/index.tsx
rename to web/src/components/application-detail-page/application-detail/sync-state-reason/diff-view/index.tsx
diff --git a/pkg/app/web/src/components/application-detail-page/application-detail/sync-state-reason/index.tsx b/web/src/components/application-detail-page/application-detail/sync-state-reason/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/application-detail-page/application-detail/sync-state-reason/index.tsx
rename to web/src/components/application-detail-page/application-detail/sync-state-reason/index.tsx
diff --git a/pkg/app/web/src/components/application-detail-page/application-state-view/cloudrun-state-view/cloudrun-resource-detail/index.tsx b/web/src/components/application-detail-page/application-state-view/cloudrun-state-view/cloudrun-resource-detail/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/application-detail-page/application-state-view/cloudrun-state-view/cloudrun-resource-detail/index.tsx
rename to web/src/components/application-detail-page/application-state-view/cloudrun-state-view/cloudrun-resource-detail/index.tsx
diff --git a/pkg/app/web/src/components/application-detail-page/application-state-view/cloudrun-state-view/cloudrun-resource/health-status-icon/index.tsx b/web/src/components/application-detail-page/application-state-view/cloudrun-state-view/cloudrun-resource/health-status-icon/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/application-detail-page/application-state-view/cloudrun-state-view/cloudrun-resource/health-status-icon/index.tsx
rename to web/src/components/application-detail-page/application-state-view/cloudrun-state-view/cloudrun-resource/health-status-icon/index.tsx
diff --git a/pkg/app/web/src/components/application-detail-page/application-state-view/cloudrun-state-view/cloudrun-resource/index.tsx b/web/src/components/application-detail-page/application-state-view/cloudrun-state-view/cloudrun-resource/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/application-detail-page/application-state-view/cloudrun-state-view/cloudrun-resource/index.tsx
rename to web/src/components/application-detail-page/application-state-view/cloudrun-state-view/cloudrun-resource/index.tsx
diff --git a/pkg/app/web/src/components/application-detail-page/application-state-view/cloudrun-state-view/index.tsx b/web/src/components/application-detail-page/application-state-view/cloudrun-state-view/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/application-detail-page/application-state-view/cloudrun-state-view/index.tsx
rename to web/src/components/application-detail-page/application-state-view/cloudrun-state-view/index.tsx
diff --git a/pkg/app/web/src/components/application-detail-page/application-state-view/index.test.tsx b/web/src/components/application-detail-page/application-state-view/index.test.tsx
similarity index 100%
rename from pkg/app/web/src/components/application-detail-page/application-state-view/index.test.tsx
rename to web/src/components/application-detail-page/application-state-view/index.test.tsx
diff --git a/pkg/app/web/src/components/application-detail-page/application-state-view/index.tsx b/web/src/components/application-detail-page/application-state-view/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/application-detail-page/application-state-view/index.tsx
rename to web/src/components/application-detail-page/application-state-view/index.tsx
diff --git a/pkg/app/web/src/components/application-detail-page/application-state-view/kubernetes-state-view/index.test.tsx b/web/src/components/application-detail-page/application-state-view/kubernetes-state-view/index.test.tsx
similarity index 100%
rename from pkg/app/web/src/components/application-detail-page/application-state-view/kubernetes-state-view/index.test.tsx
rename to web/src/components/application-detail-page/application-state-view/kubernetes-state-view/index.test.tsx
diff --git a/pkg/app/web/src/components/application-detail-page/application-state-view/kubernetes-state-view/index.tsx b/web/src/components/application-detail-page/application-state-view/kubernetes-state-view/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/application-detail-page/application-state-view/kubernetes-state-view/index.tsx
rename to web/src/components/application-detail-page/application-state-view/kubernetes-state-view/index.tsx
diff --git a/pkg/app/web/src/components/application-detail-page/application-state-view/kubernetes-state-view/kubernetes-resource-detail/index.tsx b/web/src/components/application-detail-page/application-state-view/kubernetes-state-view/kubernetes-resource-detail/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/application-detail-page/application-state-view/kubernetes-state-view/kubernetes-resource-detail/index.tsx
rename to web/src/components/application-detail-page/application-state-view/kubernetes-state-view/kubernetes-resource-detail/index.tsx
diff --git a/pkg/app/web/src/components/application-detail-page/application-state-view/kubernetes-state-view/kubernetes-resource/health-status-icon/index.tsx b/web/src/components/application-detail-page/application-state-view/kubernetes-state-view/kubernetes-resource/health-status-icon/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/application-detail-page/application-state-view/kubernetes-state-view/kubernetes-resource/health-status-icon/index.tsx
rename to web/src/components/application-detail-page/application-state-view/kubernetes-state-view/kubernetes-resource/health-status-icon/index.tsx
diff --git a/pkg/app/web/src/components/application-detail-page/application-state-view/kubernetes-state-view/kubernetes-resource/index.tsx b/web/src/components/application-detail-page/application-state-view/kubernetes-state-view/kubernetes-resource/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/application-detail-page/application-state-view/kubernetes-state-view/kubernetes-resource/index.tsx
rename to web/src/components/application-detail-page/application-state-view/kubernetes-state-view/kubernetes-resource/index.tsx
diff --git a/pkg/app/web/src/components/application-detail-page/application-state-view/kubernetes-state-view/resource-filter-popover/index.tsx b/web/src/components/application-detail-page/application-state-view/kubernetes-state-view/resource-filter-popover/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/application-detail-page/application-state-view/kubernetes-state-view/resource-filter-popover/index.tsx
rename to web/src/components/application-detail-page/application-state-view/kubernetes-state-view/resource-filter-popover/index.tsx
diff --git a/pkg/app/web/src/components/application-detail-page/index.test.tsx b/web/src/components/application-detail-page/index.test.tsx
similarity index 100%
rename from pkg/app/web/src/components/application-detail-page/index.test.tsx
rename to web/src/components/application-detail-page/index.test.tsx
diff --git a/pkg/app/web/src/components/application-detail-page/index.tsx b/web/src/components/application-detail-page/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/application-detail-page/index.tsx
rename to web/src/components/application-detail-page/index.tsx
diff --git a/pkg/app/web/src/components/application-form/index.tsx b/web/src/components/application-form/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/application-form/index.tsx
rename to web/src/components/application-form/index.tsx
diff --git a/pkg/app/web/src/components/applications-page/add-application-drawer/index.test.tsx b/web/src/components/applications-page/add-application-drawer/index.test.tsx
similarity index 100%
rename from pkg/app/web/src/components/applications-page/add-application-drawer/index.test.tsx
rename to web/src/components/applications-page/add-application-drawer/index.test.tsx
diff --git a/pkg/app/web/src/components/applications-page/add-application-drawer/index.tsx b/web/src/components/applications-page/add-application-drawer/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/applications-page/add-application-drawer/index.tsx
rename to web/src/components/applications-page/add-application-drawer/index.tsx
diff --git a/pkg/app/web/src/components/applications-page/application-added-view/index.tsx b/web/src/components/applications-page/application-added-view/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/applications-page/application-added-view/index.tsx
rename to web/src/components/applications-page/application-added-view/index.tsx
diff --git a/pkg/app/web/src/components/applications-page/application-filter/application-autocomplete.tsx b/web/src/components/applications-page/application-filter/application-autocomplete.tsx
similarity index 100%
rename from pkg/app/web/src/components/applications-page/application-filter/application-autocomplete.tsx
rename to web/src/components/applications-page/application-filter/application-autocomplete.tsx
diff --git a/pkg/app/web/src/components/applications-page/application-filter/index.test.tsx b/web/src/components/applications-page/application-filter/index.test.tsx
similarity index 100%
rename from pkg/app/web/src/components/applications-page/application-filter/index.test.tsx
rename to web/src/components/applications-page/application-filter/index.test.tsx
diff --git a/pkg/app/web/src/components/applications-page/application-filter/index.tsx b/web/src/components/applications-page/application-filter/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/applications-page/application-filter/index.tsx
rename to web/src/components/applications-page/application-filter/index.tsx
diff --git a/pkg/app/web/src/components/applications-page/application-list/application-list-item/index.test.tsx b/web/src/components/applications-page/application-list/application-list-item/index.test.tsx
similarity index 100%
rename from pkg/app/web/src/components/applications-page/application-list/application-list-item/index.test.tsx
rename to web/src/components/applications-page/application-list/application-list-item/index.test.tsx
diff --git a/pkg/app/web/src/components/applications-page/application-list/application-list-item/index.tsx b/web/src/components/applications-page/application-list/application-list-item/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/applications-page/application-list/application-list-item/index.tsx
rename to web/src/components/applications-page/application-list/application-list-item/index.tsx
diff --git a/pkg/app/web/src/components/applications-page/application-list/delete-application-dialog/index.tsx b/web/src/components/applications-page/application-list/delete-application-dialog/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/applications-page/application-list/delete-application-dialog/index.tsx
rename to web/src/components/applications-page/application-list/delete-application-dialog/index.tsx
diff --git a/pkg/app/web/src/components/applications-page/application-list/disable-application-dialog/index.tsx b/web/src/components/applications-page/application-list/disable-application-dialog/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/applications-page/application-list/disable-application-dialog/index.tsx
rename to web/src/components/applications-page/application-list/disable-application-dialog/index.tsx
diff --git a/pkg/app/web/src/components/applications-page/application-list/index.test.tsx b/web/src/components/applications-page/application-list/index.test.tsx
similarity index 100%
rename from pkg/app/web/src/components/applications-page/application-list/index.test.tsx
rename to web/src/components/applications-page/application-list/index.test.tsx
diff --git a/pkg/app/web/src/components/applications-page/application-list/index.tsx b/web/src/components/applications-page/application-list/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/applications-page/application-list/index.tsx
rename to web/src/components/applications-page/application-list/index.tsx
diff --git a/pkg/app/web/src/components/applications-page/application-list/sealed-secret-dialog/index.test.tsx b/web/src/components/applications-page/application-list/sealed-secret-dialog/index.test.tsx
similarity index 100%
rename from pkg/app/web/src/components/applications-page/application-list/sealed-secret-dialog/index.test.tsx
rename to web/src/components/applications-page/application-list/sealed-secret-dialog/index.test.tsx
diff --git a/pkg/app/web/src/components/applications-page/application-list/sealed-secret-dialog/index.tsx b/web/src/components/applications-page/application-list/sealed-secret-dialog/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/applications-page/application-list/sealed-secret-dialog/index.tsx
rename to web/src/components/applications-page/application-list/sealed-secret-dialog/index.tsx
diff --git a/pkg/app/web/src/components/applications-page/edit-application-drawer/index.test.tsx b/web/src/components/applications-page/edit-application-drawer/index.test.tsx
similarity index 100%
rename from pkg/app/web/src/components/applications-page/edit-application-drawer/index.test.tsx
rename to web/src/components/applications-page/edit-application-drawer/index.test.tsx
diff --git a/pkg/app/web/src/components/applications-page/edit-application-drawer/index.tsx b/web/src/components/applications-page/edit-application-drawer/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/applications-page/edit-application-drawer/index.tsx
rename to web/src/components/applications-page/edit-application-drawer/index.tsx
diff --git a/pkg/app/web/src/components/applications-page/index.tsx b/web/src/components/applications-page/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/applications-page/index.tsx
rename to web/src/components/applications-page/index.tsx
diff --git a/pkg/app/web/src/components/copy-icon-button/index.test.tsx b/web/src/components/copy-icon-button/index.test.tsx
similarity index 100%
rename from pkg/app/web/src/components/copy-icon-button/index.test.tsx
rename to web/src/components/copy-icon-button/index.test.tsx
diff --git a/pkg/app/web/src/components/copy-icon-button/index.tsx b/web/src/components/copy-icon-button/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/copy-icon-button/index.tsx
rename to web/src/components/copy-icon-button/index.tsx
diff --git a/pkg/app/web/src/components/deployment-chains-page/index.tsx b/web/src/components/deployment-chains-page/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/deployment-chains-page/index.tsx
rename to web/src/components/deployment-chains-page/index.tsx
diff --git a/pkg/app/web/src/components/deployment-status-icon/index.test.tsx b/web/src/components/deployment-status-icon/index.test.tsx
similarity index 100%
rename from pkg/app/web/src/components/deployment-status-icon/index.test.tsx
rename to web/src/components/deployment-status-icon/index.test.tsx
diff --git a/pkg/app/web/src/components/deployment-status-icon/index.tsx b/web/src/components/deployment-status-icon/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/deployment-status-icon/index.tsx
rename to web/src/components/deployment-status-icon/index.tsx
diff --git a/pkg/app/web/src/components/deployments-detail-page/deployment-detail/index.test.tsx b/web/src/components/deployments-detail-page/deployment-detail/index.test.tsx
similarity index 100%
rename from pkg/app/web/src/components/deployments-detail-page/deployment-detail/index.test.tsx
rename to web/src/components/deployments-detail-page/deployment-detail/index.test.tsx
diff --git a/pkg/app/web/src/components/deployments-detail-page/deployment-detail/index.tsx b/web/src/components/deployments-detail-page/deployment-detail/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/deployments-detail-page/deployment-detail/index.tsx
rename to web/src/components/deployments-detail-page/deployment-detail/index.tsx
diff --git a/pkg/app/web/src/components/deployments-detail-page/index.test.tsx b/web/src/components/deployments-detail-page/index.test.tsx
similarity index 100%
rename from pkg/app/web/src/components/deployments-detail-page/index.test.tsx
rename to web/src/components/deployments-detail-page/index.test.tsx
diff --git a/pkg/app/web/src/components/deployments-detail-page/index.tsx b/web/src/components/deployments-detail-page/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/deployments-detail-page/index.tsx
rename to web/src/components/deployments-detail-page/index.tsx
diff --git a/pkg/app/web/src/components/deployments-detail-page/log-viewer/index.test.tsx b/web/src/components/deployments-detail-page/log-viewer/index.test.tsx
similarity index 100%
rename from pkg/app/web/src/components/deployments-detail-page/log-viewer/index.test.tsx
rename to web/src/components/deployments-detail-page/log-viewer/index.test.tsx
diff --git a/pkg/app/web/src/components/deployments-detail-page/log-viewer/index.tsx b/web/src/components/deployments-detail-page/log-viewer/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/deployments-detail-page/log-viewer/index.tsx
rename to web/src/components/deployments-detail-page/log-viewer/index.tsx
diff --git a/pkg/app/web/src/components/deployments-detail-page/log-viewer/log-line/index.tsx b/web/src/components/deployments-detail-page/log-viewer/log-line/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/deployments-detail-page/log-viewer/log-line/index.tsx
rename to web/src/components/deployments-detail-page/log-viewer/log-line/index.tsx
diff --git a/pkg/app/web/src/components/deployments-detail-page/log-viewer/log/index.tsx b/web/src/components/deployments-detail-page/log-viewer/log/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/deployments-detail-page/log-viewer/log/index.tsx
rename to web/src/components/deployments-detail-page/log-viewer/log/index.tsx
diff --git a/pkg/app/web/src/components/deployments-detail-page/pipeline/approval-stage/index.test.tsx b/web/src/components/deployments-detail-page/pipeline/approval-stage/index.test.tsx
similarity index 100%
rename from pkg/app/web/src/components/deployments-detail-page/pipeline/approval-stage/index.test.tsx
rename to web/src/components/deployments-detail-page/pipeline/approval-stage/index.test.tsx
diff --git a/pkg/app/web/src/components/deployments-detail-page/pipeline/approval-stage/index.tsx b/web/src/components/deployments-detail-page/pipeline/approval-stage/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/deployments-detail-page/pipeline/approval-stage/index.tsx
rename to web/src/components/deployments-detail-page/pipeline/approval-stage/index.tsx
diff --git a/pkg/app/web/src/components/deployments-detail-page/pipeline/index.test.tsx b/web/src/components/deployments-detail-page/pipeline/index.test.tsx
similarity index 100%
rename from pkg/app/web/src/components/deployments-detail-page/pipeline/index.test.tsx
rename to web/src/components/deployments-detail-page/pipeline/index.test.tsx
diff --git a/pkg/app/web/src/components/deployments-detail-page/pipeline/index.tsx b/web/src/components/deployments-detail-page/pipeline/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/deployments-detail-page/pipeline/index.tsx
rename to web/src/components/deployments-detail-page/pipeline/index.tsx
diff --git a/pkg/app/web/src/components/deployments-detail-page/pipeline/pipeline-stage/index.tsx b/web/src/components/deployments-detail-page/pipeline/pipeline-stage/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/deployments-detail-page/pipeline/pipeline-stage/index.tsx
rename to web/src/components/deployments-detail-page/pipeline/pipeline-stage/index.tsx
diff --git a/pkg/app/web/src/components/deployments-detail-page/pipeline/pipeline-stage/stage-status-icon/index.tsx b/web/src/components/deployments-detail-page/pipeline/pipeline-stage/stage-status-icon/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/deployments-detail-page/pipeline/pipeline-stage/stage-status-icon/index.tsx
rename to web/src/components/deployments-detail-page/pipeline/pipeline-stage/stage-status-icon/index.tsx
diff --git a/pkg/app/web/src/components/deployments-page/deployment-filter/index.test.tsx b/web/src/components/deployments-page/deployment-filter/index.test.tsx
similarity index 100%
rename from pkg/app/web/src/components/deployments-page/deployment-filter/index.test.tsx
rename to web/src/components/deployments-page/deployment-filter/index.test.tsx
diff --git a/pkg/app/web/src/components/deployments-page/deployment-filter/index.tsx b/web/src/components/deployments-page/deployment-filter/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/deployments-page/deployment-filter/index.tsx
rename to web/src/components/deployments-page/deployment-filter/index.tsx
diff --git a/pkg/app/web/src/components/deployments-page/deployment-item/index.tsx b/web/src/components/deployments-page/deployment-item/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/deployments-page/deployment-item/index.tsx
rename to web/src/components/deployments-page/deployment-item/index.tsx
diff --git a/pkg/app/web/src/components/deployments-page/index.tsx b/web/src/components/deployments-page/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/deployments-page/index.tsx
rename to web/src/components/deployments-page/index.tsx
diff --git a/pkg/app/web/src/components/detail-table-row/index.tsx b/web/src/components/detail-table-row/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/detail-table-row/index.tsx
rename to web/src/components/detail-table-row/index.tsx
diff --git a/pkg/app/web/src/components/event-status-icon/index.tsx b/web/src/components/event-status-icon/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/event-status-icon/index.tsx
rename to web/src/components/event-status-icon/index.tsx
diff --git a/pkg/app/web/src/components/events-page/event-filter/index.tsx b/web/src/components/events-page/event-filter/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/events-page/event-filter/index.tsx
rename to web/src/components/events-page/event-filter/index.tsx
diff --git a/pkg/app/web/src/components/events-page/event-item/index.tsx b/web/src/components/events-page/event-item/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/events-page/event-item/index.tsx
rename to web/src/components/events-page/event-item/index.tsx
diff --git a/pkg/app/web/src/components/events-page/index.tsx b/web/src/components/events-page/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/events-page/index.tsx
rename to web/src/components/events-page/index.tsx
diff --git a/pkg/app/web/src/components/filter-view/index.tsx b/web/src/components/filter-view/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/filter-view/index.tsx
rename to web/src/components/filter-view/index.tsx
diff --git a/pkg/app/web/src/components/header/index.test.tsx b/web/src/components/header/index.test.tsx
similarity index 100%
rename from pkg/app/web/src/components/header/index.test.tsx
rename to web/src/components/header/index.test.tsx
diff --git a/pkg/app/web/src/components/header/index.tsx b/web/src/components/header/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/header/index.tsx
rename to web/src/components/header/index.tsx
diff --git a/pkg/app/web/src/components/insight-page/application-counts/application-count/index.tsx b/web/src/components/insight-page/application-counts/application-count/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/insight-page/application-counts/application-count/index.tsx
rename to web/src/components/insight-page/application-counts/application-count/index.tsx
diff --git a/pkg/app/web/src/components/insight-page/application-counts/index.test.tsx b/web/src/components/insight-page/application-counts/index.test.tsx
similarity index 100%
rename from pkg/app/web/src/components/insight-page/application-counts/index.test.tsx
rename to web/src/components/insight-page/application-counts/index.test.tsx
diff --git a/pkg/app/web/src/components/insight-page/application-counts/index.tsx b/web/src/components/insight-page/application-counts/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/insight-page/application-counts/index.tsx
rename to web/src/components/insight-page/application-counts/index.tsx
diff --git a/pkg/app/web/src/components/insight-page/change-failure-rate-chart/index.tsx b/web/src/components/insight-page/change-failure-rate-chart/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/insight-page/change-failure-rate-chart/index.tsx
rename to web/src/components/insight-page/change-failure-rate-chart/index.tsx
diff --git a/pkg/app/web/src/components/insight-page/chart-base/index.tsx b/web/src/components/insight-page/chart-base/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/insight-page/chart-base/index.tsx
rename to web/src/components/insight-page/chart-base/index.tsx
diff --git a/pkg/app/web/src/components/insight-page/deployment-frequency-chart/index.tsx b/web/src/components/insight-page/deployment-frequency-chart/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/insight-page/deployment-frequency-chart/index.tsx
rename to web/src/components/insight-page/deployment-frequency-chart/index.tsx
diff --git a/pkg/app/web/src/components/insight-page/index.tsx b/web/src/components/insight-page/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/insight-page/index.tsx
rename to web/src/components/insight-page/index.tsx
diff --git a/pkg/app/web/src/components/insight-page/insight-header/index.tsx b/web/src/components/insight-page/insight-header/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/insight-page/insight-header/index.tsx
rename to web/src/components/insight-page/insight-header/index.tsx
diff --git a/pkg/app/web/src/components/insight-page/insight-header/week-picker/index.tsx b/web/src/components/insight-page/insight-header/week-picker/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/insight-page/insight-header/week-picker/index.tsx
rename to web/src/components/insight-page/insight-header/week-picker/index.tsx
diff --git a/pkg/app/web/src/components/insight-page/lead-time-for-changes-chart/index.tsx b/web/src/components/insight-page/lead-time-for-changes-chart/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/insight-page/lead-time-for-changes-chart/index.tsx
rename to web/src/components/insight-page/lead-time-for-changes-chart/index.tsx
diff --git a/pkg/app/web/src/components/insight-page/mean-time-to-restore-chart/index.tsx b/web/src/components/insight-page/mean-time-to-restore-chart/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/insight-page/mean-time-to-restore-chart/index.tsx
rename to web/src/components/insight-page/mean-time-to-restore-chart/index.tsx
diff --git a/pkg/app/web/src/components/login-page/index.tsx b/web/src/components/login-page/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/login-page/index.tsx
rename to web/src/components/login-page/index.tsx
diff --git a/pkg/app/web/src/components/login-page/login-form/index.tsx b/web/src/components/login-page/login-form/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/login-page/login-form/index.tsx
rename to web/src/components/login-page/login-form/index.tsx
diff --git a/pkg/app/web/src/components/settings-page/api-key/components/disable-api-key-confirm-dialog/index.tsx b/web/src/components/settings-page/api-key/components/disable-api-key-confirm-dialog/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/settings-page/api-key/components/disable-api-key-confirm-dialog/index.tsx
rename to web/src/components/settings-page/api-key/components/disable-api-key-confirm-dialog/index.tsx
diff --git a/pkg/app/web/src/components/settings-page/api-key/components/generate-api-key-dialog/index.tsx b/web/src/components/settings-page/api-key/components/generate-api-key-dialog/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/settings-page/api-key/components/generate-api-key-dialog/index.tsx
rename to web/src/components/settings-page/api-key/components/generate-api-key-dialog/index.tsx
diff --git a/pkg/app/web/src/components/settings-page/api-key/components/generated-api-key-dialog/index.tsx b/web/src/components/settings-page/api-key/components/generated-api-key-dialog/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/settings-page/api-key/components/generated-api-key-dialog/index.tsx
rename to web/src/components/settings-page/api-key/components/generated-api-key-dialog/index.tsx
diff --git a/pkg/app/web/src/components/settings-page/api-key/index.tsx b/web/src/components/settings-page/api-key/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/settings-page/api-key/index.tsx
rename to web/src/components/settings-page/api-key/index.tsx
diff --git a/pkg/app/web/src/components/settings-page/index.tsx b/web/src/components/settings-page/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/settings-page/index.tsx
rename to web/src/components/settings-page/index.tsx
diff --git a/pkg/app/web/src/components/settings-page/piped/components/add-piped-drawer/index.tsx b/web/src/components/settings-page/piped/components/add-piped-drawer/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/settings-page/piped/components/add-piped-drawer/index.tsx
rename to web/src/components/settings-page/piped/components/add-piped-drawer/index.tsx
diff --git a/pkg/app/web/src/components/settings-page/piped/components/edit-piped-drawer/index.tsx b/web/src/components/settings-page/piped/components/edit-piped-drawer/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/settings-page/piped/components/edit-piped-drawer/index.tsx
rename to web/src/components/settings-page/piped/components/edit-piped-drawer/index.tsx
diff --git a/pkg/app/web/src/components/settings-page/piped/components/piped-filter/index.tsx b/web/src/components/settings-page/piped/components/piped-filter/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/settings-page/piped/components/piped-filter/index.tsx
rename to web/src/components/settings-page/piped/components/piped-filter/index.tsx
diff --git a/pkg/app/web/src/components/settings-page/piped/components/piped-form/index.tsx b/web/src/components/settings-page/piped/components/piped-form/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/settings-page/piped/components/piped-form/index.tsx
rename to web/src/components/settings-page/piped/components/piped-form/index.tsx
diff --git a/pkg/app/web/src/components/settings-page/piped/components/piped-table-row.tsx b/web/src/components/settings-page/piped/components/piped-table-row.tsx
similarity index 100%
rename from pkg/app/web/src/components/settings-page/piped/components/piped-table-row.tsx
rename to web/src/components/settings-page/piped/components/piped-table-row.tsx
diff --git a/pkg/app/web/src/components/settings-page/piped/components/upgrade-dialog/index.tsx b/web/src/components/settings-page/piped/components/upgrade-dialog/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/settings-page/piped/components/upgrade-dialog/index.tsx
rename to web/src/components/settings-page/piped/components/upgrade-dialog/index.tsx
diff --git a/pkg/app/web/src/components/settings-page/piped/index.tsx b/web/src/components/settings-page/piped/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/settings-page/piped/index.tsx
rename to web/src/components/settings-page/piped/index.tsx
diff --git a/pkg/app/web/src/components/settings-page/project/components/github-sso-form/index.tsx b/web/src/components/settings-page/project/components/github-sso-form/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/settings-page/project/components/github-sso-form/index.tsx
rename to web/src/components/settings-page/project/components/github-sso-form/index.tsx
diff --git a/pkg/app/web/src/components/settings-page/project/components/project-setting-labeled-text/index.tsx b/web/src/components/settings-page/project/components/project-setting-labeled-text/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/settings-page/project/components/project-setting-labeled-text/index.tsx
rename to web/src/components/settings-page/project/components/project-setting-labeled-text/index.tsx
diff --git a/pkg/app/web/src/components/settings-page/project/components/rbac-form/index.tsx b/web/src/components/settings-page/project/components/rbac-form/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/settings-page/project/components/rbac-form/index.tsx
rename to web/src/components/settings-page/project/components/rbac-form/index.tsx
diff --git a/pkg/app/web/src/components/settings-page/project/components/static-admin-form/index.test.tsx b/web/src/components/settings-page/project/components/static-admin-form/index.test.tsx
similarity index 100%
rename from pkg/app/web/src/components/settings-page/project/components/static-admin-form/index.test.tsx
rename to web/src/components/settings-page/project/components/static-admin-form/index.test.tsx
diff --git a/pkg/app/web/src/components/settings-page/project/components/static-admin-form/index.tsx b/web/src/components/settings-page/project/components/static-admin-form/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/settings-page/project/components/static-admin-form/index.tsx
rename to web/src/components/settings-page/project/components/static-admin-form/index.tsx
diff --git a/pkg/app/web/src/components/settings-page/project/index.tsx b/web/src/components/settings-page/project/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/settings-page/project/index.tsx
rename to web/src/components/settings-page/project/index.tsx
diff --git a/pkg/app/web/src/components/settings-page/styles.ts b/web/src/components/settings-page/styles.ts
similarity index 100%
rename from pkg/app/web/src/components/settings-page/styles.ts
rename to web/src/components/settings-page/styles.ts
diff --git a/pkg/app/web/src/components/split-button/index.test.tsx b/web/src/components/split-button/index.test.tsx
similarity index 100%
rename from pkg/app/web/src/components/split-button/index.test.tsx
rename to web/src/components/split-button/index.test.tsx
diff --git a/pkg/app/web/src/components/split-button/index.tsx b/web/src/components/split-button/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/split-button/index.tsx
rename to web/src/components/split-button/index.tsx
diff --git a/pkg/app/web/src/components/text-with-copy-button/index.tsx b/web/src/components/text-with-copy-button/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/text-with-copy-button/index.tsx
rename to web/src/components/text-with-copy-button/index.tsx
diff --git a/pkg/app/web/src/components/toasts/index.test.tsx b/web/src/components/toasts/index.test.tsx
similarity index 100%
rename from pkg/app/web/src/components/toasts/index.test.tsx
rename to web/src/components/toasts/index.test.tsx
diff --git a/pkg/app/web/src/components/toasts/index.tsx b/web/src/components/toasts/index.tsx
similarity index 100%
rename from pkg/app/web/src/components/toasts/index.tsx
rename to web/src/components/toasts/index.tsx
diff --git a/pkg/app/web/src/constants/api-endpoint.ts b/web/src/constants/api-endpoint.ts
similarity index 100%
rename from pkg/app/web/src/constants/api-endpoint.ts
rename to web/src/constants/api-endpoint.ts
diff --git a/pkg/app/web/src/constants/api-key-role-text.ts b/web/src/constants/api-key-role-text.ts
similarity index 100%
rename from pkg/app/web/src/constants/api-key-role-text.ts
rename to web/src/constants/api-key-role-text.ts
diff --git a/pkg/app/web/src/constants/application-active-status.ts b/web/src/constants/application-active-status.ts
similarity index 100%
rename from pkg/app/web/src/constants/application-active-status.ts
rename to web/src/constants/application-active-status.ts
diff --git a/pkg/app/web/src/constants/application-kind.ts b/web/src/constants/application-kind.ts
similarity index 100%
rename from pkg/app/web/src/constants/application-kind.ts
rename to web/src/constants/application-kind.ts
diff --git a/pkg/app/web/src/constants/application-sync-status-text.ts b/web/src/constants/application-sync-status-text.ts
similarity index 78%
rename from pkg/app/web/src/constants/application-sync-status-text.ts
rename to web/src/constants/application-sync-status-text.ts
index 7e33e7b080..995b4cc64f 100644
--- a/pkg/app/web/src/constants/application-sync-status-text.ts
+++ b/web/src/constants/application-sync-status-text.ts
@@ -1,4 +1,4 @@
-import { ApplicationSyncStatus } from "pipecd/pkg/app/web/model/application_pb";
+import { ApplicationSyncStatus } from "pipecd/web/model/application_pb";
 
 export const APPLICATION_SYNC_STATUS_TEXT: Record<
   ApplicationSyncStatus,
diff --git a/pkg/app/web/src/constants/common.ts b/web/src/constants/common.ts
similarity index 100%
rename from pkg/app/web/src/constants/common.ts
rename to web/src/constants/common.ts
diff --git a/pkg/app/web/src/constants/deployment-status-text.ts b/web/src/constants/deployment-status-text.ts
similarity index 85%
rename from pkg/app/web/src/constants/deployment-status-text.ts
rename to web/src/constants/deployment-status-text.ts
index 2ab2210609..d8f975e832 100644
--- a/pkg/app/web/src/constants/deployment-status-text.ts
+++ b/web/src/constants/deployment-status-text.ts
@@ -1,4 +1,4 @@
-import { DeploymentStatus } from "pipecd/pkg/app/web/model/deployment_pb";
+import { DeploymentStatus } from "pipecd/web/model/deployment_pb";
 
 export const DEPLOYMENT_STATE_TEXT: Record<DeploymentStatus, string> = {
   [DeploymentStatus.DEPLOYMENT_PENDING]: "PENDING",
diff --git a/pkg/app/web/src/constants/event-status-text.ts b/web/src/constants/event-status-text.ts
similarity index 79%
rename from pkg/app/web/src/constants/event-status-text.ts
rename to web/src/constants/event-status-text.ts
index 2f3698f29d..26ebc69f48 100644
--- a/pkg/app/web/src/constants/event-status-text.ts
+++ b/web/src/constants/event-status-text.ts
@@ -1,4 +1,4 @@
-import { EventStatus } from "pipecd/pkg/app/web/model/event_pb";
+import { EventStatus } from "pipecd/web/model/event_pb";
 
 export const EVENT_STATE_TEXT: Record<EventStatus, string> = {
   [EventStatus.EVENT_NOT_HANDLED]: "NOT HANDLED",
diff --git a/pkg/app/web/src/constants/health-status-text.ts b/web/src/constants/health-status-text.ts
similarity index 100%
rename from pkg/app/web/src/constants/health-status-text.ts
rename to web/src/constants/health-status-text.ts
diff --git a/pkg/app/web/src/constants/insight-step-text.ts b/web/src/constants/insight-step-text.ts
similarity index 100%
rename from pkg/app/web/src/constants/insight-step-text.ts
rename to web/src/constants/insight-step-text.ts
diff --git a/pkg/app/web/src/constants/metadata-keys.ts b/web/src/constants/metadata-keys.ts
similarity index 100%
rename from pkg/app/web/src/constants/metadata-keys.ts
rename to web/src/constants/metadata-keys.ts
diff --git a/pkg/app/web/src/constants/path.ts b/web/src/constants/path.ts
similarity index 100%
rename from pkg/app/web/src/constants/path.ts
rename to web/src/constants/path.ts
diff --git a/pkg/app/web/src/constants/piped-connection-status-text.ts b/web/src/constants/piped-connection-status-text.ts
similarity index 79%
rename from pkg/app/web/src/constants/piped-connection-status-text.ts
rename to web/src/constants/piped-connection-status-text.ts
index 0d73d3452b..d3090fa41c 100644
--- a/pkg/app/web/src/constants/piped-connection-status-text.ts
+++ b/web/src/constants/piped-connection-status-text.ts
@@ -1,4 +1,4 @@
-import { Piped } from "pipecd/pkg/app/web/model/piped_pb";
+import { Piped } from "pipecd/web/model/piped_pb";
 
 export const PIPED_CONNECTION_STATUS_TEXT: Record<
   Piped.ConnectionStatus,
diff --git a/pkg/app/web/src/constants/term-colors.ts b/web/src/constants/term-colors.ts
similarity index 100%
rename from pkg/app/web/src/constants/term-colors.ts
rename to web/src/constants/term-colors.ts
diff --git a/pkg/app/web/src/constants/text.ts b/web/src/constants/text.ts
similarity index 100%
rename from pkg/app/web/src/constants/text.ts
rename to web/src/constants/text.ts
diff --git a/pkg/app/web/src/constants/toast-text.ts b/web/src/constants/toast-text.ts
similarity index 100%
rename from pkg/app/web/src/constants/toast-text.ts
rename to web/src/constants/toast-text.ts
diff --git a/pkg/app/web/src/constants/ui-text.ts b/web/src/constants/ui-text.ts
similarity index 100%
rename from pkg/app/web/src/constants/ui-text.ts
rename to web/src/constants/ui-text.ts
diff --git a/pkg/app/web/src/history.ts b/web/src/history.ts
similarity index 100%
rename from pkg/app/web/src/history.ts
rename to web/src/history.ts
diff --git a/pkg/app/web/src/hooks/redux.ts b/web/src/hooks/redux.ts
similarity index 100%
rename from pkg/app/web/src/hooks/redux.ts
rename to web/src/hooks/redux.ts
diff --git a/pkg/app/web/src/hooks/use-interval.test.ts b/web/src/hooks/use-interval.test.ts
similarity index 100%
rename from pkg/app/web/src/hooks/use-interval.test.ts
rename to web/src/hooks/use-interval.test.ts
diff --git a/pkg/app/web/src/hooks/use-interval.ts b/web/src/hooks/use-interval.ts
similarity index 100%
rename from pkg/app/web/src/hooks/use-interval.ts
rename to web/src/hooks/use-interval.ts
diff --git a/pkg/app/web/src/hooks/use-query-string.ts b/web/src/hooks/use-query-string.ts
similarity index 100%
rename from pkg/app/web/src/hooks/use-query-string.ts
rename to web/src/hooks/use-query-string.ts
diff --git a/pkg/app/web/src/index.tsx b/web/src/index.tsx
similarity index 100%
rename from pkg/app/web/src/index.tsx
rename to web/src/index.tsx
diff --git a/pkg/app/web/src/middlewares/thunk-error-handler.test.ts b/web/src/middlewares/thunk-error-handler.test.ts
similarity index 100%
rename from pkg/app/web/src/middlewares/thunk-error-handler.test.ts
rename to web/src/middlewares/thunk-error-handler.test.ts
diff --git a/pkg/app/web/src/middlewares/thunk-error-handler.ts b/web/src/middlewares/thunk-error-handler.ts
similarity index 100%
rename from pkg/app/web/src/middlewares/thunk-error-handler.ts
rename to web/src/middlewares/thunk-error-handler.ts
diff --git a/pkg/app/web/src/mocks/browser.ts b/web/src/mocks/browser.ts
similarity index 100%
rename from pkg/app/web/src/mocks/browser.ts
rename to web/src/mocks/browser.ts
diff --git a/pkg/app/web/src/mocks/create-handler.ts b/web/src/mocks/create-handler.ts
similarity index 100%
rename from pkg/app/web/src/mocks/create-handler.ts
rename to web/src/mocks/create-handler.ts
diff --git a/pkg/app/web/src/mocks/handlers.ts b/web/src/mocks/handlers.ts
similarity index 100%
rename from pkg/app/web/src/mocks/handlers.ts
rename to web/src/mocks/handlers.ts
diff --git a/pkg/app/web/src/mocks/serializer.ts b/web/src/mocks/serializer.ts
similarity index 100%
rename from pkg/app/web/src/mocks/serializer.ts
rename to web/src/mocks/serializer.ts
diff --git a/pkg/app/web/src/mocks/server.ts b/web/src/mocks/server.ts
similarity index 100%
rename from pkg/app/web/src/mocks/server.ts
rename to web/src/mocks/server.ts
diff --git a/pkg/app/web/src/mocks/services/api-keys.ts b/web/src/mocks/services/api-keys.ts
similarity index 92%
rename from pkg/app/web/src/mocks/services/api-keys.ts
rename to web/src/mocks/services/api-keys.ts
index b1cf24977c..22de0b37ed 100644
--- a/pkg/app/web/src/mocks/services/api-keys.ts
+++ b/web/src/mocks/services/api-keys.ts
@@ -1,7 +1,7 @@
 import {
   ListAPIKeysResponse,
   GenerateAPIKeyResponse,
-} from "pipecd/pkg/app/web/api_client/service_pb";
+} from "pipecd/web/api_client/service_pb";
 import {
   createAPIKeyFromObject,
   dummyAPIKey,
diff --git a/pkg/app/web/src/mocks/services/application.ts b/web/src/mocks/services/application.ts
similarity index 98%
rename from pkg/app/web/src/mocks/services/application.ts
rename to web/src/mocks/services/application.ts
index 077e1b8ae6..5cae2c075f 100644
--- a/pkg/app/web/src/mocks/services/application.ts
+++ b/web/src/mocks/services/application.ts
@@ -8,7 +8,7 @@ import {
   ListApplicationsResponse,
   SyncApplicationResponse,
   UpdateApplicationResponse,
-} from "pipecd/pkg/app/web/api_client/service_pb";
+} from "pipecd/web/api_client/service_pb";
 import { ApplicationKind } from "~/modules/applications";
 import {
   createApplicationFromObject,
diff --git a/pkg/app/web/src/mocks/services/command.ts b/web/src/mocks/services/command.ts
similarity index 96%
rename from pkg/app/web/src/mocks/services/command.ts
rename to web/src/mocks/services/command.ts
index b9a269b238..42119f8ec9 100644
--- a/pkg/app/web/src/mocks/services/command.ts
+++ b/web/src/mocks/services/command.ts
@@ -1,7 +1,7 @@
 import {
   GetCommandRequest,
   GetCommandResponse,
-} from "pipecd/pkg/app/web/api_client/service_pb";
+} from "pipecd/web/api_client/service_pb";
 import { Command } from "~/modules/commands";
 import {
   dummyCommand,
diff --git a/pkg/app/web/src/mocks/services/deployment.ts b/web/src/mocks/services/deployment.ts
similarity index 93%
rename from pkg/app/web/src/mocks/services/deployment.ts
rename to web/src/mocks/services/deployment.ts
index cb7a1cbca4..6232feb810 100644
--- a/pkg/app/web/src/mocks/services/deployment.ts
+++ b/web/src/mocks/services/deployment.ts
@@ -1,7 +1,7 @@
 import {
   GetDeploymentResponse,
   ListDeploymentsResponse,
-} from "pipecd/pkg/app/web/api_client/service_pb";
+} from "pipecd/web/api_client/service_pb";
 import {
   createDeploymentFromObject,
   dummyDeployment,
diff --git a/pkg/app/web/src/mocks/services/insight.ts b/web/src/mocks/services/insight.ts
similarity index 94%
rename from pkg/app/web/src/mocks/services/insight.ts
rename to web/src/mocks/services/insight.ts
index 12bee175b5..1582d305c5 100644
--- a/pkg/app/web/src/mocks/services/insight.ts
+++ b/web/src/mocks/services/insight.ts
@@ -2,11 +2,11 @@ import { StatusCode } from "grpc-web";
 import {
   GetInsightDataResponse,
   GetInsightApplicationCountResponse,
-} from "pipecd/pkg/app/web/api_client/service_pb";
+} from "pipecd/web/api_client/service_pb";
 import {
   InsightResultType,
   InsightSampleStream,
-} from "pipecd/pkg/app/web/model/insight_pb";
+} from "pipecd/web/model/insight_pb";
 import {
   dummyApplicationCounts,
   createInsightApplicationCountFromObject,
diff --git a/pkg/app/web/src/mocks/services/live-state.ts b/web/src/mocks/services/live-state.ts
similarity index 94%
rename from pkg/app/web/src/mocks/services/live-state.ts
rename to web/src/mocks/services/live-state.ts
index 81dc076617..3018d9b407 100644
--- a/pkg/app/web/src/mocks/services/live-state.ts
+++ b/web/src/mocks/services/live-state.ts
@@ -1,7 +1,7 @@
 import {
   GetApplicationLiveStateRequest,
   GetApplicationLiveStateResponse,
-} from "pipecd/pkg/app/web/api_client/service_pb";
+} from "pipecd/web/api_client/service_pb";
 import {
   createLiveStateSnapshotFromObject,
   dummyApplicationLiveState,
diff --git a/pkg/app/web/src/mocks/services/me.ts b/web/src/mocks/services/me.ts
similarity index 86%
rename from pkg/app/web/src/mocks/services/me.ts
rename to web/src/mocks/services/me.ts
index 463f65605c..7328d4a86f 100644
--- a/pkg/app/web/src/mocks/services/me.ts
+++ b/web/src/mocks/services/me.ts
@@ -1,4 +1,4 @@
-import { GetMeResponse } from "pipecd/pkg/app/web/api_client/service_pb";
+import { GetMeResponse } from "pipecd/web/api_client/service_pb";
 import { dummyMe } from "~/__fixtures__/dummy-me";
 import { createHandler } from "../create-handler";
 
diff --git a/pkg/app/web/src/mocks/services/piped.ts b/web/src/mocks/services/piped.ts
similarity index 96%
rename from pkg/app/web/src/mocks/services/piped.ts
rename to web/src/mocks/services/piped.ts
index f36dc9d397..10a73e5e3f 100644
--- a/pkg/app/web/src/mocks/services/piped.ts
+++ b/web/src/mocks/services/piped.ts
@@ -4,7 +4,7 @@ import {
   RecreatePipedKeyResponse,
   RegisterPipedResponse,
   DeleteOldPipedKeysResponse,
-} from "pipecd/pkg/app/web/api_client/service_pb";
+} from "pipecd/web/api_client/service_pb";
 import { createPipedFromObject, dummyPiped } from "~/__fixtures__/dummy-piped";
 import { randomKeyHash, randomUUID } from "~/__fixtures__/utils";
 import { createHandler } from "../create-handler";
diff --git a/pkg/app/web/src/mocks/services/project.ts b/web/src/mocks/services/project.ts
similarity index 92%
rename from pkg/app/web/src/mocks/services/project.ts
rename to web/src/mocks/services/project.ts
index 6fd316b412..b037d4e66e 100644
--- a/pkg/app/web/src/mocks/services/project.ts
+++ b/web/src/mocks/services/project.ts
@@ -1,7 +1,7 @@
 import {
   GetProjectResponse,
   UpdateProjectStaticAdminResponse,
-} from "pipecd/pkg/app/web/api_client/service_pb";
+} from "pipecd/web/api_client/service_pb";
 import {
   createProjectFromObject,
   dummyProject,
diff --git a/pkg/app/web/src/mocks/services/stage-log.ts b/web/src/mocks/services/stage-log.ts
similarity index 90%
rename from pkg/app/web/src/mocks/services/stage-log.ts
rename to web/src/mocks/services/stage-log.ts
index 50b6eb7e7a..7a0112ca5d 100644
--- a/pkg/app/web/src/mocks/services/stage-log.ts
+++ b/web/src/mocks/services/stage-log.ts
@@ -1,5 +1,5 @@
 import { StatusCode } from "grpc-web";
-import { GetStageLogResponse } from "pipecd/pkg/app/web/api_client/service_pb";
+import { GetStageLogResponse } from "pipecd/web/api_client/service_pb";
 import {
   createLogBlockFromObject,
   dummyLogBlocks,
diff --git a/pkg/app/web/src/mocks/utils.ts b/web/src/mocks/utils.ts
similarity index 100%
rename from pkg/app/web/src/mocks/utils.ts
rename to web/src/mocks/utils.ts
diff --git a/pkg/app/web/src/modules/active-stage/index.test.ts b/web/src/modules/active-stage/index.test.ts
similarity index 100%
rename from pkg/app/web/src/modules/active-stage/index.test.ts
rename to web/src/modules/active-stage/index.test.ts
diff --git a/pkg/app/web/src/modules/active-stage/index.ts b/web/src/modules/active-stage/index.ts
similarity index 100%
rename from pkg/app/web/src/modules/active-stage/index.ts
rename to web/src/modules/active-stage/index.ts
diff --git a/pkg/app/web/src/modules/api-keys/index.test.ts b/web/src/modules/api-keys/index.test.ts
similarity index 100%
rename from pkg/app/web/src/modules/api-keys/index.test.ts
rename to web/src/modules/api-keys/index.test.ts
diff --git a/pkg/app/web/src/modules/api-keys/index.ts b/web/src/modules/api-keys/index.ts
similarity index 95%
rename from pkg/app/web/src/modules/api-keys/index.ts
rename to web/src/modules/api-keys/index.ts
index 954e57ebf8..90f4dbb60a 100644
--- a/pkg/app/web/src/modules/api-keys/index.ts
+++ b/web/src/modules/api-keys/index.ts
@@ -4,7 +4,7 @@ import {
   SerializedError,
   createEntityAdapter,
 } from "@reduxjs/toolkit";
-import { APIKey } from "pipecd/pkg/app/web/model/apikey_pb";
+import { APIKey } from "pipecd/web/model/apikey_pb";
 import * as APIKeysAPI from "~/api/api-keys";
 
 const MODULE_NAME = "apiKeys";
@@ -99,4 +99,4 @@ export const apiKeysSlice = createSlice({
 export const { clearGeneratedKey } = apiKeysSlice.actions;
 export const { selectAll, selectById } = apiKeysAdapter.getSelectors();
 
-export { APIKey } from "pipecd/pkg/app/web/model/apikey_pb";
+export { APIKey } from "pipecd/web/model/apikey_pb";
diff --git a/pkg/app/web/src/modules/application-counts/index.test.ts b/web/src/modules/application-counts/index.test.ts
similarity index 100%
rename from pkg/app/web/src/modules/application-counts/index.test.ts
rename to web/src/modules/application-counts/index.test.ts
diff --git a/pkg/app/web/src/modules/application-counts/index.ts b/web/src/modules/application-counts/index.ts
similarity index 94%
rename from pkg/app/web/src/modules/application-counts/index.ts
rename to web/src/modules/application-counts/index.ts
index f3ea9a715a..33e31c0956 100644
--- a/pkg/app/web/src/modules/application-counts/index.ts
+++ b/web/src/modules/application-counts/index.ts
@@ -3,8 +3,8 @@ import { StatusCode } from "grpc-web";
 import {
   ApplicationActiveStatus,
   ApplicationKind,
-} from "pipecd/pkg/app/web/model/common_pb";
-import { InsightApplicationCountLabelKey } from "pipecd/pkg/app/web/model/insight_pb";
+} from "pipecd/web/model/common_pb";
+import { InsightApplicationCountLabelKey } from "pipecd/web/model/insight_pb";
 import { getApplicationCount } from "~/api/insight";
 import { APPLICATION_ACTIVE_STATUS_NAME } from "~/constants/application-active-status";
 import { APPLICATION_KIND_TEXT } from "~/constants/application-kind";
@@ -104,4 +104,4 @@ export const applicationCountsSlice = createSlice({
 export {
   InsightApplicationCount,
   InsightApplicationCountLabelKey,
-} from "pipecd/pkg/app/web/model/insight_pb";
+} from "pipecd/web/model/insight_pb";
diff --git a/pkg/app/web/src/modules/applications-live-state/index.test.ts b/web/src/modules/applications-live-state/index.test.ts
similarity index 100%
rename from pkg/app/web/src/modules/applications-live-state/index.test.ts
rename to web/src/modules/applications-live-state/index.test.ts
diff --git a/pkg/app/web/src/modules/applications-live-state/index.ts b/web/src/modules/applications-live-state/index.ts
similarity index 95%
rename from pkg/app/web/src/modules/applications-live-state/index.ts
rename to web/src/modules/applications-live-state/index.ts
index 15f0423021..234ba11879 100644
--- a/pkg/app/web/src/modules/applications-live-state/index.ts
+++ b/web/src/modules/applications-live-state/index.ts
@@ -6,7 +6,7 @@ import {
 import {
   ApplicationLiveStateSnapshot,
   KubernetesResourceState,
-} from "pipecd/pkg/app/web/model/application_live_state_pb";
+} from "pipecd/web/model/application_live_state_pb";
 import { getApplicationLiveState } from "~/api/applications";
 
 export type ApplicationLiveState = Required<
@@ -86,4 +86,4 @@ export {
   ApplicationLiveStateSnapshot,
   KubernetesResourceState,
   CloudRunResourceState,
-} from "pipecd/pkg/app/web/model/application_live_state_pb";
+} from "pipecd/web/model/application_live_state_pb";
diff --git a/pkg/app/web/src/modules/applications/index.test.ts b/web/src/modules/applications/index.test.ts
similarity index 100%
rename from pkg/app/web/src/modules/applications/index.test.ts
rename to web/src/modules/applications/index.test.ts
diff --git a/pkg/app/web/src/modules/applications/index.ts b/web/src/modules/applications/index.ts
similarity index 97%
rename from pkg/app/web/src/modules/applications/index.ts
rename to web/src/modules/applications/index.ts
index 71f9408ced..f47e091bfe 100644
--- a/pkg/app/web/src/modules/applications/index.ts
+++ b/web/src/modules/applications/index.ts
@@ -8,12 +8,12 @@ import {
 import {
   Application,
   ApplicationSyncStatus,
-} from "pipecd/pkg/app/web/model/application_pb";
+} from "pipecd/web/model/application_pb";
 import * as applicationsAPI from "~/api/applications";
 import {
   ApplicationGitRepository,
   ApplicationKind,
-} from "pipecd/pkg/app/web/model/common_pb";
+} from "pipecd/web/model/common_pb";
 import { SyncStrategy } from "../deployments";
 import { fetchCommand, CommandStatus, Command } from "../commands";
 import type { AppState } from "~/store";
@@ -241,9 +241,9 @@ export {
   ApplicationSyncState,
   ApplicationSyncStatus,
   ApplicationDeploymentReference,
-} from "pipecd/pkg/app/web/model/application_pb";
+} from "pipecd/web/model/application_pb";
 export {
   ApplicationKind,
   ApplicationActiveStatus,
   ApplicationGitRepository,
-} from "pipecd/pkg/app/web/model/common_pb";
+} from "pipecd/web/model/common_pb";
diff --git a/pkg/app/web/src/modules/commands/index.test.ts b/web/src/modules/commands/index.test.ts
similarity index 100%
rename from pkg/app/web/src/modules/commands/index.test.ts
rename to web/src/modules/commands/index.test.ts
diff --git a/pkg/app/web/src/modules/commands/index.ts b/web/src/modules/commands/index.ts
similarity index 94%
rename from pkg/app/web/src/modules/commands/index.ts
rename to web/src/modules/commands/index.ts
index 77a0ca9fc9..c52d459ba3 100644
--- a/pkg/app/web/src/modules/commands/index.ts
+++ b/web/src/modules/commands/index.ts
@@ -3,7 +3,7 @@ import {
   createEntityAdapter,
   createSlice,
 } from "@reduxjs/toolkit";
-import { Command, CommandStatus } from "pipecd/pkg/app/web/model/command_pb";
+import { Command, CommandStatus } from "pipecd/web/model/command_pb";
 import { getCommand } from "~/api/commands";
 import { PAGE_PATH_DEPLOYMENTS } from "~/constants/path";
 import { findMetadataByKey } from "~/utils/find-metadata-by-key";
@@ -83,4 +83,4 @@ export const commandsSlice = createSlice({
   },
 });
 
-export { CommandStatus, Command } from "pipecd/pkg/app/web/model/command_pb";
+export { CommandStatus, Command } from "pipecd/web/model/command_pb";
diff --git a/pkg/app/web/src/modules/delete-application/index.test.ts b/web/src/modules/delete-application/index.test.ts
similarity index 100%
rename from pkg/app/web/src/modules/delete-application/index.test.ts
rename to web/src/modules/delete-application/index.test.ts
diff --git a/pkg/app/web/src/modules/delete-application/index.ts b/web/src/modules/delete-application/index.ts
similarity index 100%
rename from pkg/app/web/src/modules/delete-application/index.ts
rename to web/src/modules/delete-application/index.ts
diff --git a/pkg/app/web/src/modules/deployment-frequency/index.test.ts b/web/src/modules/deployment-frequency/index.test.ts
similarity index 100%
rename from pkg/app/web/src/modules/deployment-frequency/index.test.ts
rename to web/src/modules/deployment-frequency/index.test.ts
diff --git a/pkg/app/web/src/modules/deployment-frequency/index.ts b/web/src/modules/deployment-frequency/index.ts
similarity index 96%
rename from pkg/app/web/src/modules/deployment-frequency/index.ts
rename to web/src/modules/deployment-frequency/index.ts
index ed13520f97..6affc0f354 100644
--- a/pkg/app/web/src/modules/deployment-frequency/index.ts
+++ b/web/src/modules/deployment-frequency/index.ts
@@ -3,7 +3,7 @@ import type { AppState } from "~/store";
 import { InsightMetricsKind, InsightDataPoint } from "../insight";
 import dayjs from "dayjs";
 import * as InsightAPI from "~/api/insight";
-import { InsightStep } from "pipecd/pkg/app/web/model/insight_pb";
+import { InsightStep } from "pipecd/web/model/insight_pb";
 import { LoadingStatus } from "~/types/module";
 
 const MODULE_NAME = "deploymentFrequency";
diff --git a/pkg/app/web/src/modules/deployments/index.test.ts b/web/src/modules/deployments/index.test.ts
similarity index 100%
rename from pkg/app/web/src/modules/deployments/index.test.ts
rename to web/src/modules/deployments/index.test.ts
diff --git a/pkg/app/web/src/modules/deployments/index.ts b/web/src/modules/deployments/index.ts
similarity index 97%
rename from pkg/app/web/src/modules/deployments/index.ts
rename to web/src/modules/deployments/index.ts
index bc2d30c2e7..8e9c62eaf3 100644
--- a/pkg/app/web/src/modules/deployments/index.ts
+++ b/web/src/modules/deployments/index.ts
@@ -9,12 +9,12 @@ import {
   PipelineStage,
   DeploymentStatus,
   StageStatus,
-} from "pipecd/pkg/app/web/model/deployment_pb";
+} from "pipecd/web/model/deployment_pb";
 import * as deploymentsApi from "~/api/deployments";
 import { fetchCommand, Command, CommandStatus } from "../commands";
 import type { AppState } from "~/store";
 import { LoadingStatus } from "~/types/module";
-import { ListDeploymentsRequest } from "pipecd/pkg/app/web/api_client/service_pb";
+import { ListDeploymentsRequest } from "pipecd/web/api_client/service_pb";
 import { ApplicationKind } from "../applications";
 
 export type Stage = Required<PipelineStage.AsObject>;
@@ -272,11 +272,11 @@ export const selectDeploymentIsCanceling = (id: EntityId) => (
   state: AppState
 ): boolean => (id ? state.deployments.canceling[id] : false);
 
-export { SyncStrategy } from "pipecd/pkg/app/web/model/common_pb";
+export { SyncStrategy } from "pipecd/web/model/common_pb";
 
 export {
   Deployment,
   DeploymentStatus,
   StageStatus,
   PipelineStage,
-} from "pipecd/pkg/app/web/model/deployment_pb";
+} from "pipecd/web/model/deployment_pb";
diff --git a/pkg/app/web/src/modules/events/index.ts b/web/src/modules/events/index.ts
similarity index 95%
rename from pkg/app/web/src/modules/events/index.ts
rename to web/src/modules/events/index.ts
index bba19e95c8..8831ed644b 100644
--- a/pkg/app/web/src/modules/events/index.ts
+++ b/web/src/modules/events/index.ts
@@ -3,11 +3,11 @@ import {
   createEntityAdapter,
   createSlice,
 } from "@reduxjs/toolkit";
-import { Event, EventStatus } from "pipecd/pkg/app/web/model/event_pb";
+import { Event, EventStatus } from "pipecd/web/model/event_pb";
 import * as eventsApi from "~/api/events";
 import type { AppState } from "~/store";
 import { LoadingStatus } from "~/types/module";
-import { ListEventsRequest } from "pipecd/pkg/app/web/api_client/service_pb";
+import { ListEventsRequest } from "pipecd/web/api_client/service_pb";
 
 export type EventStatusKey = keyof typeof EventStatus;
 
@@ -160,4 +160,4 @@ export const {
   selectIds,
 } = eventsAdapter.getSelectors();
 
-export { Event, EventStatus } from "pipecd/pkg/app/web/model/event_pb";
+export { Event, EventStatus } from "pipecd/web/model/event_pb";
diff --git a/pkg/app/web/src/modules/index.ts b/web/src/modules/index.ts
similarity index 100%
rename from pkg/app/web/src/modules/index.ts
rename to web/src/modules/index.ts
diff --git a/pkg/app/web/src/modules/insight/index.test.ts b/web/src/modules/insight/index.test.ts
similarity index 100%
rename from pkg/app/web/src/modules/insight/index.test.ts
rename to web/src/modules/insight/index.test.ts
diff --git a/pkg/app/web/src/modules/insight/index.ts b/web/src/modules/insight/index.ts
similarity index 90%
rename from pkg/app/web/src/modules/insight/index.ts
rename to web/src/modules/insight/index.ts
index 4ace81cedc..71f68b548f 100644
--- a/pkg/app/web/src/modules/insight/index.ts
+++ b/web/src/modules/insight/index.ts
@@ -1,5 +1,5 @@
 import { createSlice, PayloadAction } from "@reduxjs/toolkit";
-import { InsightStep } from "pipecd/pkg/app/web/model/insight_pb";
+import { InsightStep } from "pipecd/web/model/insight_pb";
 import dayjs from "dayjs";
 
 const MODULE_NAME = "insight";
@@ -50,4 +50,4 @@ export {
   InsightMetricsKind,
   InsightStep,
   InsightDataPoint,
-} from "pipecd/pkg/app/web/model/insight_pb";
+} from "pipecd/web/model/insight_pb";
diff --git a/pkg/app/web/src/modules/me/index.test.ts b/web/src/modules/me/index.test.ts
similarity index 100%
rename from pkg/app/web/src/modules/me/index.test.ts
rename to web/src/modules/me/index.test.ts
diff --git a/pkg/app/web/src/modules/me/index.ts b/web/src/modules/me/index.ts
similarity index 88%
rename from pkg/app/web/src/modules/me/index.ts
rename to web/src/modules/me/index.ts
index 1b50aaf179..7cc90fe377 100644
--- a/pkg/app/web/src/modules/me/index.ts
+++ b/web/src/modules/me/index.ts
@@ -1,5 +1,5 @@
 import { createAsyncThunk, createSlice } from "@reduxjs/toolkit";
-import { Role } from "pipecd/pkg/app/web/model/role_pb";
+import { Role } from "pipecd/web/model/role_pb";
 import { getMe } from "~/api/me";
 
 interface Me {
@@ -40,4 +40,4 @@ export const selectProjectName = (state: { me: MeState }): string => {
   return "";
 };
 
-export { Role } from "pipecd/pkg/app/web/model/role_pb";
+export { Role } from "pipecd/web/model/role_pb";
diff --git a/pkg/app/web/src/modules/pipeds/index.test.ts b/web/src/modules/pipeds/index.test.ts
similarity index 100%
rename from pkg/app/web/src/modules/pipeds/index.test.ts
rename to web/src/modules/pipeds/index.test.ts
diff --git a/pkg/app/web/src/modules/pipeds/index.ts b/web/src/modules/pipeds/index.ts
similarity index 96%
rename from pkg/app/web/src/modules/pipeds/index.ts
rename to web/src/modules/pipeds/index.ts
index d5b0a71c24..ffff363f28 100644
--- a/pkg/app/web/src/modules/pipeds/index.ts
+++ b/web/src/modules/pipeds/index.ts
@@ -4,7 +4,7 @@ import {
   createEntityAdapter,
   EntityId,
 } from "@reduxjs/toolkit";
-import { Piped } from "pipecd/pkg/app/web/model/piped_pb";
+import { Piped } from "pipecd/web/model/piped_pb";
 import type { AppState } from "~/store";
 import * as pipedsApi from "~/api/piped";
 
@@ -144,4 +144,4 @@ export const pipedsSlice = createSlice({
 });
 
 export const { clearRegisteredPipedInfo } = pipedsSlice.actions;
-export { Piped, PipedKey } from "pipecd/pkg/app/web/model/piped_pb";
+export { Piped, PipedKey } from "pipecd/web/model/piped_pb";
diff --git a/pkg/app/web/src/modules/project/index.test.ts b/web/src/modules/project/index.test.ts
similarity index 100%
rename from pkg/app/web/src/modules/project/index.test.ts
rename to web/src/modules/project/index.test.ts
diff --git a/pkg/app/web/src/modules/project/index.ts b/web/src/modules/project/index.ts
similarity index 97%
rename from pkg/app/web/src/modules/project/index.ts
rename to web/src/modules/project/index.ts
index 59a0130ef8..7f094ac1d8 100644
--- a/pkg/app/web/src/modules/project/index.ts
+++ b/web/src/modules/project/index.ts
@@ -2,7 +2,7 @@ import { createAsyncThunk, createSlice } from "@reduxjs/toolkit";
 import {
   ProjectRBACConfig,
   ProjectSSOConfig,
-} from "pipecd/pkg/app/web/model/project_pb";
+} from "pipecd/web/model/project_pb";
 import * as projectAPI from "~/api/project";
 import type { AppState } from "~/store";
 
@@ -141,4 +141,4 @@ export const projectSlice = createSlice({
   },
 });
 
-export { ProjectSSOConfig } from "pipecd/pkg/app/web/model/project_pb";
+export { ProjectSSOConfig } from "pipecd/web/model/project_pb";
diff --git a/pkg/app/web/src/modules/sealed-secret/index.test.ts b/web/src/modules/sealed-secret/index.test.ts
similarity index 100%
rename from pkg/app/web/src/modules/sealed-secret/index.test.ts
rename to web/src/modules/sealed-secret/index.test.ts
diff --git a/pkg/app/web/src/modules/sealed-secret/index.ts b/web/src/modules/sealed-secret/index.ts
similarity index 100%
rename from pkg/app/web/src/modules/sealed-secret/index.ts
rename to web/src/modules/sealed-secret/index.ts
diff --git a/pkg/app/web/src/modules/stage-logs/index.test.ts b/web/src/modules/stage-logs/index.test.ts
similarity index 100%
rename from pkg/app/web/src/modules/stage-logs/index.test.ts
rename to web/src/modules/stage-logs/index.test.ts
diff --git a/pkg/app/web/src/modules/stage-logs/index.ts b/web/src/modules/stage-logs/index.ts
similarity index 95%
rename from pkg/app/web/src/modules/stage-logs/index.ts
rename to web/src/modules/stage-logs/index.ts
index ff91c4467b..518d446037 100644
--- a/pkg/app/web/src/modules/stage-logs/index.ts
+++ b/web/src/modules/stage-logs/index.ts
@@ -1,5 +1,5 @@
 import { createSlice, createAsyncThunk } from "@reduxjs/toolkit";
-import { LogBlock } from "pipecd/pkg/app/web/model/logblock_pb";
+import { LogBlock } from "pipecd/web/model/logblock_pb";
 import { getStageLog } from "~/api/stage-log";
 import {
   selectById as selectDeploymentById,
@@ -121,4 +121,4 @@ export const selectStageLogById = (
   return state[createActiveStageKey(props)];
 };
 
-export { LogBlock, LogSeverity } from "pipecd/pkg/app/web/model/logblock_pb";
+export { LogBlock, LogSeverity } from "pipecd/web/model/logblock_pb";
diff --git a/pkg/app/web/src/modules/toasts/index.test.ts b/web/src/modules/toasts/index.test.ts
similarity index 100%
rename from pkg/app/web/src/modules/toasts/index.test.ts
rename to web/src/modules/toasts/index.test.ts
diff --git a/pkg/app/web/src/modules/toasts/index.ts b/web/src/modules/toasts/index.ts
similarity index 100%
rename from pkg/app/web/src/modules/toasts/index.ts
rename to web/src/modules/toasts/index.ts
diff --git a/pkg/app/web/src/modules/unregistered-applications/index.ts b/web/src/modules/unregistered-applications/index.ts
similarity index 89%
rename from pkg/app/web/src/modules/unregistered-applications/index.ts
rename to web/src/modules/unregistered-applications/index.ts
index 5fd2bee2a2..e601f09679 100644
--- a/pkg/app/web/src/modules/unregistered-applications/index.ts
+++ b/web/src/modules/unregistered-applications/index.ts
@@ -3,7 +3,7 @@ import {
   createSlice,
   createEntityAdapter,
 } from "@reduxjs/toolkit";
-import { ApplicationInfo } from "pipecd/pkg/app/web/model/common_pb";
+import { ApplicationInfo } from "pipecd/web/model/common_pb";
 import type { AppState } from "~/store";
 import * as applicationsAPI from "~/api/applications";
 
@@ -28,7 +28,7 @@ export const fetchUnregisteredApplications = createAsyncThunk<
   return applicationsList as ApplicationInfo.AsObject[];
 });
 
-export { ApplicationInfo } from "pipecd/pkg/app/web/model/common_pb";
+export { ApplicationInfo } from "pipecd/web/model/common_pb";
 
 export const unregisteredApplicationsSlice = createSlice({
   name: MODULE_NAME,
diff --git a/pkg/app/web/src/modules/update-application/index.test.ts b/web/src/modules/update-application/index.test.ts
similarity index 100%
rename from pkg/app/web/src/modules/update-application/index.test.ts
rename to web/src/modules/update-application/index.test.ts
diff --git a/pkg/app/web/src/modules/update-application/index.ts b/web/src/modules/update-application/index.ts
similarity index 95%
rename from pkg/app/web/src/modules/update-application/index.ts
rename to web/src/modules/update-application/index.ts
index d132f2fede..c7bf180d22 100644
--- a/pkg/app/web/src/modules/update-application/index.ts
+++ b/web/src/modules/update-application/index.ts
@@ -1,5 +1,5 @@
 import { createAsyncThunk, createSlice, PayloadAction } from "@reduxjs/toolkit";
-import { ApplicationGitRepository } from "pipecd/pkg/app/web/model/common_pb";
+import { ApplicationGitRepository } from "pipecd/web/model/common_pb";
 import * as applicationAPI from "~/api/applications";
 import { ApplicationKind } from "../applications";
 
diff --git a/pkg/app/web/src/routes.test.tsx b/web/src/routes.test.tsx
similarity index 92%
rename from pkg/app/web/src/routes.test.tsx
rename to web/src/routes.test.tsx
index 8a5f28fda5..3fa59463ee 100644
--- a/pkg/app/web/src/routes.test.tsx
+++ b/web/src/routes.test.tsx
@@ -1,6 +1,6 @@
 import { waitFor } from "@testing-library/react";
 import { setupServer } from "msw/node";
-import { GetMeResponse } from "pipecd/pkg/app/web/api_client/service_pb";
+import { GetMeResponse } from "pipecd/web/api_client/service_pb";
 import { MemoryRouter } from "react-router-dom";
 import { createHandler } from "~/mocks/create-handler";
 import { render, screen } from "~~/test-utils";
diff --git a/pkg/app/web/src/routes.tsx b/web/src/routes.tsx
similarity index 100%
rename from pkg/app/web/src/routes.tsx
rename to web/src/routes.tsx
diff --git a/pkg/app/web/src/store.ts b/web/src/store.ts
similarity index 100%
rename from pkg/app/web/src/store.ts
rename to web/src/store.ts
diff --git a/pkg/app/web/src/styles/button.ts b/web/src/styles/button.ts
similarity index 100%
rename from pkg/app/web/src/styles/button.ts
rename to web/src/styles/button.ts
diff --git a/pkg/app/web/src/styles/project-setting.ts b/web/src/styles/project-setting.ts
similarity index 100%
rename from pkg/app/web/src/styles/project-setting.ts
rename to web/src/styles/project-setting.ts
diff --git a/pkg/app/web/src/styles/text.ts b/web/src/styles/text.ts
similarity index 100%
rename from pkg/app/web/src/styles/text.ts
rename to web/src/styles/text.ts
diff --git a/pkg/app/web/src/theme.ts b/web/src/theme.ts
similarity index 100%
rename from pkg/app/web/src/theme.ts
rename to web/src/theme.ts
diff --git a/pkg/app/web/src/types/module.ts b/web/src/types/module.ts
similarity index 100%
rename from pkg/app/web/src/types/module.ts
rename to web/src/types/module.ts
diff --git a/pkg/app/web/src/utils/__snapshots__/parse-log.test.ts.snap b/web/src/utils/__snapshots__/parse-log.test.ts.snap
similarity index 100%
rename from pkg/app/web/src/utils/__snapshots__/parse-log.test.ts.snap
rename to web/src/utils/__snapshots__/parse-log.test.ts.snap
diff --git a/pkg/app/web/src/utils/find-metadata-by-key.test.ts b/web/src/utils/find-metadata-by-key.test.ts
similarity index 100%
rename from pkg/app/web/src/utils/find-metadata-by-key.test.ts
rename to web/src/utils/find-metadata-by-key.test.ts
diff --git a/pkg/app/web/src/utils/find-metadata-by-key.ts b/web/src/utils/find-metadata-by-key.ts
similarity index 100%
rename from pkg/app/web/src/utils/find-metadata-by-key.ts
rename to web/src/utils/find-metadata-by-key.ts
diff --git a/pkg/app/web/src/utils/parse-log.test.ts b/web/src/utils/parse-log.test.ts
similarity index 100%
rename from pkg/app/web/src/utils/parse-log.test.ts
rename to web/src/utils/parse-log.test.ts
diff --git a/pkg/app/web/src/utils/parse-log.ts b/web/src/utils/parse-log.ts
similarity index 100%
rename from pkg/app/web/src/utils/parse-log.ts
rename to web/src/utils/parse-log.ts
diff --git a/pkg/app/web/src/utils/search-params.ts b/web/src/utils/search-params.ts
similarity index 100%
rename from pkg/app/web/src/utils/search-params.ts
rename to web/src/utils/search-params.ts
diff --git a/pkg/app/web/src/utils/setup-dayjs.ts b/web/src/utils/setup-dayjs.ts
similarity index 100%
rename from pkg/app/web/src/utils/setup-dayjs.ts
rename to web/src/utils/setup-dayjs.ts
diff --git a/pkg/app/web/src/utils/unique-array.test.ts b/web/src/utils/unique-array.test.ts
similarity index 100%
rename from pkg/app/web/src/utils/unique-array.test.ts
rename to web/src/utils/unique-array.test.ts
diff --git a/pkg/app/web/src/utils/unique-array.ts b/web/src/utils/unique-array.ts
similarity index 100%
rename from pkg/app/web/src/utils/unique-array.ts
rename to web/src/utils/unique-array.ts
diff --git a/pkg/app/web/test-utils/index.tsx b/web/test-utils/index.tsx
similarity index 100%
rename from pkg/app/web/test-utils/index.tsx
rename to web/test-utils/index.tsx
diff --git a/pkg/app/web/tsconfig.json b/web/tsconfig.json
similarity index 57%
rename from pkg/app/web/tsconfig.json
rename to web/tsconfig.json
index bcced65733..2f46813dc6 100644
--- a/pkg/app/web/tsconfig.json
+++ b/web/tsconfig.json
@@ -8,13 +8,13 @@
         "./*"
       ],
       "pipecd/*": [
-        "../../../bazel-out/darwin-fastbuild/bin/*",
-        "../../../bazel-out/darwin_arm64-fastbuild/bin/*",
-        "../../../bazel-out/k8-fastbuild/bin/*",
-        "../../../bazel-out/x64_windows-fastbuild/bin/*",
-        "../../../bazel-out/darwin-dbg/bin/*",
-        "../../../bazel-out/k8-dbg/bin/*",
-        "../../../bazel-out/x64_windows-dbg/bin/*"
+        "../bazel-out/darwin-fastbuild/bin/*",
+        "../bazel-out/darwin_arm64-fastbuild/bin/*",
+        "../bazel-out/k8-fastbuild/bin/*",
+        "../bazel-out/x64_windows-fastbuild/bin/*",
+        "../bazel-out/darwin-dbg/bin/*",
+        "../bazel-out/k8-dbg/bin/*",
+        "../bazel-out/x64_windows-dbg/bin/*"
       ]
     },
     "allowUnreachableCode": false,
@@ -41,13 +41,13 @@
     "esModuleInterop": true,
     "rootDirs": [
       ".",
-      "../../../bazel-out/darwin-fastbuild/bin",
-      "../../../bazel-out/darwin_arm64-fastbuild/bin",
-      "../../../bazel-out/k8-fastbuild/bin",
-      "../../../bazel-out/x64_windows-fastbuild/bin",
-      "../../../bazel-out/darwin-dbg/bin",
-      "../../../bazel-out/k8-dbg/bin",
-      "../../../bazel-out/x64_windows-dbg/bin"
+      "../bazel-out/darwin-fastbuild/bin",
+      "../bazel-out/darwin_arm64-fastbuild/bin",
+      "../bazel-out/k8-fastbuild/bin",
+      "../bazel-out/x64_windows-fastbuild/bin",
+      "../bazel-out/darwin-dbg/bin",
+      "../bazel-out/k8-dbg/bin",
+      "../bazel-out/x64_windows-dbg/bin"
     ],
     "declaration": true
   },
diff --git a/pkg/app/web/webpack.common.js b/web/webpack.common.js
similarity index 100%
rename from pkg/app/web/webpack.common.js
rename to web/webpack.common.js
diff --git a/pkg/app/web/webpack.config.dev.js b/web/webpack.config.dev.js
similarity index 96%
rename from pkg/app/web/webpack.config.dev.js
rename to web/webpack.config.dev.js
index ddeb667c13..f92760fd75 100644
--- a/pkg/app/web/webpack.config.dev.js
+++ b/web/webpack.config.dev.js
@@ -17,7 +17,7 @@ module.exports = (env) =>
     resolve: {
       extensions: [".mjs", ".ts", ".tsx", ".js"],
       alias: {
-        pipecd: path.resolve(__dirname, "../../../bazel-bin/"),
+        pipecd: path.resolve(__dirname, "../bazel-bin/"),
         "~": path.resolve(__dirname, "src"),
         "~~": path.resolve(__dirname),
       },
diff --git a/pkg/app/web/webpack.config.js b/web/webpack.config.js
similarity index 86%
rename from pkg/app/web/webpack.config.js
rename to web/webpack.config.js
index 34054e0fb3..6f1f092137 100644
--- a/pkg/app/web/webpack.config.js
+++ b/web/webpack.config.js
@@ -14,8 +14,8 @@ module.exports = (env) => {
       extensions: [".mjs", ".js", ".jsx"],
       alias: {
         pipecd: path.resolve(env.bazelBinPath),
-        "~": path.resolve(env.bazelBinPath, "pkg/app/web/src"),
-        "~~": path.resolve(env.bazelBinPath, "pkg/app/web"),
+        "~": path.resolve(env.bazelBinPath, "web/src"),
+        "~~": path.resolve(env.bazelBinPath, "web"),
       },
     },
     module: {
diff --git a/pkg/app/web/yarn.lock b/web/yarn.lock
similarity index 100%
rename from pkg/app/web/yarn.lock
rename to web/yarn.lock