diff --git a/cmd/doctor.go b/cmd/doctor.go
index f891b12608..e433f4adc5 100644
--- a/cmd/doctor.go
+++ b/cmd/doctor.go
@@ -15,9 +15,9 @@ import (
 	"code.gitea.io/gitea/models/migrations"
 	migrate_base "code.gitea.io/gitea/models/migrations/base"
 	"code.gitea.io/gitea/modules/container"
-	"code.gitea.io/gitea/modules/doctor"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/services/doctor"
 
 	"github.com/urfave/cli/v2"
 	"xorm.io/xorm"
diff --git a/cmd/doctor_test.go b/cmd/doctor_test.go
index 75376a567e..3e1ff299c5 100644
--- a/cmd/doctor_test.go
+++ b/cmd/doctor_test.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"testing"
 
-	"code.gitea.io/gitea/modules/doctor"
 	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/services/doctor"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/urfave/cli/v2"
diff --git a/modules/doctor/authorizedkeys.go b/services/doctor/authorizedkeys.go
similarity index 100%
rename from modules/doctor/authorizedkeys.go
rename to services/doctor/authorizedkeys.go
diff --git a/modules/doctor/breaking.go b/services/doctor/breaking.go
similarity index 100%
rename from modules/doctor/breaking.go
rename to services/doctor/breaking.go
diff --git a/modules/doctor/checkOldArchives.go b/services/doctor/checkOldArchives.go
similarity index 100%
rename from modules/doctor/checkOldArchives.go
rename to services/doctor/checkOldArchives.go
diff --git a/modules/doctor/dbconsistency.go b/services/doctor/dbconsistency.go
similarity index 100%
rename from modules/doctor/dbconsistency.go
rename to services/doctor/dbconsistency.go
diff --git a/modules/doctor/dbversion.go b/services/doctor/dbversion.go
similarity index 100%
rename from modules/doctor/dbversion.go
rename to services/doctor/dbversion.go
diff --git a/modules/doctor/doctor.go b/services/doctor/doctor.go
similarity index 100%
rename from modules/doctor/doctor.go
rename to services/doctor/doctor.go
diff --git a/modules/doctor/fix16961.go b/services/doctor/fix16961.go
similarity index 100%
rename from modules/doctor/fix16961.go
rename to services/doctor/fix16961.go
diff --git a/modules/doctor/fix16961_test.go b/services/doctor/fix16961_test.go
similarity index 100%
rename from modules/doctor/fix16961_test.go
rename to services/doctor/fix16961_test.go
diff --git a/modules/doctor/fix8312.go b/services/doctor/fix8312.go
similarity index 100%
rename from modules/doctor/fix8312.go
rename to services/doctor/fix8312.go
diff --git a/modules/doctor/heads.go b/services/doctor/heads.go
similarity index 100%
rename from modules/doctor/heads.go
rename to services/doctor/heads.go
diff --git a/modules/doctor/lfs.go b/services/doctor/lfs.go
similarity index 100%
rename from modules/doctor/lfs.go
rename to services/doctor/lfs.go
diff --git a/modules/doctor/mergebase.go b/services/doctor/mergebase.go
similarity index 100%
rename from modules/doctor/mergebase.go
rename to services/doctor/mergebase.go
diff --git a/modules/doctor/misc.go b/services/doctor/misc.go
similarity index 100%
rename from modules/doctor/misc.go
rename to services/doctor/misc.go
diff --git a/modules/doctor/paths.go b/services/doctor/paths.go
similarity index 100%
rename from modules/doctor/paths.go
rename to services/doctor/paths.go
diff --git a/modules/doctor/repository.go b/services/doctor/repository.go
similarity index 100%
rename from modules/doctor/repository.go
rename to services/doctor/repository.go
diff --git a/modules/doctor/storage.go b/services/doctor/storage.go
similarity index 100%
rename from modules/doctor/storage.go
rename to services/doctor/storage.go
diff --git a/modules/doctor/usertype.go b/services/doctor/usertype.go
similarity index 100%
rename from modules/doctor/usertype.go
rename to services/doctor/usertype.go