diff --git a/ably/ably-tests.ts b/ably/ably-tests.ts
index 99de6d6578..aa08ca226e 100644
--- a/ably/ably-tests.ts
+++ b/ably/ably-tests.ts
@@ -1,8 +1,8 @@
-/// <reference path="index.d.ts"/>
+import * as Ably from 'ably';
 
 const ApiKey = 'appId.keyId:secret';
-const client = new Realtime(ApiKey);
-const restClient = new Rest(ApiKey);
+const client = new Ably.Realtime(ApiKey);
+const restClient = new Ably.Rest(ApiKey);
 
 // Connection
 // Successful connection:
@@ -114,7 +114,7 @@ channel.history({ start: Date.now()-10000, end: Date.now(), limit: 100, directio
 
 // Generate a random 256-bit key for demonstration purposes (in
 // practice you need to create one and distribute it to clients yourselves)
-Realtime.Crypto.generateRandomKey(function(err, key) {
+Ably.Realtime.Crypto.generateRandomKey(function(err, key) {
     var channel = client.channels.get('channelName', { cipher: { key: key } });
 
     channel.subscribe(function(message) {
@@ -203,7 +203,7 @@ client.auth.requestToken(function(err, tokenDetails) {
   // see https://www.ably.io/documentation/rest/authentication/#token-details for its properties
 
   // Now we have the token, we can send it to someone who can instantiate a client with it:
-  var clientUsingToken = new Realtime(tokenDetails.token);
+  var clientUsingToken = new Ably.Realtime(tokenDetails.token);
 });
 
 // requestToken can take two optional params
diff --git a/ably/index.d.ts b/ably/index.d.ts
index 0452feea26..b8cad7ae69 100644
--- a/ably/index.d.ts
+++ b/ably/index.d.ts
@@ -3,450 +3,452 @@
 // Definitions by: Ably <https://github.com/ably/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare namespace ChannelState {
-  type INITIALIZED = 'initialized';
-  type ATTACHING = 'attaching';
-  type ATTACHED = "attached";
-  type DETACHING = "detaching";
-  type DETACHED = "detached";
-  type SUSPENDED = "suspended";
-  type FAILED = "failed";
-}
-type ChannelState = ChannelState.FAILED | ChannelState.INITIALIZED | ChannelState.SUSPENDED | ChannelState.ATTACHED | ChannelState.ATTACHING | ChannelState.DETACHED | ChannelState.DETACHING;
+declare namespace ablyLib {
+  namespace ChannelState {
+    type INITIALIZED = 'initialized';
+    type ATTACHING = 'attaching';
+    type ATTACHED = "attached";
+    type DETACHING = "detaching";
+    type DETACHED = "detached";
+    type SUSPENDED = "suspended";
+    type FAILED = "failed";
+  }
+  type ChannelState = ChannelState.FAILED | ChannelState.INITIALIZED | ChannelState.SUSPENDED | ChannelState.ATTACHED | ChannelState.ATTACHING | ChannelState.DETACHED | ChannelState.DETACHING;
 
-declare namespace ConnectionState {
-  type INITIALIZED = "initialized";
-  type CONNECTING = "connecting";
-  type CONNECTED = "connected";
-  type DISCONNECTED = "disconnected";
-  type SUSPENDED = "suspended";
-  type CLOSING = "closing";
-  type CLOSED = "closed";
-  type FAILED = "failed";
-}
-type ConnectionState = ConnectionState.INITIALIZED | ConnectionState.CONNECTED | ConnectionState.CONNECTING | ConnectionState.DISCONNECTED | ConnectionState.SUSPENDED | ConnectionState.CLOSED | ConnectionState.CLOSING | ConnectionState.FAILED;
+  namespace ConnectionState {
+    type INITIALIZED = "initialized";
+    type CONNECTING = "connecting";
+    type CONNECTED = "connected";
+    type DISCONNECTED = "disconnected";
+    type SUSPENDED = "suspended";
+    type CLOSING = "closing";
+    type CLOSED = "closed";
+    type FAILED = "failed";
+  }
+  type ConnectionState = ConnectionState.INITIALIZED | ConnectionState.CONNECTED | ConnectionState.CONNECTING | ConnectionState.DISCONNECTED | ConnectionState.SUSPENDED | ConnectionState.CLOSED | ConnectionState.CLOSING | ConnectionState.FAILED;
 
-declare namespace ConnectionEvent {
-  type INITIALIZED = "initialized";
-  type CONNECTING = "connecting";
-  type CONNECTED = "connected";
-  type DISCONNECTED = "disconnected";
-  type SUSPENDED = "suspended";
-  type CLOSING = "closing";
-  type CLOSED = "closed";
-  type FAILED = "failed";
-  type UPDATE = "update";
-}
-type ConnectionEvent = ConnectionEvent.INITIALIZED | ConnectionEvent.CONNECTED | ConnectionEvent.CONNECTING | ConnectionEvent.DISCONNECTED | ConnectionEvent.SUSPENDED | ConnectionEvent.CLOSED | ConnectionEvent.CLOSING | ConnectionEvent.FAILED | ConnectionEvent.UPDATE;
+  namespace ConnectionEvent {
+    type INITIALIZED = "initialized";
+    type CONNECTING = "connecting";
+    type CONNECTED = "connected";
+    type DISCONNECTED = "disconnected";
+    type SUSPENDED = "suspended";
+    type CLOSING = "closing";
+    type CLOSED = "closed";
+    type FAILED = "failed";
+    type UPDATE = "update";
+  }
+  type ConnectionEvent = ConnectionEvent.INITIALIZED | ConnectionEvent.CONNECTED | ConnectionEvent.CONNECTING | ConnectionEvent.DISCONNECTED | ConnectionEvent.SUSPENDED | ConnectionEvent.CLOSED | ConnectionEvent.CLOSING | ConnectionEvent.FAILED | ConnectionEvent.UPDATE;
 
-declare namespace PresenceAction {
-  type ABSENT = "absent";
-  type PRESENT = "present";
-  type ENTER = "enter";
-  type LEAVE = "leave";
-  type UPDATE = "update";
-}
-type PresenceAction = PresenceAction.ABSENT | PresenceAction.PRESENT | PresenceAction.ENTER | PresenceAction.LEAVE | PresenceAction.UPDATE;
+  namespace PresenceAction {
+    type ABSENT = "absent";
+    type PRESENT = "present";
+    type ENTER = "enter";
+    type LEAVE = "leave";
+    type UPDATE = "update";
+  }
+  type PresenceAction = PresenceAction.ABSENT | PresenceAction.PRESENT | PresenceAction.ENTER | PresenceAction.LEAVE | PresenceAction.UPDATE;
 
-declare namespace StatsIntervalGranularity {
-  type MINUTE = "minute";
-  type HOUR = "hour";
-  type DAY = "day";
-  type MONTH = "month";
-}
-type StatsIntervalGranularity = StatsIntervalGranularity.MINUTE | StatsIntervalGranularity.HOUR | StatsIntervalGranularity.DAY | StatsIntervalGranularity.MONTH;
+  namespace StatsIntervalGranularity {
+    type MINUTE = "minute";
+    type HOUR = "hour";
+    type DAY = "day";
+    type MONTH = "month";
+  }
+  type StatsIntervalGranularity = StatsIntervalGranularity.MINUTE | StatsIntervalGranularity.HOUR | StatsIntervalGranularity.DAY | StatsIntervalGranularity.MONTH;
 
-declare namespace HTTPMethods {
-  type POST = "POST";
-  type GET = "GET";
-}
-type HTTPMethods = HTTPMethods.GET | HTTPMethods.POST;
+  namespace HTTPMethods {
+    type POST = "POST";
+    type GET = "GET";
+  }
+  type HTTPMethods = HTTPMethods.GET | HTTPMethods.POST;
 
-// Interfaces
-declare interface ClientOptions extends AuthOptions {
-  /**
-   * When true will automatically connect to Ably when library is instanced. This is true by default
-   */
-  autoConnect?: boolean;
+  // Interfaces
+  interface ClientOptions extends AuthOptions {
+    /**
+     * When true will automatically connect to Ably when library is instanced. This is true by default
+     */
+    autoConnect?: boolean;
 
-  /**
-   * Optional clientId that can be used to specify the identity for this client. In most cases
-   * it is preferable to instead specift a clientId in the token issued to this client.
-   */
-  clientId?: string;
+    /**
+     * Optional clientId that can be used to specify the identity for this client. In most cases
+     * it is preferable to instead specift a clientId in the token issued to this client.
+     */
+    clientId?: string;
 
-  defaultTokenParams?: TokenParams;
+    defaultTokenParams?: TokenParams;
 
-  /**
-   * When true, messages published on channels by this client will be echoed back to this client.
-   * This is true by default
-   */
-  echoMessages?: boolean;
+    /**
+     * When true, messages published on channels by this client will be echoed back to this client.
+     * This is true by default
+     */
+    echoMessages?: boolean;
 
-  /**
-   * Use this only if you have been provided a dedicated environment by Ably
-   */
-  environment?: string;
+    /**
+     * Use this only if you have been provided a dedicated environment by Ably
+     */
+    environment?: string;
 
-  /**
-   * Logger configuration
-   */
-  log?: LogInfo;
-  port?: number;
+    /**
+     * Logger configuration
+     */
+    log?: LogInfo;
+    port?: number;
 
-  /**
-   * When true, messages will be queued whilst the connection is disconnected. True by default.
-   */
-  queueMessages?: boolean;
+    /**
+     * When true, messages will be queued whilst the connection is disconnected. True by default.
+     */
+    queueMessages?: boolean;
 
-  restHost?: string;
-  realtimeHost?: string;
-  fallbackHosts?: string[];
+    restHost?: string;
+    realtimeHost?: string;
+    fallbackHosts?: string[];
 
-  /**
-   * Can be used to explicitly recover a connection.
-   * See https://www.ably.io/documentation/realtime/connection#connection-state-recovery
-   */
-  recover?: standardCallback | string;
+    /**
+     * Can be used to explicitly recover a connection.
+     * See https://www.ably.io/documentation/realtime/connection#connection-state-recovery
+     */
+    recover?: standardCallback | string;
 
-  /**
-   * Use a non-secure connection connection. By default, a TLS connection is used to connect to Ably
-   */
-  tls?: boolean;
-  tlsPort?: number;
+    /**
+     * Use a non-secure connection connection. By default, a TLS connection is used to connect to Ably
+     */
+    tls?: boolean;
+    tlsPort?: number;
 
-  /**
-   * When true, the more efficient MsgPack binary encoding is used.
-   * When false, JSON text encoding is used.
-   */
-  useBinaryProtocol?: boolean;
+    /**
+     * When true, the more efficient MsgPack binary encoding is used.
+     * When false, JSON text encoding is used.
+     */
+    useBinaryProtocol?: boolean;
+  }
+
+  interface AuthOptions {
+    /**
+     * A function which is called when a new token is required.
+     * The role of the callback is to either generate a signed TokenRequest which may then be submitted automatically
+     * by the library to the Ably REST API requestToken; or to provide a valid token in as a TokenDetails object.
+     **/
+    authCallback?: (data: TokenParams, callback: (error: ErrorInfo | string, tokenRequestOrDetails: TokenDetails | TokenRequest | string) => void) => void;
+    authHeaders?: { [index: string]: string };
+    authMethod?: HTTPMethods;
+    authParams?: { [index: string]: string };
+
+    /**
+     * A URL that the library may use to obtain a token string (in plain text format), or a signed TokenRequest or TokenDetails (in JSON format).
+     **/
+    authUrl?: string;
+    key?: string;
+    queryTime?: boolean;
+    token?: TokenDetails | string;
+    tokenDetails?: TokenDetails;
+    useTokenAuth?: boolean;
+  }
+
+  interface TokenParams {
+    capability?: string;
+    clientId?: string;
+    nonce?: string;
+    timestamp?: number;
+    ttl?: number;
+  }
+
+  interface CipherParams {
+    algorithm: string;
+    key: any;
+    keyLength: number;
+    mode: string;
+  }
+
+  interface ErrorInfo {
+    code: number;
+    message: string;
+    statusCode: number;
+  }
+
+  interface StatsMessageCount {
+    count: number;
+    data: number;
+  }
+
+  interface StatsMessageTypes {
+    all: StatsMessageCount;
+    messages: StatsMessageCount;
+    presence: StatsMessageCount;
+  }
+
+  interface StatsRequestCount {
+    failed: number;
+    refused: number;
+    succeeded: number;
+  }
+
+  interface StatsResourceCount {
+    mean: number;
+    min: number;
+    opened: number;
+    peak: number;
+    refused: number;
+  }
+
+  interface StatsConnectionTypes {
+    all: StatsResourceCount;
+    plain: StatsResourceCount;
+    tls: StatsResourceCount;
+  }
+
+  interface StatsMessageTraffic {
+    all: StatsMessageTypes;
+    realtime: StatsMessageTypes;
+    rest: StatsMessageTypes;
+    webhook: StatsMessageTypes;
+  }
+
+  interface TokenDetails {
+    capability: string;
+    clientId?: string;
+    expires: number;
+    issued: number;
+    token: string;
+  }
+
+  interface TokenRequest {
+    capability: string;
+    clientId?: string;
+    keyName: string;
+    mac: string;
+    nonce: string;
+    timestamp: number;
+    ttl?: number;
+  }
+
+  interface ChannelOptions {
+    cipher: any;
+  }
+
+  interface RestPresenceHistoryParams {
+    start?: number;
+    end?: number;
+    direction?: string;
+    limit?: number;
+  }
+
+  interface RestPresenceParams {
+    limit?: number;
+    clientId?: string;
+    connectionId?: string;
+  }
+
+  interface RealtimePresenceParams {
+    waitForSync?: boolean;
+    clientId?: string;
+    connectionId?: string;
+  }
+
+  interface RealtimePresenceHistoryParams {
+    start?: number;
+    end?: number;
+    direction?: string;
+    limit?: number;
+    untilAttach?: boolean;
+  }
+
+  interface LogInfo {
+    /**
+     * A number controlling the verbosity of the output. Valid values are: 0 (no logs), 1 (errors only),
+     * 2 (errors plus connection and channel state changes), 3 (high-level debug output), and 4 (full debug output).
+     **/
+    level?: number;
+
+    /**
+     * A function to handle each line of log output. If handler is not specified, console.log is used.
+     **/
+    handler?: (...args: any[]) => void;
+  }
+
+  interface ChannelEvent {
+    state: ChannelState;
+  }
+
+  interface ChannelStateChange {
+    current: ChannelState;
+    previous: ChannelState;
+    reason?: ErrorInfo;
+    resumed: boolean;
+  }
+
+  interface ConnectionStateChange {
+    current: ConnectionState;
+    previous: ConnectionState;
+    reason?: ErrorInfo;
+    retryIn?: number;
+  }
+
+  // Common Listeners
+  type paginatedResultCallback<T> = (error: ErrorInfo, results: PaginatedResult<T> ) => void;
+  type standardCallback = (error: ErrorInfo, results: any) => void;
+  type messageCallback<T> = (message: T) => void;
+  type errorCallback = (error: ErrorInfo) => void;
+  type channelEventCallback = (channelEvent: ChannelEvent, changeStateChange: ChannelStateChange) => void;
+  type connectionEventCallback = (connectionEvent: ConnectionEvent, connectionStateChange: ConnectionStateChange) => void;
+  type timeCallback = (error: ErrorInfo, time: number) => void;
+  type realtimePresenceGetCallback = (error: ErrorInfo, messages: PresenceMessage[]) => void;
+  type tokenDetailsCallback = (error: ErrorInfo, Results: TokenDetails) => void;
+  type tokenRequestCallback = (error: ErrorInfo, Results: TokenRequest) => void;
+
+  // Internal Classes
+  class EventEmitter<T> {
+    on: (eventOrCallback: string | T, callback?: T) => void;
+    once: (eventOrCallback: string | T, callback?: T) => void;
+    off: (eventOrCallback?: string | T, callback?: T) => void;
+  }
+
+  // Classes
+  class Auth {
+    clientId: string;
+    authorize: (tokenParams?: TokenParams | tokenDetailsCallback, authOptions?: AuthOptions | tokenDetailsCallback, callback?: tokenDetailsCallback) => void;
+    createTokenRequest: (tokenParams?: TokenParams | tokenRequestCallback, authOptions?: AuthOptions | tokenRequestCallback, callback?: tokenRequestCallback) => void;
+    requestToken: (TokenParams?: TokenParams | tokenDetailsCallback, authOptions?: AuthOptions | tokenDetailsCallback, callback?: tokenDetailsCallback) => void;
+  }
+
+  class Presence {
+    get: (params: RestPresenceParams | paginatedResultCallback<PresenceMessage>, callback?: paginatedResultCallback<PresenceMessage>) => void;
+    history: (params: RestPresenceHistoryParams | paginatedResultCallback<PresenceMessage>, callback?: paginatedResultCallback<PresenceMessage>) => void;
+  }
+
+  class RealtimePresence {
+    syncComplete: () =>  boolean;
+    get: (Params: realtimePresenceGetCallback | RealtimePresenceParams, callback?: realtimePresenceGetCallback) => void;
+    history: (ParamsOrCallback: RealtimePresenceHistoryParams | paginatedResultCallback<PresenceMessage>, callback?: paginatedResultCallback<PresenceMessage>) => void;
+    subscribe: (presenceOrCallback: PresenceAction | messageCallback<PresenceMessage>, listener?: messageCallback<PresenceMessage>) => void;
+    unsubscribe: (presence?: PresenceAction, listener?: messageCallback<PresenceMessage>) => void;
+    enter: (data?: errorCallback | any, callback?: errorCallback) => void;
+    update: (data?: errorCallback | any, callback?: errorCallback) => void;
+    leave: (data?: errorCallback | any, callback?: errorCallback) => void;
+    enterClient: (clientId: string, data?: errorCallback | any, callback?: errorCallback) => void;
+    updateClient: (clientId: string, data?: errorCallback | any, callback?: errorCallback) => void;
+    leaveClient: (clientId: string, data?: errorCallback | any, callback?: errorCallback) => void;
+  }
+
+  class Channel {
+    name: string;
+    presence: Presence;
+    history: (paramsOrCallback?: RestPresenceHistoryParams | paginatedResultCallback<Message>, callback?: paginatedResultCallback<Message>) => void;
+    publish: (messagesOrName: any, messagedataOrCallback?: errorCallback | any, callback?: errorCallback) => void;
+  }
+
+  class RealtimeChannel extends EventEmitter<channelEventCallback> {
+    name: string;
+    errorReason: ErrorInfo;
+    state: ChannelState;
+    presence: RealtimePresence;
+    attach: (callback?: standardCallback) => void;
+    detach: (callback?: standardCallback) => void;
+    history: (paramsOrCallback?: RealtimePresenceHistoryParams | paginatedResultCallback<Message>, callback?: paginatedResultCallback<Message>) => void;
+    subscribe: (eventOrCallback: messageCallback<Message> | string, listener?: messageCallback<Message>) => void;
+    unsubscribe: (eventOrCallback?: messageCallback<Message> | string, listener?: messageCallback<Message>) => void;
+    publish: (messagesOrName: any, messageDataOrCallback?: errorCallback | any, callback?: errorCallback) => void;
+    setOptions: (options: any, callback?: errorCallback) => void;
+  }
+
+  class Channels<T> {
+    get: (name: string, channelOptions?: ChannelOptions) => T;
+    release: (name: string) => void;
+  }
+
+  class Message {
+    constructor();
+    fromEncoded: (JsonObject: string, channelOptions: ChannelOptions) => Message;
+    fromEncodedArray: (JsonArray: string, channelOptions: ChannelOptions) => Message[];
+    clientId: string;
+    connectionId: string;
+    data: any;
+    encoding: string;
+    extras: any;
+    id: string;
+    name: string;
+    timestamp: number;
+  }
+
+  class PresenceMessage {
+    fromEncoded: (JsonObject: any, channelOptions?: ChannelOptions) => PresenceMessage;
+    fromEncodedArray: (JsonArray: any[], channelOptions?: ChannelOptions) => PresenceMessage[];
+    action: PresenceAction;
+    clientId: string;
+    connectionId: string;
+    data: any;
+    encoding: string;
+    id: string;
+    timestamp: number;
+  }
+
+  interface Crypto {
+    generateRandomKey: (callback: (error: ErrorInfo, key: string) => void) => void;
+  }
+
+  class Connection extends EventEmitter<connectionEventCallback> {
+    errorReason: ErrorInfo;
+    id: string;
+    key: string;
+    recoveryKey: string;
+    serial: number;
+    state: ConnectionState;
+    close: () => void;
+    connect: () => void;
+    ping: (callback?: (error: ErrorInfo, responseTime: number ) => void ) => void;
+  }
+
+  class Stats {
+    all: StatsMessageTypes;
+    apiRequests: StatsRequestCount;
+    channels: StatsResourceCount;
+    connections: StatsConnectionTypes;
+    inbound: StatsMessageTraffic;
+    intervalId: string;
+    outbound: StatsMessageTraffic;
+    persisted: StatsMessageTypes;
+    tokenRequests: StatsRequestCount;
+  }
+
+  class PaginatedResult<T> {
+    items: T[];
+    first: (results: paginatedResultCallback<T>) => void;
+    next: (results: paginatedResultCallback<T>) => void;
+    current: (results: paginatedResultCallback<T>) => void;
+    hasNext: () => boolean;
+    isLast: () => boolean;
+  }
+
+  class HttpPaginatedResponse extends PaginatedResult<any> {
+    items: string[];
+    statusCode: number;
+    success: boolean;
+    errorCode: number;
+    errorMessage: string;
+    headers: any;
+  }
 }
 
-declare interface AuthOptions {
-  /**
-   * A function which is called when a new token is required.
-   * The role of the callback is to either generate a signed TokenRequest which may then be submitted automatically
-   * by the library to the Ably REST API requestToken; or to provide a valid token in as a TokenDetails object.
-   **/
-  authCallback?: (data: TokenParams, callback: (error: ErrorInfo | string, tokenRequestOrDetails: TokenDetails | TokenRequest | string) => void) => void;
-  authHeaders?: { [index: string]: string };
-  authMethod?: HTTPMethods;
-  authParams?: { [index: string]: string };
-
-  /**
-   * A URL that the library may use to obtain a token string (in plain text format), or a signed TokenRequest or TokenDetails (in JSON format).
-   **/
-  authUrl?: string;
-  key?: string;
-  queryTime?: boolean;
-  token?: TokenDetails | string;
-  tokenDetails?: TokenDetails;
-  useTokenAuth?: boolean;
+export declare class Rest {
+  constructor(options: ablyLib.ClientOptions | string);
+  static Crypto: ablyLib.Crypto;
+  auth: ablyLib.Auth;
+  channels: ablyLib.Channels<ablyLib.Channel>;
+  request: (method: string, path: string, params?: any, body?: any[] | any, headers?: any, callback?: (error: ablyLib.ErrorInfo, response: ablyLib.HttpPaginatedResponse) => void) => void;
+  stats: (paramsOrCallback?: ablyLib.paginatedResultCallback<ablyLib.Stats> | any, callback?: ablyLib.paginatedResultCallback<ablyLib.Stats>) => void;
+  time: (paramsOrCallback?: ablyLib.timeCallback | any, callback?: ablyLib.timeCallback) => void;
 }
 
-declare interface TokenParams {
-  capability?: string;
-  clientId?: string;
-  nonce?: string;
-  timestamp?: number;
-  ttl?: number;
-}
-
-declare interface CipherParams {
-  algorithm: string;
-  key: any;
-  keyLength: number;
-  mode: string;
-}
-
-declare interface ErrorInfo {
-  code: number;
-  message: string;
-  statusCode: number;
-}
-
-declare interface StatsMessageCount {
-  count: number;
-  data: number;
-}
-
-declare interface StatsMessageTypes {
-  all: StatsMessageCount;
-  messages: StatsMessageCount;
-  presence: StatsMessageCount;
-}
-
-declare interface StatsRequestCount {
-  failed: number;
-  refused: number;
-  succeeded: number;
-}
-
-declare interface StatsResourceCount {
-  mean: number;
-  min: number;
-  opened: number;
-  peak: number;
-  refused: number;
-}
-
-declare interface StatsConnectionTypes {
-  all: StatsResourceCount;
-  plain: StatsResourceCount;
-  tls: StatsResourceCount;
-}
-
-declare interface StatsMessageTraffic {
-  all: StatsMessageTypes;
-  realtime: StatsMessageTypes;
-  rest: StatsMessageTypes;
-  webhook: StatsMessageTypes;
-}
-
-declare interface TokenDetails {
-  capability: string;
-  clientId?: string;
-  expires: number;
-  issued: number;
-  token: string;
-}
-
-declare interface TokenRequest {
-  capability: string;
-  clientId?: string;
-  keyName: string;
-  mac: string;
-  nonce: string;
-  timestamp: number;
-  ttl?: number;
-}
-
-declare interface ChannelOptions {
-  cipher: any;
-}
-
-declare interface RestPresenceHistoryParams {
-  start?: number;
-  end?: number;
-  direction?: string;
-  limit?: number;
-}
-
-declare interface RestPresenceParams {
-  limit?: number;
-  clientId?: string;
-  connectionId?: string;
-}
-
-declare interface RealtimePresenceParams {
-  waitForSync?: boolean;
-  clientId?: string;
-  connectionId?: string;
-}
-
-declare interface RealtimePresenceHistoryParams {
-  start?: number;
-  end?: number;
-  direction?: string;
-  limit?: number;
-  untilAttach?: boolean;
-}
-
-declare interface LogInfo {
-  /**
-   * A number controlling the verbosity of the output. Valid values are: 0 (no logs), 1 (errors only),
-   * 2 (errors plus connection and channel state changes), 3 (high-level debug output), and 4 (full debug output).
-   **/
-  level?: number;
-
-  /**
-   * A function to handle each line of log output. If handler is not specified, console.log is used.
-   **/
-  handler?: (...args: any[]) => void;
-}
-
-declare interface ChannelEvent {
-  state: ChannelState;
-}
-
-declare interface ChannelStateChange {
-  current: ChannelState;
-  previous: ChannelState;
-  reason?: ErrorInfo;
-  resumed: boolean;
-}
-
-declare interface ConnectionStateChange {
-  current: ConnectionState;
-  previous: ConnectionState;
-  reason?: ErrorInfo;
-  retryIn?: number;
-}
-
-// Common Listeners
-type paginatedResultCallback<T> = (error: ErrorInfo, results: PaginatedResult<T> ) => void;
-type standardCallback = (error: ErrorInfo, results: any) => void;
-type messageCallback<T> = (message: T) => void;
-type errorCallback = (error: ErrorInfo) => void;
-type channelEventCallback = (channelEvent: ChannelEvent, changeStateChange: ChannelStateChange) => void;
-type connectionEventCallback = (connectionEvent: ConnectionEvent, connectionStateChange: ConnectionStateChange) => void;
-type timeCallback = (error: ErrorInfo, time: number) => void;
-type realtimePresenceGetCallback = (error: ErrorInfo, messages: PresenceMessage[]) => void;
-type tokenDetailsCallback = (error: ErrorInfo, Results: TokenDetails) => void;
-type tokenRequestCallback = (error: ErrorInfo, Results: TokenRequest) => void;
-
-// Internal Classes
-declare class EventEmitter<T> {
-  on: (eventOrCallback: string | T, callback?: T) => void;
-  once: (eventOrCallback: string | T, callback?: T) => void;
-  off: (eventOrCallback?: string | T, callback?: T) => void;
-}
-
-// Classes
-declare class Auth {
+export declare class Realtime {
+  constructor(options: ablyLib.ClientOptions | string);
+  static Crypto: ablyLib.Crypto;
+  auth: ablyLib.Auth;
+  channels: ablyLib.Channels<ablyLib.RealtimeChannel>;
   clientId: string;
-  authorize: (tokenParams?: TokenParams | tokenDetailsCallback, authOptions?: AuthOptions | tokenDetailsCallback, callback?: tokenDetailsCallback) => void;
-  createTokenRequest: (tokenParams?: TokenParams | tokenRequestCallback, authOptions?: AuthOptions | tokenRequestCallback, callback?: tokenRequestCallback) => void;
-  requestToken: (TokenParams?: TokenParams | tokenDetailsCallback, authOptions?: AuthOptions | tokenDetailsCallback, callback?: tokenDetailsCallback) => void;
-}
-
-declare class Presence {
-  get: (params: RestPresenceParams | paginatedResultCallback<PresenceMessage>, callback?: paginatedResultCallback<PresenceMessage>) => void;
-  history: (params: RestPresenceHistoryParams | paginatedResultCallback<PresenceMessage>, callback?: paginatedResultCallback<PresenceMessage>) => void;
-}
-
-declare class RealtimePresence {
-  syncComplete: () =>  boolean;
-  get: (Params: realtimePresenceGetCallback | RealtimePresenceParams, callback?: realtimePresenceGetCallback) => void;
-  history: (ParamsOrCallback: RealtimePresenceHistoryParams | paginatedResultCallback<PresenceMessage>, callback?: paginatedResultCallback<PresenceMessage>) => void;
-  subscribe: (presenceOrCallback: PresenceAction | messageCallback<PresenceMessage>, listener?: messageCallback<PresenceMessage>) => void;
-  unsubscribe: (presence?: PresenceAction, listener?: messageCallback<PresenceMessage>) => void;
-  enter: (data?: errorCallback | any, callback?: errorCallback) => void;
-  update: (data?: errorCallback | any, callback?: errorCallback) => void;
-  leave: (data?: errorCallback | any, callback?: errorCallback) => void;
-  enterClient: (clientId: string, data?: errorCallback | any, callback?: errorCallback) => void;
-  updateClient: (clientId: string, data?: errorCallback | any, callback?: errorCallback) => void;
-  leaveClient: (clientId: string, data?: errorCallback | any, callback?: errorCallback) => void;
-}
-
-declare class Channel {
-  name: string;
-  presence: Presence;
-  history: (paramsOrCallback?: RestPresenceHistoryParams | paginatedResultCallback<Message>, callback?: paginatedResultCallback<Message>) => void;
-  publish: (messagesOrName: any, messagedataOrCallback?: errorCallback | any, callback?: errorCallback) => void;
-}
-
-declare class RealtimeChannel extends EventEmitter<channelEventCallback> {
-  name: string;
-  errorReason: ErrorInfo;
-  state: ChannelState;
-  presence: RealtimePresence;
-  attach: (callback?: standardCallback) => void;
-  detach: (callback?: standardCallback) => void;
-  history: (paramsOrCallback?: RealtimePresenceHistoryParams | paginatedResultCallback<Message>, callback?: paginatedResultCallback<Message>) => void;
-  subscribe: (eventOrCallback: messageCallback<Message> | string, listener?: messageCallback<Message>) => void;
-  unsubscribe: (eventOrCallback?: messageCallback<Message> | string, listener?: messageCallback<Message>) => void;
-  publish: (messagesOrName: any, messageDataOrCallback?: errorCallback | any, callback?: errorCallback) => void;
-  setOptions: (options: any, callback?: errorCallback) => void;
-}
-
-declare class Channels<T> {
-  get: (name: string, channelOptions?: ChannelOptions) => T;
-  release: (name: string) => void;
-}
-
-declare class Message {
-  constructor();
-  fromEncoded: (JsonObject: string, channelOptions: ChannelOptions) => Message;
-  fromEncodedArray: (JsonArray: string, channelOptions: ChannelOptions) => Message[];
-  clientId: string;
-  connectionId: string;
-  data: any;
-  encoding: string;
-  extras: any;
-  id: string;
-  name: string;
-  timestamp: number;
-}
-
-declare class PresenceMessage {
-  fromEncoded: (JsonObject: any, channelOptions?: ChannelOptions) => PresenceMessage;
-  fromEncodedArray: (JsonArray: any[], channelOptions?: ChannelOptions) => PresenceMessage[];
-  action: PresenceAction;
-  clientId: string;
-  connectionId: string;
-  data: any;
-  encoding: string;
-  id: string;
-  timestamp: number;
-}
-
-declare interface Crypto {
-  generateRandomKey: (callback: (error: ErrorInfo, key: string) => void) => void;
-}
-
-declare class Rest {
-  constructor(options: ClientOptions | string);
-  static Crypto: Crypto;
-  auth: Auth;
-  channels: Channels<Channel>;
-  request: (method: string, path: string, params?: any, body?: any[] | any, headers?: any, callback?: (error: ErrorInfo, response: HttpPaginatedResponse) => void) => void;
-  stats: (paramsOrCallback?: paginatedResultCallback<Stats> | any, callback?: paginatedResultCallback<Stats>) => void;
-  time: (paramsOrCallback?: timeCallback | any, callback?: timeCallback) => void;
-}
-
-declare class Realtime {
-  constructor(options: ClientOptions | string);
-  static Crypto: Crypto;
-  auth: Auth;
-  channels: Channels<RealtimeChannel>;
-  clientId: string;
-  connection: Connection;
-  request: (method: string, path: string, params?: any, body?: any[] | any, headers?: any, callback?: (error: ErrorInfo, response: HttpPaginatedResponse) => void) => void;
-  stats: (paramsOrCallback?: paginatedResultCallback<Stats> | any, callback?: paginatedResultCallback<Stats>) => void;
+  connection: ablyLib.Connection;
+  request: (method: string, path: string, params?: any, body?: any[] | any, headers?: any, callback?: (error: ablyLib.ErrorInfo, response: ablyLib.HttpPaginatedResponse) => void) => void;
+  stats: (paramsOrCallback?: ablyLib.paginatedResultCallback<ablyLib.Stats> | any, callback?: ablyLib.paginatedResultCallback<ablyLib.Stats>) => void;
   close: () => void;
   connect: () => void;
-  time: (paramsOrCallback?: timeCallback | any, callback?: timeCallback) => void;
-}
-
-declare class Connection extends EventEmitter<connectionEventCallback> {
-  errorReason: ErrorInfo;
-  id: string;
-  key: string;
-  recoveryKey: string;
-  serial: number;
-  state: ConnectionState;
-  close: () => void;
-  connect: () => void;
-  ping: (callback?: (error: ErrorInfo, responseTime: number ) => void ) => void;
-}
-
-declare class Stats {
-  all: StatsMessageTypes;
-  apiRequests: StatsRequestCount;
-  channels: StatsResourceCount;
-  connections: StatsConnectionTypes;
-  inbound: StatsMessageTraffic;
-  intervalId: string;
-  outbound: StatsMessageTraffic;
-  persisted: StatsMessageTypes;
-  tokenRequests: StatsRequestCount;
-}
-
-declare class PaginatedResult<T> {
-  items: T[];
-  first: (results: paginatedResultCallback<T>) => void;
-  next: (results: paginatedResultCallback<T>) => void;
-  current: (results: paginatedResultCallback<T>) => void;
-  hasNext: () => boolean;
-  isLast: () => boolean;
-}
-
-declare class HttpPaginatedResponse extends PaginatedResult<any> {
-  items: string[];
-  statusCode: number;
-  success: boolean;
-  errorCode: number;
-  errorMessage: string;
-  headers: any;
+  time: (paramsOrCallback?: ablyLib.timeCallback | any, callback?: ablyLib.timeCallback) => void;
 }