diff --git a/src/deprecated.ts b/src/deprecated.ts
new file mode 100644
index 0000000000000000000000000000000000000000..0d0a7d45d475792fd68a97e14a1fc046b6a19443
--- /dev/null
+++ b/src/deprecated.ts
@@ -0,0 +1,11 @@
+import {
+  log,
+}               from './config'
+
+export class MediaMessage {
+  constructor() {
+    const msg = '`MediaMessage` is deprecated. Please use `Message` instead. See: https://github.com/Chatie/wechaty/issues/1164'
+    log.warn('MediaMessage', msg)
+    throw new Error(msg)
+  }
+}
diff --git a/index.ts b/src/index.ts
similarity index 100%
rename from index.ts
rename to src/index.ts
diff --git a/src/puppet/index.ts b/src/puppet/index.ts
new file mode 100644
index 0000000000000000000000000000000000000000..f9439ad3d783f70fd9ce2505639edaf01e568b2c
--- /dev/null
+++ b/src/puppet/index.ts
@@ -0,0 +1,25 @@
+export {
+  Contact,
+  ContactQueryFilter,
+}                         from './contact'
+export {
+  FriendRequest,
+}                         from './friend-request'
+export {
+  Message,
+}                         from './message'
+export {
+  Puppet,
+  PuppetEvent,
+  PuppetOptions,
+  ScanData,
+}                         from './puppet'
+export {
+  PuppetAccessory,
+}                         from './puppet-accessory'
+export {
+  Room,
+  RoomMemberQueryName,
+  RoomMemberQueryFilter,
+  RoomQueryFilter,
+}                         from './room'
diff --git a/src/puppet/media-message.ts b/src/puppet/media-message.ts
deleted file mode 100644
index e0a7dd7b7ae6ffe658ef74148f7d77186a476541..0000000000000000000000000000000000000000
--- a/src/puppet/media-message.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import {
-  Readable,
-}                 from 'stream'
-
-import Contact  from './contact'
-import Message  from './message'
-import Room     from './room'
-
-/**
- * Meidia Type Message
- *
- */
-export abstract class MediaMessage extends Message {
-  /**
-   * @private
-   */
-  public toString() {
-    return `MediaMessage<${this.filename()}>`
-  }
-
-  /**
-   * Get the MediaMessage file extension, etc: `jpg`, `gif`, `pdf`, `word` ..
-   *
-   * @returns {string}
-   * @example
-   * bot.on('message', async function (m) {
-   *   if (m instanceof MediaMessage) {
-   *     console.log('media message file name extention is: ' + m.ext())
-   *   }
-   * })
-   */
-  public abstract ext(): string
-
-  /**
-   * return the MIME Type of this MediaMessage
-   *
-   */
-  public abstract  mimeType(): string | null
-
-  /**
-   * Get the MediaMessage filename, etc: `how to build a chatbot.pdf`..
-   *
-   * @returns {string}
-   * @example
-   * bot.on('message', async function (m) {
-   *   if (m instanceof MediaMessage) {
-   *     console.log('media message file name is: ' + m.filename())
-   *   }
-   * })
-   */
-  public abstract filename(): string
-
-  /**
-   * Get the read stream for attachment file
-   */
-  public abstract async readyStream(): Promise<Readable>
-
-  public abstract async forward(to: Room | Contact): Promise<void>
-}
-
-export default MediaMessage