diff --git a/routers/repo/webhook.go b/routers/repo/webhook.go
index 6ea4548d5..506acec76 100644
--- a/routers/repo/webhook.go
+++ b/routers/repo/webhook.go
@@ -23,8 +23,8 @@ import (
 )
 
 const (
-	WEBHOOKS        base.TplName = "repo/settings/webhooks"
-	WEBHOOK_NEW     base.TplName = "repo/settings/webhook_new"
+	WEBHOOKS        base.TplName = "repo/settings/webhook/base"
+	WEBHOOK_NEW     base.TplName = "repo/settings/webhook/new"
 	ORG_WEBHOOK_NEW base.TplName = "org/settings/webhook_new"
 )
 
diff --git a/templates/org/settings/webhook_new.tmpl b/templates/org/settings/webhook_new.tmpl
index fddfb87e6..d9a6b1560 100644
--- a/templates/org/settings/webhook_new.tmpl
+++ b/templates/org/settings/webhook_new.tmpl
@@ -17,12 +17,12 @@
 					</div>
 				</h4>
 				<div class="ui attached segment">
-					{{template "repo/settings/webhook_gogs" .}}
-					{{template "repo/settings/webhook_slack" .}}
-					{{template "repo/settings/webhook_discord" .}}
+					{{template "repo/settings/webhook/gogs" .}}
+					{{template "repo/settings/webhook/slack" .}}
+					{{template "repo/settings/webhook/discord" .}}
 				</div>
 
-				{{template "repo/settings/webhook_history" .}}
+				{{template "repo/settings/webhook/history" .}}
 			</div>
 		</div>
 	</div>
diff --git a/templates/org/settings/webhooks.tmpl b/templates/org/settings/webhooks.tmpl
index 0d32f95b5..283a06004 100644
--- a/templates/org/settings/webhooks.tmpl
+++ b/templates/org/settings/webhooks.tmpl
@@ -4,7 +4,7 @@
 	<div class="ui container">
 		<div class="ui grid">
 			{{template "org/settings/navbar" .}}
-			{{template "repo/settings/webhook_list" .}}
+			{{template "repo/settings/webhook/list" .}}
 		</div>
 	</div>
 </div>
diff --git a/templates/repo/settings/webhooks.tmpl b/templates/repo/settings/webhook/base.tmpl
similarity index 83%
rename from templates/repo/settings/webhooks.tmpl
rename to templates/repo/settings/webhook/base.tmpl
index fd3ea349c..b45a62226 100644
--- a/templates/repo/settings/webhooks.tmpl
+++ b/templates/repo/settings/webhook/base.tmpl
@@ -4,7 +4,7 @@
 	<div class="ui container">
 		<div class="ui grid">
 			{{template "repo/settings/navbar" .}}
-			{{template "repo/settings/webhook_list" .}}
+			{{template "repo/settings/webhook/list" .}}
 		</div>
 	</div>
 </div>
diff --git a/templates/repo/settings/webhook_delete_modal.tmpl b/templates/repo/settings/webhook/delete_modal.tmpl
similarity index 100%
rename from templates/repo/settings/webhook_delete_modal.tmpl
rename to templates/repo/settings/webhook/delete_modal.tmpl
diff --git a/templates/repo/settings/webhook_discord.tmpl b/templates/repo/settings/webhook/discord.tmpl
similarity index 96%
rename from templates/repo/settings/webhook_discord.tmpl
rename to templates/repo/settings/webhook/discord.tmpl
index bcf184b1d..e1253b97f 100644
--- a/templates/repo/settings/webhook_discord.tmpl
+++ b/templates/repo/settings/webhook/discord.tmpl
@@ -19,6 +19,6 @@
 			<label for="color">{{.i18n.Tr "repo.settings.slack_color"}}</label>
 			<input id="color" name="color" value="{{.SlackHook.Color}}" placeholder="e.g. #dd4b39">
 		</div>
-		{{template "repo/settings/webhook_settings" .}}
+		{{template "repo/settings/webhook/settings" .}}
 	</form>
 {{end}}
diff --git a/templates/repo/settings/webhook_gogs.tmpl b/templates/repo/settings/webhook/gogs.tmpl
similarity index 96%
rename from templates/repo/settings/webhook_gogs.tmpl
rename to templates/repo/settings/webhook/gogs.tmpl
index baf0f9e0b..368f3a22f 100644
--- a/templates/repo/settings/webhook_gogs.tmpl
+++ b/templates/repo/settings/webhook/gogs.tmpl
@@ -24,6 +24,6 @@
 			<input id="secret" name="secret" type="password" value="{{.Webhook.Secret}}" autocomplete="off">
 			<p class="text grey desc">{{.i18n.Tr "repo.settings.secret_desc" | Safe}}</p>
 		</div>
-		{{template "repo/settings/webhook_settings" .}}
+		{{template "repo/settings/webhook/settings" .}}
 	</form>
 {{end}}
diff --git a/templates/repo/settings/webhook_history.tmpl b/templates/repo/settings/webhook/history.tmpl
similarity index 100%
rename from templates/repo/settings/webhook_history.tmpl
rename to templates/repo/settings/webhook/history.tmpl
diff --git a/templates/repo/settings/webhook_list.tmpl b/templates/repo/settings/webhook/list.tmpl
similarity index 97%
rename from templates/repo/settings/webhook_list.tmpl
rename to templates/repo/settings/webhook/list.tmpl
index 9fbd0032a..3599172d7 100644
--- a/templates/repo/settings/webhook_list.tmpl
+++ b/templates/repo/settings/webhook/list.tmpl
@@ -52,4 +52,4 @@
 	</div>
 </div>
 
-{{template "repo/settings/webhook_delete_modal" .}}
+{{template "repo/settings/webhook/delete_modal" .}}
diff --git a/templates/repo/settings/webhook_new.tmpl b/templates/repo/settings/webhook/new.tmpl
similarity index 79%
rename from templates/repo/settings/webhook_new.tmpl
rename to templates/repo/settings/webhook/new.tmpl
index a2a420a4d..f7e23631a 100644
--- a/templates/repo/settings/webhook_new.tmpl
+++ b/templates/repo/settings/webhook/new.tmpl
@@ -17,12 +17,12 @@
 					</div>
 				</h4>
 				<div class="ui attached segment">
-					{{template "repo/settings/webhook_gogs" .}}
-					{{template "repo/settings/webhook_slack" .}}
-					{{template "repo/settings/webhook_discord" .}}
+					{{template "repo/settings/webhook/gogs" .}}
+					{{template "repo/settings/webhook/slack" .}}
+					{{template "repo/settings/webhook/discord" .}}
 				</div>
 
-				{{template "repo/settings/webhook_history" .}}
+				{{template "repo/settings/webhook/history" .}}
 			</div>
 		</div>
 	</div>
diff --git a/templates/repo/settings/webhook_settings.tmpl b/templates/repo/settings/webhook/settings.tmpl
similarity index 98%
rename from templates/repo/settings/webhook_settings.tmpl
rename to templates/repo/settings/webhook/settings.tmpl
index 235d73c31..2e57338d4 100644
--- a/templates/repo/settings/webhook_settings.tmpl
+++ b/templates/repo/settings/webhook/settings.tmpl
@@ -123,4 +123,4 @@
 	{{end}}
 </div>
 
-{{template "repo/settings/webhook_delete_modal" .}}
+{{template "repo/settings/webhook/delete_modal" .}}
diff --git a/templates/repo/settings/webhook_slack.tmpl b/templates/repo/settings/webhook/slack.tmpl
similarity index 96%
rename from templates/repo/settings/webhook_slack.tmpl
rename to templates/repo/settings/webhook/slack.tmpl
index 5a68d8239..63255f2b2 100644
--- a/templates/repo/settings/webhook_slack.tmpl
+++ b/templates/repo/settings/webhook/slack.tmpl
@@ -23,6 +23,6 @@
 			<label for="color">{{.i18n.Tr "repo.settings.slack_color"}}</label>
 			<input id="color" name="color" value="{{.SlackHook.Color}}" placeholder="e.g. #dd4b39, good, warning, danger">
 		</div>
-		{{template "repo/settings/webhook_settings" .}}
+		{{template "repo/settings/webhook/settings" .}}
 	</form>
 {{end}}