diff --git a/amqplib/amqplib.d.ts b/amqplib/amqplib.d.ts
index a6e6e7a05..bc0006753 100644
--- a/amqplib/amqplib.d.ts
+++ b/amqplib/amqplib.d.ts
@@ -6,17 +6,7 @@
 /// <reference path="../when/when.d.ts" />
 /// <reference path="../node/node.d.ts" />
 
-declare module "amqplib" {
-
-    import events = require("events");
-    import when = require("when");
-
-    interface Connection extends events.EventEmitter {
-        close(): when.Promise<void>;
-        createChannel(): when.Promise<Channel>;
-        createConfirmChannel(): when.Promise<Channel>;
-    }
-
+declare module "amqplib/shared" {
     module Replies {
         interface Empty {
         }
@@ -25,6 +15,9 @@ declare module "amqplib" {
             messageCount: number;
             consumerCount: number;
         }
+        interface PurgeQueue {
+            messageCount: number;
+        }
         interface DeleteQueue {
             messageCount: number;
         }
@@ -100,6 +93,22 @@ declare module "amqplib" {
         fields: Object;
         properties: Object;
     }
+}
+
+declare module "amqplib" {
+
+    import events = require("events");
+    import when = require("when");
+    import shared = require("amqplib/shared")
+    import Replies = shared.Replies;
+    import Options = shared.Options;
+    import Message = shared.Message;
+
+    interface Connection extends events.EventEmitter {
+        close(): when.Promise<void>;
+        createChannel(): when.Promise<Channel>;
+        createConfirmChannel(): when.Promise<Channel>;
+    }
 
     interface Channel extends events.EventEmitter {
         close(): when.Promise<void>;
@@ -108,7 +117,7 @@ declare module "amqplib" {
         checkQueue(queue: string): when.Promise<Replies.AssertQueue>;
 
         deleteQueue(queue: string, options?: Options.DeleteQueue): when.Promise<Replies.DeleteQueue>;
-        purgeQueue(queue: string): when.Promise<Replies.DeleteQueue>;
+        purgeQueue(queue: string): when.Promise<Replies.PurgeQueue>;
 
         bindQueue(queue: string, source: string, pattern: string, args?: any): when.Promise<Replies.Empty>;
         unbindQueue(queue: string, source: string, pattern: string, args?: any): when.Promise<Replies.Empty>;
@@ -146,6 +155,10 @@ declare module "amqplib" {
 declare module "amqplib/callback_api" {
 
     import events = require("events");
+    import shared = require("amqplib/shared")
+    import Replies = shared.Replies;
+    import Options = shared.Options;
+    import Message = shared.Message;
 
     interface Connection extends events.EventEmitter {
         close(callback?: (err: any) => void): void;
@@ -153,93 +166,6 @@ declare module "amqplib/callback_api" {
         createConfirmChannel(callback: (err: any, confirmChannel: ConfirmChannel) => void): void;
     }
 
-    module Replies {
-        interface Empty {
-        }
-        interface AssertQueue {
-            queue: string;
-            messageCount: number;
-            consumerCount: number;
-        }
-        interface DeleteQueue {
-            messageCount: number;
-        }
-        interface PurgeQueue {
-            messageCount: number;
-        }
-        interface AssertExchange {
-            exchange: string;
-        }
-        interface Consume {
-            consumerTag: string;
-        }
-    }
-
-    module Options {
-        interface AssertQueue {
-            exclusive?: boolean;
-            durable?: boolean;
-            autoDelete?: boolean;
-            arguments?: any;
-            messageTtl?: number;
-            expires?: number;
-            deadLetterExchange?: string;
-            maxLength?: number;
-        }
-        interface DeleteQueue {
-            ifUnused?: boolean;
-            ifEmpty?: boolean;
-        }
-        interface AssertExchange {
-            durable?: boolean;
-            internal?: boolean;
-            autoDelete?: boolean;
-            alternateExchange?: string;
-            arguments?: any;
-        }
-        interface DeleteExchange {
-            ifUnused?: boolean;
-        }
-        interface Publish {
-            expiration?: string;
-            userId?: string;
-            CC?: string | string[];
-
-            mandatory?: boolean;
-            persistent?: boolean;
-            deliveryMode?: boolean | number;
-            BCC?: string | string[];
-
-            contentType?: string;
-            contentEncoding?: string;
-            headers?: Object;
-            priority?: number;
-            correlationId?: string;
-            replyTo?: string;
-            messageId?: string;
-            timestamp?: number;
-            type?: string;
-            appId?: string;
-        }
-        interface Consume {
-            consumerTag?: string;
-            noLocal?: boolean;
-            noAck?: boolean;
-            exclusive?: boolean;
-            priority?: number;
-            arguments?: Object;
-        }
-        interface Get {
-            noAck?: boolean;
-        }
-    }
-
-    interface Message {
-        content: Buffer;
-        fields: any;
-        properties: any;
-    }
-
     interface Channel extends events.EventEmitter {
         close(callback: (err: any) => void): void;