diff --git a/packages/server-proxy/package.json b/packages/server-proxy/package.json
deleted file mode 100644
index 3daa594a..00000000
--- a/packages/server-proxy/package.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "name": "@satorijs/server-proxy",
-  "description": "Proxy plugin for cordis",
-  "version": "1.1.0",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "files": [
-    "lib",
-    "src"
-  ],
-  "author": "Shigma <shigma10826@gmail.com>",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/satorijs/satori.git",
-    "directory": "packages/server-proxy"
-  },
-  "bugs": {
-    "url": "https://github.com/satorijs/satori/issues"
-  },
-  "homepage": "https://github.com/satorijs/satori/tree/master/packages/proxy",
-  "keywords": [
-    "cordis",
-    "router",
-    "http",
-    "proxy",
-    "server",
-    "service"
-  ],
-  "devDependencies": {
-    "@cordisjs/plugin-server": "^0.2.2"
-  },
-  "peerDependencies": {
-    "@satorijs/core": "^4.0.0"
-  }
-}
diff --git a/packages/server-proxy/src/index.ts b/packages/server-proxy/src/index.ts
deleted file mode 100644
index 8121441c..00000000
--- a/packages/server-proxy/src/index.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { Context, sanitize, Schema } from '@satorijs/core'
-import {} from '@cordisjs/plugin-server'
-import internal from 'stream'
-
-declare module '@satorijs/core' {
-  interface Context {
-    'server.proxy': ProxyServer
-  }
-}
-
-class ProxyServer {
-  static inject = ['server', 'http']
-
-  public path: string
-
-  constructor(protected ctx: Context, public config: ProxyServer.Config) {
-    const logger = ctx.logger('proxy')
-
-    this.path = sanitize(config.path)
-
-    ctx.server.get(this.path + '/:url(.*)', async (koa) => {
-      logger.debug(koa.params.url)
-      koa.header['Access-Control-Allow-Origin'] = ctx.server.config.selfUrl || '*'
-      try {
-        koa.body = await ctx.http.get<internal.Readable>(koa.params.url, { responseType: 'stream' })
-      } catch (error) {
-        if (!ctx.http.isError(error) || !error.response) throw error
-        koa.status = error.response.status
-        koa.body = error.response.data
-      }
-    })
-
-    ctx.provide('server.proxy', this)
-  }
-}
-
-namespace ProxyServer {
-  export interface Config {
-    path: string
-  }
-
-  export const Config: Schema<Config> = Schema.object({
-    path: Schema.string().default('/proxy'),
-  })
-}
-
-export default ProxyServer
diff --git a/packages/server-satori/tsconfig.json b/packages/server-satori/tsconfig.json
deleted file mode 100644
index 6f11f324..00000000
--- a/packages/server-satori/tsconfig.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "extends": "../../tsconfig.base",
-  "compilerOptions": {
-    "rootDir": "src",
-    "outDir": "lib",
-    "strict": true,
-    "noImplicitAny": false,
-  },
-  "include": [
-    "src",
-  ],
-}
diff --git a/packages/server-satori/package.json b/packages/server/package.json
similarity index 100%
rename from packages/server-satori/package.json
rename to packages/server/package.json
diff --git a/packages/server-satori/src/index.ts b/packages/server/src/index.ts
similarity index 100%
rename from packages/server-satori/src/index.ts
rename to packages/server/src/index.ts
diff --git a/packages/server-proxy/tsconfig.json b/packages/server/tsconfig.json
similarity index 100%
rename from packages/server-proxy/tsconfig.json
rename to packages/server/tsconfig.json
diff --git a/tsconfig.json b/tsconfig.json
index 18133b6c..945f9e1b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,6 +4,7 @@
     "baseUrl": ".",
     "paths": {
       "@satorijs/adapter-*": ["adapters/*/src"],
+      "@satorijs/plugin-*": ["packages/*/src"],
       "@satorijs/*": ["packages/*/src"],
     },
   },