diff --git a/configs/queries/company-search/params.json b/configs/queries/company-search/params.json
deleted file mode 100644
index 1b14d251b4a..00000000000
--- a/configs/queries/company-search/params.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "cacheHours": 1,
-  "params": [
-    {
-      "name": "keyword",
-      "replaces": "PingCAP",
-      "pattern": "^[^()\"'%_]+$"
-    }
-  ]
-}
diff --git a/configs/queries/company-search/template.sql b/configs/queries/company-search/template.sql
deleted file mode 100644
index 834adacfbc4..00000000000
--- a/configs/queries/company-search/template.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-WITH company_ci AS (
-    SELECT gu.organization AS company, COUNT(1) AS cnt
-    FROM github_users gu
-    WHERE
-        gu.organization LIKE CONCAT('%', 'PingCAP', '%')
-    GROUP BY company
-)
-SELECT
-    TRIM(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(company, 'www.', ''), '.com', ''), '!', ''), ',', ''), '-', ''), '@', ''), '.', ''), 'ltd', ''), 'inc', ''), 'corporation', '')) AS `name`,
-    SUM(cnt) AS total
-FROM company_ci
-GROUP BY `name`
-ORDER BY total DESC
-LIMIT 10
\ No newline at end of file
diff --git a/packages/api-server/__tests__/queries.ts b/packages/api-server/__tests__/queries.ts
index a8165317a9d..7b791a77086 100644
--- a/packages/api-server/__tests__/queries.ts
+++ b/packages/api-server/__tests__/queries.ts
@@ -1,6 +1,6 @@
 import { buildParams, eachQuery } from './helpers/queries';
 import { QueryParser } from '../src/core/runner/query/QueryParser';
-import { CollectionService } from '../src/services/collection-service';
+import { CollectionService } from '../src/plugins/services/collection-service';
 import { testLogger } from './helpers/log';
 import CacheBuilder from '../src/core/cache/CacheBuilder';
 import {TiDBQueryExecutor} from "../src/core/executor/query-executor/TiDBQueryExecutor";
diff --git a/packages/api-server/__tests__/services/collection-service.ts b/packages/api-server/__tests__/services/collection-service.ts
index 85f734f5873..d1ef37b413e 100644
--- a/packages/api-server/__tests__/services/collection-service.ts
+++ b/packages/api-server/__tests__/services/collection-service.ts
@@ -1,5 +1,5 @@
 import {bootstrapTestDatabase, getTestDatabase, releaseTestDatabase} from '../helpers/db';
-import { CollectionService } from '../../src/services/collection-service';
+import { CollectionService } from '../../src/plugins/services/collection-service';
 import { testLogger } from '../helpers/log';
 import CacheBuilder from '../../src/core/cache/CacheBuilder';
 import {getConnection, getConnectionOptions} from "../../src/core/db/new";
diff --git a/packages/api-server/__tests__/services/repo-service.ts b/packages/api-server/__tests__/services/repo-service.ts
index 06dd70764c7..7b5b271f8b5 100644
--- a/packages/api-server/__tests__/services/repo-service.ts
+++ b/packages/api-server/__tests__/services/repo-service.ts
@@ -1,7 +1,7 @@
 import {bootstrapTestDatabase, releaseTestDatabase, TiDBDatabase} from '../helpers/db';
 import {bootstrapApp, StartedApp} from '../helpers/app';
-import '../../src/services/repo-service';
-import {RepoService, SubscribedRepo} from "../../src/services/repo-service";
+import '../../src/plugins/services/repo-service';
+import {RepoService, SubscribedRepo} from "../../src/plugins/services/repo-service";
 import {Connection} from "mysql2/promise";
 import {APIError} from "../../src/utils/error";
 
diff --git a/packages/api-server/__tests__/services/stats-service.ts b/packages/api-server/__tests__/services/stats-service.ts
index f0f13892f95..df6bfee4c16 100644
--- a/packages/api-server/__tests__/services/stats-service.ts
+++ b/packages/api-server/__tests__/services/stats-service.ts
@@ -1,5 +1,5 @@
 import { bootstrapTestDatabase, getTestDatabase, releaseTestDatabase } from '../helpers/db';
-import { StatsService } from '../../src/services/stats-service';
+import { StatsService } from '../../src/plugins/services/stats-service';
 import { testLogger } from '../helpers/log';
 import {getPool} from "../../src/core/db/new";
 
diff --git a/packages/api-server/__tests__/services/user-service.ts b/packages/api-server/__tests__/services/user-service.ts
index 3ec1c112180..11f6d533fe3 100644
--- a/packages/api-server/__tests__/services/user-service.ts
+++ b/packages/api-server/__tests__/services/user-service.ts
@@ -1,7 +1,7 @@
 import {bootstrapTestDatabase, getTestDatabase, releaseTestDatabase} from '../helpers/db';
 import {bootstrapApp, getTestApp, releaseApp} from '../helpers/app';
 import {Connection, ResultSetHeader} from "mysql2/promise";
-import {ProviderType, UserRole, UserService} from "../../src/services/user-service";
+import {ProviderType, UserRole, UserService} from "../../src/plugins/services/user-service";
 
 let userService: UserService, conn: Connection;
 
diff --git a/packages/api-server/src/app.ts b/packages/api-server/src/app.ts
index 118d92f5add..e84d3fc49a8 100644
--- a/packages/api-server/src/app.ts
+++ b/packages/api-server/src/app.ts
@@ -90,12 +90,6 @@ const app: FastifyPluginAsync<AppOptions, RawServerDefault, JsonSchemaToTsProvid
     options: opts
   })
 
-  // This loads all plugins defined in services.
-  void fastify.register(AutoLoad, {
-    dir: join(__dirname, 'services'),
-    options: opts
-  })
-
   // This loads all plugins defined in routes
   // define your routes in one of these.
   await fastify.register(AutoLoad, {
diff --git a/packages/api-server/src/core/runner/query/QueryParser.ts b/packages/api-server/src/core/runner/query/QueryParser.ts
index 343dae4efec..d6730f1c4a3 100644
--- a/packages/api-server/src/core/runner/query/QueryParser.ts
+++ b/packages/api-server/src/core/runner/query/QueryParser.ts
@@ -1,4 +1,4 @@
-import { CollectionService } from "../../../services/collection-service";
+import { CollectionService } from "../../../plugins/services/collection-service";
 import { QuerySchema } from "../../../types/query.schema";
 
 export enum ParamType {
diff --git a/packages/api-server/src/plugins/auth/github.ts b/packages/api-server/src/plugins/auth/github.ts
index 6690f7268a5..6a0b7d123eb 100644
--- a/packages/api-server/src/plugins/auth/github.ts
+++ b/packages/api-server/src/plugins/auth/github.ts
@@ -12,7 +12,7 @@ import fastifyOauth2, {FastifyOAuth2Options, OAuth2Namespace} from '@fastify/oau
 import {DateTime} from 'luxon';
 import fastifyCookie from "@fastify/cookie";
 import fp from 'fastify-plugin';
-import {ProviderType, UserProfile, UserRole} from "../../services/user-service";
+import {ProviderType, UserProfile, UserRole} from "../services/user-service";
 import {APIError} from "../../utils/error";
 import {getOctokit} from "../../utils/loger";
 
diff --git a/packages/api-server/src/plugins/runner/query/index.ts b/packages/api-server/src/plugins/runner/query/index.ts
index 8da5d37da0b..b00cf8c087c 100644
--- a/packages/api-server/src/plugins/runner/query/index.ts
+++ b/packages/api-server/src/plugins/runner/query/index.ts
@@ -14,7 +14,8 @@ export default fp(async (app) => {
     dependencies: [
         '@fastify/env',
         'tidb-query-executor',
-        'cache-builder'
+        'cache-builder',
+        'collection-service'
     ],
 });
 
diff --git a/packages/api-server/src/services/bot-service/index.ts b/packages/api-server/src/plugins/services/bot-service/index.ts
similarity index 100%
rename from packages/api-server/src/services/bot-service/index.ts
rename to packages/api-server/src/plugins/services/bot-service/index.ts
diff --git a/packages/api-server/src/services/collection-service/index.ts b/packages/api-server/src/plugins/services/collection-service/index.ts
similarity index 93%
rename from packages/api-server/src/services/collection-service/index.ts
rename to packages/api-server/src/plugins/services/collection-service/index.ts
index 0714db959de..485f51cc305 100644
--- a/packages/api-server/src/services/collection-service/index.ts
+++ b/packages/api-server/src/plugins/services/collection-service/index.ts
@@ -1,12 +1,12 @@
-import CacheBuilder, { CacheProviderTypes } from "../../core/cache/CacheBuilder";
+import CacheBuilder, { CacheProviderTypes } from "../../../core/cache/CacheBuilder";
 
-import { CachedData } from "../../core/cache/Cache";
+import { CachedData } from "../../../core/cache/Cache";
 import { DateTime } from "luxon";
 import { RowDataPacket } from "mysql2/promise";
-import { TiDBQueryExecutor } from "../../core/executor/query-executor/TiDBQueryExecutor";
+import { TiDBQueryExecutor } from "../../../core/executor/query-executor/TiDBQueryExecutor";
 import fp from "fastify-plugin";
 import pino from "pino";
-import {dataQueryTimer, measure, tidbQueryCounter} from "../../plugins/metrics/metrics";
+import {dataQueryTimer, measure, tidbQueryCounter} from "../../metrics/metrics";
 
 declare module 'fastify' {
   interface FastifyInstance {
diff --git a/packages/api-server/src/services/playground-service/index.ts b/packages/api-server/src/plugins/services/playground-service/index.ts
similarity index 98%
rename from packages/api-server/src/services/playground-service/index.ts
rename to packages/api-server/src/plugins/services/playground-service/index.ts
index 1679c9446f8..452f1e69d74 100644
--- a/packages/api-server/src/services/playground-service/index.ts
+++ b/packages/api-server/src/plugins/services/playground-service/index.ts
@@ -1,6 +1,6 @@
 import fp from "fastify-plugin";
 import {MySQLPromisePool} from "@fastify/mysql";
-import {APIError} from "../../utils/error";
+import {APIError} from "../../../utils/error";
 import {QuestionContext} from "../bot-service";
 
 declare module 'fastify' {
diff --git a/packages/api-server/src/services/repo-service/index.ts b/packages/api-server/src/plugins/services/repo-service/index.ts
similarity index 98%
rename from packages/api-server/src/services/repo-service/index.ts
rename to packages/api-server/src/plugins/services/repo-service/index.ts
index 359c9d84642..e02e8f6a28c 100644
--- a/packages/api-server/src/services/repo-service/index.ts
+++ b/packages/api-server/src/plugins/services/repo-service/index.ts
@@ -3,7 +3,7 @@ import {FastifyOAuth2Options} from "@fastify/oauth2";
 import {MySQLPromisePool} from "@fastify/mysql";
 import {ResultSetHeader} from "mysql2";
 import fp from "fastify-plugin";
-import {APIError} from "../../utils/error";
+import {APIError} from "../../../utils/error";
 import {RowDataPacket} from "mysql2/promise";
 
 declare module 'fastify' {
diff --git a/packages/api-server/src/services/stats-service/index.ts b/packages/api-server/src/plugins/services/stats-service/index.ts
similarity index 94%
rename from packages/api-server/src/services/stats-service/index.ts
rename to packages/api-server/src/plugins/services/stats-service/index.ts
index a3d1731760d..b929b9e0d96 100644
--- a/packages/api-server/src/services/stats-service/index.ts
+++ b/packages/api-server/src/plugins/services/stats-service/index.ts
@@ -1,7 +1,7 @@
-import { BatchLoader } from "../../core/db/batch-loader";
+import { BatchLoader } from "../../../core/db/batch-loader";
 import {Pool} from "mysql2/promise";
 import fp from "fastify-plugin";
-import {getPool} from "../../core/db/new";
+import {getPool} from "../../../core/db/new";
 import pino from "pino";
 
 declare module 'fastify' {
diff --git a/packages/api-server/src/services/user-service/index.ts b/packages/api-server/src/plugins/services/user-service/index.ts
similarity index 99%
rename from packages/api-server/src/services/user-service/index.ts
rename to packages/api-server/src/plugins/services/user-service/index.ts
index ea559fb39d7..a28e06ab498 100644
--- a/packages/api-server/src/services/user-service/index.ts
+++ b/packages/api-server/src/plugins/services/user-service/index.ts
@@ -4,7 +4,7 @@ import { FastifyOAuth2Options } from "@fastify/oauth2";
 import { MySQLPromisePool } from "@fastify/mysql";
 import { ResultSetHeader } from "mysql2";
 import fp from "fastify-plugin";
-import {APIError} from "../../utils/error";
+import {APIError} from "../../../utils/error";
 import {Connection, RowDataPacket} from "mysql2/promise";
 
 declare module 'fastify' {
diff --git a/packages/api-server/src/routes/bot/questionToSQL/index.ts b/packages/api-server/src/routes/bot/questionToSQL/index.ts
index 91875b390f3..52778e2c176 100644
--- a/packages/api-server/src/routes/bot/questionToSQL/index.ts
+++ b/packages/api-server/src/routes/bot/questionToSQL/index.ts
@@ -1,5 +1,5 @@
 import {FastifyPluginAsyncJsonSchemaToTs} from "@fastify/type-provider-json-schema-to-ts";
-import {QuestionContext} from "../../../services/bot-service";
+import {QuestionContext} from "../../../plugins/services/bot-service";
 import {APIError} from "../../../utils/error";
 
 export interface IBody {