diff --git a/build/functions/api.js b/build/functions/api.js
deleted file mode 100644
index 2fc817b..0000000
--- a/build/functions/api.js
+++ /dev/null
@@ -1,50 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _fetch = require('./fetch');
-
-var _fetch2 = _interopRequireDefault(_fetch);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } // API methods
-
-
-/**
- * API class, has a function for each method of the Telegram API which take
- * an object argument, and send request to the API server
- *
- * Methods: getMe, sendMessage, forwardMessage, sendPhoto, sendAudio,
- * sendDocument, sendSticker, sendVideo, sendLocation, sendChatAction,
- * getUserProfilePhotos, getUpdates
- */
-
-var API =
-/**
- * Create a new api object with the given token
- * @param  {string} token
- */
-function API(token) {
-  _classCallCheck(this, API);
-
-  this.token = token;
-};
-
-exports.default = API;
-
-
-API.prototype.request = function request(method, data) {
-  return (0, _fetch2.default)(this.token + '/' + method, data);
-};
-
-var methods = ['getMe', 'sendMessage', 'forwardMessage', 'sendPhoto', 'sendAudio', 'sendDocument', 'sendSticker', 'sendVideo', 'sendLocation', 'sendChatAction', 'getUserProfilePhotos', 'getUpdates', 'setWebhook'];
-
-methods.forEach(function (method) {
-  API.prototype[method] = function (data) {
-    return this.request(method, data);
-  };
-});
-module.exports = exports['default'];
diff --git a/build/functions/argument-parser.js b/build/functions/argument-parser.js
deleted file mode 100644
index a1417ef..0000000
--- a/build/functions/argument-parser.js
+++ /dev/null
@@ -1,156 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
-
-exports.default = argumentParser;
-var FORMAT_REQUIRED = /<(\W*)(\w+)\|?(\w+)?>/g;
-var FORMAT_OPTIONAL = /\[(\W*)(\w+)\|?(\w+)?\]/g;
-var FORMAT_REST = /\.{3}(\w+)/g;
-
-var ESCAPABLE = '.^$*+?()[{\\|}]'.split('');
-
-var REQUIRED = 0;
-var OPTIONAL = 1;
-var REST = 2;
-
-/**
- * Parses a message for arguments, based on format
- *
- * The format option may include '<requiredParam>' and '[optionalParam]' and
- * '...[restParam]'
- * 		<requiredParam> indicates a required, single-word argument
- * 		[optionalParam] indicates an optinal, single-word argument
- *   	...[restParam] indicates a multi-word argument which records until end
- *
- *    You can define a type for your arguments using pipe | sign, like this:
- *    [count|number]
- *    Supported Types are: number and word, defaults to word
- *
- *    Example:
- *            format: '<name> [count|number] ...text'
- *            string 1: 'Someone Hey, wassup'
- *            {name: 'Someone',
- *             count: undefined,
- *             text: 'Hey, wassup'}
- *
- *            string 2: 'Someone 5 Hey, wassup'
- *            {name: 'Someone',
- *         		 count: 5,
- *         		 text: 'Hey, wassup'}
- * @param  {string} format Format, as described above
- * @param  {string} string The message to parse
- * @return {object} Parsed arguments
- */
-function argumentParser(format, string) {
-  string = string.replace(/[^\s]+/, '').trim();
-  format = format.replace(/[^\s]+/, '').trim();
-
-  if (!format) {
-    return { args: {}, params: {} };
-  }
-
-  var indexes = [],
-      params = {};
-
-  format = format.replace(/\s/g, '\\s*');
-  format = format.replace(FORMAT_REQUIRED, function (f, symbols, arg) {
-    var type = arguments.length <= 3 || arguments[3] === undefined ? 'word' : arguments[3];
-    var offset = arguments[4];
-
-    indexes.push({ arg: arg, offset: offset });
-    params[arg] = REQUIRED;
-    return (escape(symbols) + getFormat(type, 'required')).trim();
-  });
-  format = format.replace(FORMAT_OPTIONAL, function (f, symbols, arg) {
-    var type = arguments.length <= 3 || arguments[3] === undefined ? 'word' : arguments[3];
-    var offset = arguments[4];
-
-    indexes.push({ arg: arg, offset: offset });
-    params[arg] = OPTIONAL;
-    return (escape(symbols, '?') + getFormat(type, 'optional')).trim();
-  });
-  format = format.replace(FORMAT_REST, function (full, arg, offset) {
-    indexes.push({ offset: offset, arg: arg });
-    params[arg] = REST;
-    return getFormat(null, 'rest');
-  });
-
-  if (!string) {
-    return { args: {}, params: params };
-  }
-
-  indexes = indexes.sort(function (a, b) {
-    return a.offset < b.offset ? -1 : 1;
-  });
-
-  var regex = new RegExp(format);
-
-  var matched = regex.exec(string).slice(1);
-
-  var object = {};
-  var _iteratorNormalCompletion = true;
-  var _didIteratorError = false;
-  var _iteratorError = undefined;
-
-  try {
-    for (var _iterator = matched.entries()[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-      var _step$value = _slicedToArray(_step.value, 2);
-
-      var index = _step$value[0];
-      var match = _step$value[1];
-
-      var argument = indexes[index];
-
-      object[argument.arg] = match;
-    }
-  } catch (err) {
-    _didIteratorError = true;
-    _iteratorError = err;
-  } finally {
-    try {
-      if (!_iteratorNormalCompletion && _iterator.return) {
-        _iterator.return();
-      }
-    } finally {
-      if (_didIteratorError) {
-        throw _iteratorError;
-      }
-    }
-  }
-
-  return { args: object, params: params };
-}
-
-function escape(symbols) {
-  var append = arguments.length <= 1 || arguments[1] === undefined ? '' : arguments[1];
-
-  return symbols.split('').map(function (symbol) {
-    return (ESCAPABLE.indexOf(symbol) ? '\\' + symbol : symbol) + append;
-  }).join('');
-}
-
-var TYPES = {
-  'number': '\\d',
-  'word': '\\S'
-};
-
-function getFormat() {
-  var type = arguments.length <= 0 || arguments[0] === undefined ? 'word' : arguments[0];
-  var param = arguments.length <= 1 || arguments[1] === undefined ? 'required' : arguments[1];
-
-  var t = TYPES[type];
-
-  switch (param) {
-    case 'required':
-      return '(' + t + '+)';
-    case 'optional':
-      return '(' + t + '+)?';
-    case 'rest':
-      return '(.*)';
-  }
-}
-module.exports = exports['default'];
diff --git a/build/functions/fetch.js b/build/functions/fetch.js
deleted file mode 100644
index 1af71bf..0000000
--- a/build/functions/fetch.js
+++ /dev/null
@@ -1,73 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = fetch;
-exports.getBody = getBody;
-
-var _unirest = require('unirest');
-
-var _unirest2 = _interopRequireDefault(_unirest);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function fetch(path) {
-  var data = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
-
-  return new Promise(function (resolve, reject) {
-    var files = {};
-
-    var _iteratorNormalCompletion = true;
-    var _didIteratorError = false;
-    var _iteratorError = undefined;
-
-    try {
-      for (var _iterator = Object.keys(data)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-        var key = _step.value;
-
-        if (data[key].file) {
-          files[key] = data[key].file;
-          delete data[key];
-        }
-      }
-    } catch (err) {
-      _didIteratorError = true;
-      _iteratorError = err;
-    } finally {
-      try {
-        if (!_iteratorNormalCompletion && _iterator.return) {
-          _iterator.return();
-        }
-      } finally {
-        if (_didIteratorError) {
-          throw _iteratorError;
-        }
-      }
-    }
-
-    _unirest2.default.post('https://api.telegram.org/bot' + path).field(data).attach(files).end(function (response) {
-      if (response.statusType === 4 || response.statusType === 5 || !response.body || !response.body.ok) {
-        reject(response);
-      } else {
-        resolve(response.body);
-      }
-    });
-  });
-}
-
-function getBody(stream) {
-  var data = '';
-
-  return new Promise(function (resolve, reject) {
-    stream.on('data', function (chunk) {
-      data += chunk;
-    });
-
-    stream.on('end', function () {
-      resolve(data);
-    });
-
-    stream.on('error', reject);
-  });
-}
diff --git a/build/functions/poll.js b/build/functions/poll.js
deleted file mode 100644
index 6698138..0000000
--- a/build/functions/poll.js
+++ /dev/null
@@ -1,20 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = poll;
-function poll(bot) {
-  return bot.api.getUpdates(bot.update).then(function (response) {
-    if (!response.result.length) {
-      return poll(bot);
-    }
-    bot.emit('update', response.result);
-
-    if (bot._stop) {
-      return null;
-    }
-    return poll(bot);
-  });
-}
-module.exports = exports['default'];
diff --git a/build/functions/webhook.js b/build/functions/webhook.js
deleted file mode 100644
index 03b64ab..0000000
--- a/build/functions/webhook.js
+++ /dev/null
@@ -1,42 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = webhook;
-
-var _http = require('http');
-
-var _http2 = _interopRequireDefault(_http);
-
-var _qs = require('qs');
-
-var _qs2 = _interopRequireDefault(_qs);
-
-var _fetch = require('./fetch');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var DEFAULTS = {
-  server: {},
-  port: 443
-};
-
-function webhook() {
-  var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
-  var bot = arguments[1];
-
-  options = Object.assign(DEFAULTS, options);
-
-  return bot.api.setWebhook(options.url).then(function () {
-
-    bot._webhookServer = _http2.default.createServer(options.server, function (req, res) {
-      return (0, _fetch.getBody)(req).then(function (data) {
-        bot.emit('update', _qs2.default.parse(data).result);
-
-        res.end('OK');
-      });
-    }).listen(options.port);
-  });
-}
-module.exports = exports['default'];
diff --git a/build/index.js b/build/index.js
deleted file mode 100644
index cf68987..0000000
--- a/build/index.js
+++ /dev/null
@@ -1,412 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Keyboard = exports.Question = exports.Forward = exports.BulkMessage = exports.Message = exports.File = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-require('babel-polyfill');
-
-var _api = require('./functions/api');
-
-var _api2 = _interopRequireDefault(_api);
-
-var _webhook = require('./functions/webhook');
-
-var _webhook2 = _interopRequireDefault(_webhook);
-
-var _poll = require('./functions/poll');
-
-var _poll2 = _interopRequireDefault(_poll);
-
-var _argumentParser = require('./functions/argument-parser');
-
-var _argumentParser2 = _interopRequireDefault(_argumentParser);
-
-var _events = require('events');
-
-var _Message = require('./types/Message');
-
-var _Message2 = _interopRequireDefault(_Message);
-
-var _File = require('./types/File');
-
-var _File2 = _interopRequireDefault(_File);
-
-var _Keyboard = require('./types/Keyboard');
-
-var _Keyboard2 = _interopRequireDefault(_Keyboard);
-
-var _BulkMessage = require('./types/BulkMessage');
-
-var _BulkMessage2 = _interopRequireDefault(_BulkMessage);
-
-var _Question = require('./types/Question');
-
-var _Question2 = _interopRequireDefault(_Question);
-
-var _Forward = require('./types/Forward');
-
-var _Forward2 = _interopRequireDefault(_Forward);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-var DEFAULTS = {
-  update: {
-    offset: 0,
-    timeout: 20,
-    limit: 100
-  }
-};
-
-var REQUIRED = 0;
-
-/**
- * Bot class used to connect to a new bot
- * Bots have an api property which gives access to all Telegram API methods,
- * see API class
- */
-
-var Bot = function (_EventEmitter) {
-  _inherits(Bot, _EventEmitter);
-
-  /**
-   * Create and connect to a new bot
-   * @param  {object} options Bot properties.
-   */
-
-  function Bot() {
-    var options = arguments.length <= 0 || arguments[0] === undefined ? { update: {} } : arguments[0];
-
-    _classCallCheck(this, Bot);
-
-    var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(Bot).call(this));
-
-    if (!options.token) {
-      throw new Error('Token cannot be empty');
-    }
-
-    _this.token = options.token;
-    _this.update = Object.assign(options.update || {}, DEFAULTS.update);
-
-    _this.api = new _api2.default(_this.token);
-
-    _this.msg = {};
-
-    // EventEmitter
-    _this._events = {};
-    _this._userEvents = [];
-
-    _this.setMaxListeners(100);
-    return _this;
-  }
-
-  /**
-   * Gets information about the bot and then
-   * 1) starts polling updates from API
-   * 2) sets a webhook as defined by the first parameter and listens for updates
-   * Emits an `update` event after polling with the response from server
-   * Returns a promise which is resolved after the bot information is received
-   * and set to it's `info` property i.e. bot.info
-   *
-   * @param {object} hook An object containg options passed to webhook
-   *                      properties:
-   *                       - url: HTTPS url to listen on POST requests coming
-   *                              from the Telegram API
-   *                       - port: the port to listen to, defaults to 443
-   *                       - server: An object passed to https.createServer
-   *
-   * @return {promise} A promise which is resolved with the response of getMe
-   */
-
-
-  _createClass(Bot, [{
-    key: 'start',
-    value: function start(hook) {
-      var _this2 = this;
-
-      if (hook) {
-        return (0, _webhook2.default)(hook, this);
-      }
-      return this.api.getMe().then(function (response) {
-        _this2.info = response.result;
-
-        _this2.on('update', _this2._update);
-
-        if (hook) {
-          return (0, _webhook2.default)(hook, _this2);
-        } else {
-          return (0, _poll2.default)(_this2);
-        }
-      });
-    }
-
-    /**
-     * Listens on specific message matching the pattern which can be an string
-     * or a regexp.
-     * @param  {string/regex} pattern
-     * @param  {function} listener function to call when a message matching the
-     *                             pattern is found, gets the Update
-     *                             In case of string, the message should start
-     *                             with the string i.e. /^yourString/
-     * @return {object} returns the bot object
-     */
-
-  }, {
-    key: 'get',
-    value: function get(pattern, listener) {
-      if (typeof pattern === 'string') {
-        pattern = new RegExp('^' + pattern);
-      }
-
-      this._userEvents.push({
-        pattern: pattern, listener: listener
-      });
-
-      return this;
-    }
-
-    /**
-     * Listens on a command
-     * @param  {string} command the command string, should not include slash (/)
-     * @param  {function} listener function to call when the command is received,
-     *                           gets the update
-     * @return {object} returns the bot object
-     */
-
-  }, {
-    key: 'command',
-    value: function command(_command, listener) {
-      var regex = /[^\s]+/;
-
-      var cmd = _command.match(regex)[0].trim();
-
-      this._userEvents.push({
-        pattern: new RegExp('^/' + cmd),
-        parse: _argumentParser2.default.bind(null, _command),
-        listener: listener
-      });
-
-      return this;
-    }
-
-    /**
-     * Sends the message provided
-     * @param  {object} message The message to send. Gets it's send method called
-     * @return {unknown} returns the result of calling message's send method
-     */
-
-  }, {
-    key: 'send',
-    value: function send(message) {
-      return message.send(this).catch(console.error);
-    }
-
-    /**
-     * Stops the bot, deattaching all listeners and polling
-     */
-
-  }, {
-    key: 'stop',
-    value: function stop() {
-      this._stop = true;
-
-      if (this._webhookServer) {
-        this._webhookServer.close();
-      }
-
-      this.removeListener('update', this._update);
-      this._events = {};
-    }
-
-    /**
-     * The internal update event listener, used to parse messages and fire
-     * command/get events - YOU SHOULD NOT USE THIS
-     *
-     * @param  {object} update
-     */
-
-  }, {
-    key: '_update',
-    value: function _update(update) {
-      var _this3 = this;
-
-      if (!this.update.offset) {
-        var updateId = update[update.length - 1].update_id;
-        this.update.offset = updateId;
-      }
-      if (this.update) {
-        this.update.offset += 1;
-      }
-
-      update.forEach(function (res) {
-        var _marked = [getAnswer].map(regeneratorRuntime.mark);
-
-        var text = res.message.text;
-        if (!text) {
-          return;
-        }
-
-        var selfUsername = '@' + _this3.info.username;
-
-        if (text.startsWith('/') && text.indexOf(selfUsername) > -1) {
-          // Commands are sent in /command@thisusername format in groups
-          var regex = new RegExp('(/.*)@' + _this3.info.username);
-          text = text.replace(regex, '$1');
-          res.message.text = text;
-        }
-
-        var ev = _this3._userEvents.find(function (_ref) {
-          var pattern = _ref.pattern;
-          return pattern.test(text);
-        });
-
-        if (!ev) {
-          _this3.emit('command-notfound', res.message);
-          return;
-        }
-
-        if (!ev.parse) {
-          ev.listener(res.message);
-          return;
-        }
-
-        var _ev$parse = ev.parse(res.message.text);
-
-        var params = _ev$parse.params;
-        var args = _ev$parse.args;
-
-        res.message.args = args;
-
-        var requiredParams = Object.keys(params).filter(function (param) {
-          return params[param] === REQUIRED && !args[param];
-        });
-
-        if (!requiredParams.length) {
-          ev.listener(res.message);
-          return;
-        }
-
-        var bot = _this3;
-        function getAnswer() {
-          var _this4 = this;
-
-          var _iteratorNormalCompletion, _didIteratorError, _iteratorError, _loop, _iterator, _step;
-
-          return regeneratorRuntime.wrap(function getAnswer$(_context2) {
-            while (1) {
-              switch (_context2.prev = _context2.next) {
-                case 0:
-                  _iteratorNormalCompletion = true;
-                  _didIteratorError = false;
-                  _iteratorError = undefined;
-                  _context2.prev = 3;
-                  _loop = regeneratorRuntime.mark(function _loop() {
-                    var param, msg;
-                    return regeneratorRuntime.wrap(function _loop$(_context) {
-                      while (1) {
-                        switch (_context.prev = _context.next) {
-                          case 0:
-                            param = _step.value;
-                            msg = new _Message2.default().to(res.message.chat.id).text('Enter value for ' + param);
-                            _context.next = 4;
-                            return bot.send(msg).then(function (answer) {
-                              args[param] = answer.text;
-                            });
-
-                          case 4:
-                          case 'end':
-                            return _context.stop();
-                        }
-                      }
-                    }, _loop, _this4);
-                  });
-                  _iterator = requiredParams[Symbol.iterator]();
-
-                case 6:
-                  if (_iteratorNormalCompletion = (_step = _iterator.next()).done) {
-                    _context2.next = 11;
-                    break;
-                  }
-
-                  return _context2.delegateYield(_loop(), 't0', 8);
-
-                case 8:
-                  _iteratorNormalCompletion = true;
-                  _context2.next = 6;
-                  break;
-
-                case 11:
-                  _context2.next = 17;
-                  break;
-
-                case 13:
-                  _context2.prev = 13;
-                  _context2.t1 = _context2['catch'](3);
-                  _didIteratorError = true;
-                  _iteratorError = _context2.t1;
-
-                case 17:
-                  _context2.prev = 17;
-                  _context2.prev = 18;
-
-                  if (!_iteratorNormalCompletion && _iterator.return) {
-                    _iterator.return();
-                  }
-
-                case 20:
-                  _context2.prev = 20;
-
-                  if (!_didIteratorError) {
-                    _context2.next = 23;
-                    break;
-                  }
-
-                  throw _iteratorError;
-
-                case 23:
-                  return _context2.finish(20);
-
-                case 24:
-                  return _context2.finish(17);
-
-                case 25:
-                case 'end':
-                  return _context2.stop();
-              }
-            }
-          }, _marked[0], this, [[3, 13, 17, 25], [18,, 20, 24]]);
-        }
-
-        var iterator = getAnswer();
-        (function loop() {
-          var next = iterator.next();
-          if (next.done) {
-            ev.listener(res.message);
-            return;
-          }
-
-          next.value.then(loop);
-        })();
-      });
-    }
-  }]);
-
-  return Bot;
-}(_events.EventEmitter);
-
-exports.default = Bot;
-exports.File = _File2.default;
-exports.Message = _Message2.default;
-exports.BulkMessage = _BulkMessage2.default;
-exports.Forward = _Forward2.default;
-exports.Question = _Question2.default;
-exports.Keyboard = _Keyboard2.default;
diff --git a/build/types/Base.js b/build/types/Base.js
deleted file mode 100644
index 8f5e5f1..0000000
--- a/build/types/Base.js
+++ /dev/null
@@ -1,140 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-var _events = require('events');
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-var ANSWER_THRESHOLD = 10;
-
-/**
- * Base class of all classes
- */
-
-var Base = function (_EventEmitter) {
-  _inherits(Base, _EventEmitter);
-
-  function Base(method) {
-    _classCallCheck(this, Base);
-
-    var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(Base).call(this));
-
-    _this.method = method;
-    _this.properties = {};
-    return _this;
-  }
-
-  /**
-   * Sends the message, you should only use this method yourself if
-   * you are extending this class. Normally you should call bot.send(message)
-   *
-   * Events: message:sent => Emitted after sending the message to API, gets the
-   * 												  API's response
-   *
-   *			message:answer => Emitted when your message gets an answer from
-   *				                 the contact (reply in case of groups)
-   *				                 gets the Update object containing message
-   *
-   * @param  {object} bot
-   * @return {promise} returns a promise, resolved with message:answer
-   */
-
-
-  _createClass(Base, [{
-    key: 'send',
-    value: function send(bot) {
-      var _this2 = this;
-
-      if (this._keyboard) {
-        var reply_markup = JSON.stringify(this._keyboard.getProperties());
-        this.properties.reply_markup = reply_markup;
-      }
-
-      var messageId = void 0;
-      return new Promise(function (resolve) {
-        bot.api[_this2.method](_this2.properties).then(function (response) {
-          messageId = response.result.message_id;
-          _this2.emit('message:sent', response);
-        });
-
-        if (_this2._keyboard.one_time_keyboard) {
-          _this2._keyboard.replyMarkup = '';
-        }
-
-        var chat = _this2.properties.chat_id;
-        var answers = 0;
-        bot.on('update', function listener(result) {
-          answers += result.length;
-
-          var update = result.find(function (_ref) {
-            var message = _ref.message;
-
-            // if in a group, there will be a reply to this message
-            if (chat < 0) {
-              return message.chat.id === chat && message.reply_to_message && message.reply_to_message.message_id === messageId;
-            } else {
-              return message.chat.id === chat;
-            }
-          });
-
-          if (update) {
-            resolve(update.message);
-
-            this.emit('message:answer', update.message);
-
-            bot.removeListener('update', listener);
-          }
-
-          if (answers >= ANSWER_THRESHOLD) {
-            bot.removeListener('update', listener);
-          }
-        });
-      });
-    }
-
-    /**
-     * Returns properties of the object
-     * @return {object} properties of object
-     */
-
-  }, {
-    key: 'getProperties',
-    value: function getProperties() {
-      return this.properties;
-    }
-
-    /**
-     * Set properties of the object
-     * @param {object} object properties to set
-     * @param {boolean} extend A boolean indicating if the properties should be
-     *                         extended by the object provided (Object.assign)
-     *                         or properties should be replaced by the object
-     *                         defaults to true
-     * @return {object} returns the properties (same as getProperties)
-     */
-
-  }, {
-    key: 'setProperties',
-    value: function setProperties(object) {
-      var extend = arguments.length <= 1 || arguments[1] === undefined ? true : arguments[1];
-
-      this.properties = extend ? Object.assign(this.properties, object) : object;
-
-      return this.getProperties();
-    }
-  }]);
-
-  return Base;
-}(_events.EventEmitter);
-
-exports.default = Base;
-module.exports = exports['default'];
diff --git a/build/types/BulkMessage.js b/build/types/BulkMessage.js
deleted file mode 100644
index f87c786..0000000
--- a/build/types/BulkMessage.js
+++ /dev/null
@@ -1,91 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-var _Message2 = require('./Message');
-
-var _Message3 = _interopRequireDefault(_Message2);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-/**
- * Message class, used to send a message to multiple chats
- */
-
-var BulkMessage = function (_Message) {
-  _inherits(BulkMessage, _Message);
-
-  /**
-   * Create a new message
-   * @param  {object} properties Message properties, as defined by Telegram API
-   */
-
-  function BulkMessage() {
-    var properties = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
-
-    _classCallCheck(this, BulkMessage);
-
-    var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(BulkMessage).call(this, properties));
-
-    _this.chats = [];
-    return _this;
-  }
-
-  /**
-   * Set multiple chat_id's for the message
-   * @param  {number} chat
-   * @return {object} returns the message object
-   */
-
-
-  _createClass(BulkMessage, [{
-    key: 'to',
-    value: function to() {
-      for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
-
-      var chats = args.reduce(function (a, b) {
-        return a.concat(b);
-      }, []);
-
-      this.chats = chats;
-      return this;
-    }
-
-    /**
-     * Send the message to all chats
-     * @param  {Bot} bot
-     * @return {Promise} Resolved when the message is sent to all chats
-     */
-
-  }, {
-    key: 'send',
-    value: function send(bot) {
-      var _this2 = this;
-
-      var promises = this.chats.map(function (chat) {
-        var clone = Object.assign({}, _this2.properties);
-        var message = new _Message3.default(clone).to(chat);
-        return message.send(bot);
-      });
-
-      return Promise.all(promises);
-    }
-  }]);
-
-  return BulkMessage;
-}(_Message3.default);
-
-exports.default = BulkMessage;
-module.exports = exports['default'];
diff --git a/build/types/File.js b/build/types/File.js
deleted file mode 100644
index a318aa6..0000000
--- a/build/types/File.js
+++ /dev/null
@@ -1,159 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-var _Base2 = require('./Base');
-
-var _Base3 = _interopRequireDefault(_Base2);
-
-var _mime = require('mime');
-
-var _mime2 = _interopRequireDefault(_mime);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-var TYPES = ['photo', 'video', 'document', 'audio'];
-
-/**
- * File class, used to send pictures/movies/audios/documents to chat
- */
-
-var File = function (_Base) {
-  _inherits(File, _Base);
-
-  /**
-   * Create a new file instance
-   * @param  {object} properties File properties, as defined by Telegram API
-   */
-
-  function File() {
-    var properties = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
-
-    _classCallCheck(this, File);
-
-    var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(File).call(this, 'sendDocument'));
-
-    _this.properties = properties;
-    _this._keyboard = new _Base3.default();
-    return _this;
-  }
-
-  /**
-   * Set chat_id of the message
-   * @param  {number} chat
-   * @return {object} returns the message object
-   */
-
-
-  _createClass(File, [{
-    key: 'to',
-    value: function to(chat) {
-      this.properties.chat_id = chat;
-      return this;
-    }
-
-    /**
-     * Set file of the message
-     * @param  {string} file File path
-     * @param {string} fileType (optional) if the first argument is a
-     *                          file_id string, this option indicates file type
-     * @return {object} returns the message object
-     */
-
-  }, {
-    key: 'file',
-    value: function file(_file, fileType) {
-      if (fileType) {
-        this.properties[fileType] = { file: _file };
-
-        return this;
-      }
-
-      var _mime$lookup$split = _mime2.default.lookup(_file).split('/');
-
-      var _mime$lookup$split2 = _slicedToArray(_mime$lookup$split, 2);
-
-      var type = _mime$lookup$split2[0];
-      var extension = _mime$lookup$split2[1];
-
-      if (type === 'image') {
-        type = 'photo';
-      }
-
-      if (extension === 'gif') {
-        type = 'document';
-      }
-
-      if (TYPES.indexOf(type) === -1) {
-        type = 'document';
-      }
-
-      this.properties[type] = { file: _file };
-
-      this.method = 'send' + (type[0].toUpperCase() + type.slice(1));
-
-      return this;
-    }
-
-    /**
-     * Set caption for photos
-     * @param  {string} text caption's text
-     * @return {object} returns the message object
-     */
-
-  }, {
-    key: 'caption',
-    value: function caption(text) {
-      this.properties.caption = text;
-      return this;
-    }
-
-    /**
-     * Set reply_to_message_id of the message
-     * @param  {number} id message_id of the message to reply to
-     * @return {object} returns the message object
-     */
-
-  }, {
-    key: 'reply',
-    value: function reply(id) {
-      this.properties.reply_to_message_id = id;
-      return this;
-    }
-
-    /**
-     * Sets keyboard of the message
-     * The value of reply_markup is set to the sanitized keyboard properties
-     * i.e. reply_markup = JSON.stringify(kb.getProperties())
-     * @param  {object} kb A Keyboard instance
-     * @return {object} returns the message object
-     */
-
-  }, {
-    key: 'keyboard',
-    value: function keyboard(kb) {
-      this._keyboard = kb;
-      return this;
-    }
-
-    // This class inherits Base's send method
-
-  }]);
-
-  return File;
-}(_Base3.default);
-
-exports.default = File;
-module.exports = exports['default'];
diff --git a/build/types/Forward.js b/build/types/Forward.js
deleted file mode 100644
index 14a0e26..0000000
--- a/build/types/Forward.js
+++ /dev/null
@@ -1,94 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-var _Base2 = require('./Base');
-
-var _Base3 = _interopRequireDefault(_Base2);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-/**
- * Forward class, used to forward messages from a chat to another
- */
-
-var Forward = function (_Base) {
-  _inherits(Forward, _Base);
-
-  /**
-   * Create a new forward message
-   * @param  {object} properties Forward Message properties, as defined by
-   *                             Telegram API
-   */
-
-  function Forward() {
-    var properties = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
-
-    _classCallCheck(this, Forward);
-
-    var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(Forward).call(this, 'forwardMessage'));
-
-    _this.properties = properties;
-    _this._keyboard = new _Base3.default();
-    return _this;
-  }
-
-  /**
-   * Set chat_id of the message
-   * @param  {number} chat
-   * @return {object} returns the message object
-   */
-
-
-  _createClass(Forward, [{
-    key: 'to',
-    value: function to(chat) {
-      this.properties.chat_id = chat;
-      return this;
-    }
-
-    /**
-     * Set from_chat_id, source of message's chat's id
-     * @param  {number} chat Source chat id
-     * @return {object} returns the message object
-     */
-
-  }, {
-    key: 'from',
-    value: function from(chat) {
-      this.properties.from_chat_id = chat;
-      return this;
-    }
-
-    /**
-     * Sets message_id, the message to forward from source to target chat
-     * @param  {number} message ID of the message to forward
-     * @return {object} returns the message object
-     */
-
-  }, {
-    key: 'message',
-    value: function message(_message) {
-      this.properties.message_id = _message;
-      return this;
-    }
-
-    // This class inherits Base's send method
-
-  }]);
-
-  return Forward;
-}(_Base3.default);
-
-exports.default = Forward;
-module.exports = exports['default'];
diff --git a/build/types/Keyboard.js b/build/types/Keyboard.js
deleted file mode 100644
index 460b17f..0000000
--- a/build/types/Keyboard.js
+++ /dev/null
@@ -1,145 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-var _Base2 = require('./Base');
-
-var _Base3 = _interopRequireDefault(_Base2);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-/**
- * Keyboard class, used to configure keyboards for messages.
- * You should pass your instance of this class to message.keyboard() method
- */
-
-var Keyboard = function (_Base) {
-  _inherits(Keyboard, _Base);
-
-  /**
-   * Create a new keyboard
-   * @param  {object} properties Keyboard properties, as defined by Telegram API
-   *                             See ReplyKeyboardMarkup, ReplyKeyboardHide,
-   *                                 ForceReply
-   */
-
-  function Keyboard() {
-    var properties = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
-
-    _classCallCheck(this, Keyboard);
-
-    var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(Keyboard).call(this));
-
-    _this.properties = properties;
-    return _this;
-  }
-
-  /**
-   * Set the keyboard property of reply_markup
-   * @param  {array} keys An array of arrays, with the format of
-   *                            Column         Column
-   *                      Row [['TopLeft',   'TopRight'],
-   *                      Row ['BottomLeft', 'BottomRight']]
-   * @return {object} returns the keyboard object
-   */
-
-
-  _createClass(Keyboard, [{
-    key: 'keys',
-    value: function keys(_keys) {
-      this.properties.keyboard = _keys;
-      this.properties.hide_keyboard = false;
-      return this;
-    }
-
-    /**
-     * Set force_keyboard property of reply_markup
-     * @param  {boolean} enable value of force_keyboard, defaults to true
-     * @return {object} returns the keyboard object
-     */
-
-  }, {
-    key: 'force',
-    value: function force() {
-      var enable = arguments.length <= 0 || arguments[0] === undefined ? true : arguments[0];
-
-      this.properties.force_keyboard = enable;
-      return this;
-    }
-
-    /**
-     * Set resize_keyboard property of reply_markup
-     * @param  {boolean} enable value of resize_keyboard, defaults to true
-     * @return {object} returns the keyboard object
-     */
-
-  }, {
-    key: 'resize',
-    value: function resize() {
-      var enable = arguments.length <= 0 || arguments[0] === undefined ? true : arguments[0];
-
-      this.properties.resize_keyboard = enable;
-      return this;
-    }
-
-    /**
-     * Set force_keyboard property of reply_markup
-     * @param  {boolean} enable value of force_keyboard, defaults to true
-     * @return {object} returns the keyboard object
-     */
-
-  }, {
-    key: 'oneTime',
-    value: function oneTime() {
-      var enable = arguments.length <= 0 || arguments[0] === undefined ? true : arguments[0];
-
-      this.properties.one_time_keyboard = enable;
-      return this;
-    }
-
-    /**
-     * Set selective property of reply_markup
-     * @param  {boolean} enable value of force_keyboard, defaults to true
-     * @return {object} returns the keyboard object
-     */
-
-  }, {
-    key: 'selective',
-    value: function selective() {
-      var enable = arguments.length <= 0 || arguments[0] === undefined ? true : arguments[0];
-
-      this.properties.selective = enable;
-      return this;
-    }
-
-    /**
-     * Set hide_keyboard property of reply_markup to true
-     * @return {object} returns the keyboard object
-     */
-
-  }, {
-    key: 'hide',
-    value: function hide() {
-      this.properties = {
-        hide_keyboard: true
-      };
-
-      return this;
-    }
-  }]);
-
-  return Keyboard;
-}(_Base3.default);
-
-exports.default = Keyboard;
-module.exports = exports['default'];
diff --git a/build/types/Message.js b/build/types/Message.js
deleted file mode 100644
index 9084494..0000000
--- a/build/types/Message.js
+++ /dev/null
@@ -1,155 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-var _Base2 = require('./Base');
-
-var _Base3 = _interopRequireDefault(_Base2);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-/**
- * Message class, used to send message to a chat
- */
-
-var Message = function (_Base) {
-  _inherits(Message, _Base);
-
-  /**
-   * Create a new message
-   * @param  {object} properties Message properties, as defined by Telegram API
-   */
-
-  function Message() {
-    var properties = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
-
-    _classCallCheck(this, Message);
-
-    var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(Message).call(this, 'sendMessage'));
-
-    _this.properties = properties;
-    _this._keyboard = new _Base3.default();
-    return _this;
-  }
-
-  /**
-   * Set chat_id of the message
-   * @param  {number} chat
-   * @return {object} returns the message object
-   */
-
-
-  _createClass(Message, [{
-    key: 'to',
-    value: function to(chat) {
-      this.properties.chat_id = chat;
-      return this;
-    }
-
-    /**
-     * Set text of the message
-     * @param  {string} text Message's content
-     * @return {object} returns the message object
-     */
-
-  }, {
-    key: 'text',
-    value: function text(_text) {
-      this.properties.text = _text;
-      return this;
-    }
-
-    /**
-     * Set text of the message in HTML format
-     * @param  {string} text Message's content in HTML format
-     * @return {object} returns the message object
-     */
-
-  }, {
-    key: 'html',
-    value: function html(text) {
-      this.properties.parse_mode = 'HTML';
-      if (text) {
-        this.properties.text = text;
-      }
-      return this;
-    }
-
-    /**
-     * Set text of the message in Markdown format
-     * @param  {string} text Message's content in Markdown format
-     * @return {object} returns the message object
-     */
-
-  }, {
-    key: 'markdown',
-    value: function markdown(text) {
-      this.properties.parse_mode = 'Markdown';
-      if (text) {
-        this.properties.text = text;
-      }
-      return this;
-    }
-
-    /**
-     * Set reply_to_message_id of the message
-     * @param  {number} id message_id of the message to reply to
-     * @return {object} returns the message object
-     */
-
-  }, {
-    key: 'reply',
-    value: function reply(id) {
-      this.properties.reply_to_message_id = id;
-      return this;
-    }
-
-    /**
-     * Set disable_web_page_preview of the message
-     * @param  {boolean} enable
-     * @return {object} returns the message object
-     */
-
-  }, {
-    key: 'preview',
-    value: function preview() {
-      var enable = arguments.length <= 0 || arguments[0] === undefined ? true : arguments[0];
-
-      this.properties.disable_web_page_preview = !enable;
-      return this;
-    }
-
-    /**
-     * Sets keyboard of the message
-     * The value of reply_markup is set to the sanitized keyboard properties
-     * i.e. reply_markup = JSON.stringify(kb.getProperties())
-     * @param  {object} kb A Keyboard instance
-     * @return {object} returns the message object
-     */
-
-  }, {
-    key: 'keyboard',
-    value: function keyboard(kb) {
-      this._keyboard = kb;
-      return this;
-    }
-
-    // This class inherits Base's send method
-
-  }]);
-
-  return Message;
-}(_Base3.default);
-
-exports.default = Message;
-module.exports = exports['default'];
diff --git a/build/types/Question.js b/build/types/Question.js
deleted file mode 100644
index 7aa5819..0000000
--- a/build/types/Question.js
+++ /dev/null
@@ -1,116 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } };
-
-var _Message2 = require('./Message');
-
-var _Message3 = _interopRequireDefault(_Message2);
-
-var _Keyboard = require('./Keyboard');
-
-var _Keyboard2 = _interopRequireDefault(_Keyboard);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-/**
- * Question class, extends Message
- * Sends a message, shows a keyboard with the answers provided, and validates
- * the answer
- */
-
-var Question = function (_Message) {
-  _inherits(Question, _Message);
-
-  /**
-   * Create a new question
-   * @param  {object} options Options, same as Message, plus `answers` which
-   *                          is a keyboard layout, see Keyboard#keys
-   */
-
-  function Question() {
-    var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
-
-    _classCallCheck(this, Question);
-
-    var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(Question).call(this, options));
-
-    var kb = new _Keyboard2.default().force().oneTime().selective();
-    _this.keyboard(kb);
-
-    _this.answers(options.answers);
-    return _this;
-  }
-
-  /**
-   * Sets answers of the question. This is passed to Keyboard#keys, and then
-   * used to validate the answer given
-   * @param  {array} answers Array of arrays of strings, same as Keyboard#keys
-   * @return {object} returns the question object
-   */
-
-
-  _createClass(Question, [{
-    key: 'answers',
-    value: function answers(_answers) {
-      this._answers = _answers;
-      this._keyboard.keys(_answers);
-      return this;
-    }
-
-    /**
-     * Sends the question (same as Message#send), and validates the answer given
-     * if the answer is one of the defined answers, resolves, else rejects
-     * You should not manually use this method unless you're extending this class
-     * You should instead use bot.send(question);
-     * @param  {object} bot
-     * @return {promise} A promise which is resolved in case of valid answer, and
-     *                     rejected in case of invalid answer
-     */
-
-  }, {
-    key: 'send',
-    value: function send(bot) {
-      var _this2 = this;
-
-      var answers = this._answers;
-
-      return _get(Object.getPrototypeOf(Question.prototype), 'send', this).call(this, bot).then(function (message) {
-        var answer = void 0;
-
-        answers.forEach(function find(a) {
-          if (Array.isArray(a)) {
-            a.forEach(find);
-          }
-          if (a === message.text) {
-            answer = a;
-          }
-        });
-
-        if (answer) {
-          _this2.emit('question:answer', answer, message);
-          return message;
-        } else {
-          _this2.emit('question:invalid', message);
-          throw message;
-        }
-      });
-    }
-  }]);
-
-  return Question;
-}(_Message3.default);
-
-exports.default = Question;
-module.exports = exports['default'];
diff --git a/package.json b/package.json
index 4f72051..ca2d8ee 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "build"
   ],
   "directories": {
-    "lib": "lib"
+    "lib": "src"
   },
   "engines": {
     "node": ">=0.12.0"
diff --git a/types/Base.js b/types/Base.js
deleted file mode 100644
index 8f5e5f1..0000000
--- a/types/Base.js
+++ /dev/null
@@ -1,140 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-var _events = require('events');
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-var ANSWER_THRESHOLD = 10;
-
-/**
- * Base class of all classes
- */
-
-var Base = function (_EventEmitter) {
-  _inherits(Base, _EventEmitter);
-
-  function Base(method) {
-    _classCallCheck(this, Base);
-
-    var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(Base).call(this));
-
-    _this.method = method;
-    _this.properties = {};
-    return _this;
-  }
-
-  /**
-   * Sends the message, you should only use this method yourself if
-   * you are extending this class. Normally you should call bot.send(message)
-   *
-   * Events: message:sent => Emitted after sending the message to API, gets the
-   * 												  API's response
-   *
-   *			message:answer => Emitted when your message gets an answer from
-   *				                 the contact (reply in case of groups)
-   *				                 gets the Update object containing message
-   *
-   * @param  {object} bot
-   * @return {promise} returns a promise, resolved with message:answer
-   */
-
-
-  _createClass(Base, [{
-    key: 'send',
-    value: function send(bot) {
-      var _this2 = this;
-
-      if (this._keyboard) {
-        var reply_markup = JSON.stringify(this._keyboard.getProperties());
-        this.properties.reply_markup = reply_markup;
-      }
-
-      var messageId = void 0;
-      return new Promise(function (resolve) {
-        bot.api[_this2.method](_this2.properties).then(function (response) {
-          messageId = response.result.message_id;
-          _this2.emit('message:sent', response);
-        });
-
-        if (_this2._keyboard.one_time_keyboard) {
-          _this2._keyboard.replyMarkup = '';
-        }
-
-        var chat = _this2.properties.chat_id;
-        var answers = 0;
-        bot.on('update', function listener(result) {
-          answers += result.length;
-
-          var update = result.find(function (_ref) {
-            var message = _ref.message;
-
-            // if in a group, there will be a reply to this message
-            if (chat < 0) {
-              return message.chat.id === chat && message.reply_to_message && message.reply_to_message.message_id === messageId;
-            } else {
-              return message.chat.id === chat;
-            }
-          });
-
-          if (update) {
-            resolve(update.message);
-
-            this.emit('message:answer', update.message);
-
-            bot.removeListener('update', listener);
-          }
-
-          if (answers >= ANSWER_THRESHOLD) {
-            bot.removeListener('update', listener);
-          }
-        });
-      });
-    }
-
-    /**
-     * Returns properties of the object
-     * @return {object} properties of object
-     */
-
-  }, {
-    key: 'getProperties',
-    value: function getProperties() {
-      return this.properties;
-    }
-
-    /**
-     * Set properties of the object
-     * @param {object} object properties to set
-     * @param {boolean} extend A boolean indicating if the properties should be
-     *                         extended by the object provided (Object.assign)
-     *                         or properties should be replaced by the object
-     *                         defaults to true
-     * @return {object} returns the properties (same as getProperties)
-     */
-
-  }, {
-    key: 'setProperties',
-    value: function setProperties(object) {
-      var extend = arguments.length <= 1 || arguments[1] === undefined ? true : arguments[1];
-
-      this.properties = extend ? Object.assign(this.properties, object) : object;
-
-      return this.getProperties();
-    }
-  }]);
-
-  return Base;
-}(_events.EventEmitter);
-
-exports.default = Base;
-module.exports = exports['default'];
diff --git a/types/BulkMessage.js b/types/BulkMessage.js
deleted file mode 100644
index f87c786..0000000
--- a/types/BulkMessage.js
+++ /dev/null
@@ -1,91 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-var _Message2 = require('./Message');
-
-var _Message3 = _interopRequireDefault(_Message2);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-/**
- * Message class, used to send a message to multiple chats
- */
-
-var BulkMessage = function (_Message) {
-  _inherits(BulkMessage, _Message);
-
-  /**
-   * Create a new message
-   * @param  {object} properties Message properties, as defined by Telegram API
-   */
-
-  function BulkMessage() {
-    var properties = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
-
-    _classCallCheck(this, BulkMessage);
-
-    var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(BulkMessage).call(this, properties));
-
-    _this.chats = [];
-    return _this;
-  }
-
-  /**
-   * Set multiple chat_id's for the message
-   * @param  {number} chat
-   * @return {object} returns the message object
-   */
-
-
-  _createClass(BulkMessage, [{
-    key: 'to',
-    value: function to() {
-      for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
-
-      var chats = args.reduce(function (a, b) {
-        return a.concat(b);
-      }, []);
-
-      this.chats = chats;
-      return this;
-    }
-
-    /**
-     * Send the message to all chats
-     * @param  {Bot} bot
-     * @return {Promise} Resolved when the message is sent to all chats
-     */
-
-  }, {
-    key: 'send',
-    value: function send(bot) {
-      var _this2 = this;
-
-      var promises = this.chats.map(function (chat) {
-        var clone = Object.assign({}, _this2.properties);
-        var message = new _Message3.default(clone).to(chat);
-        return message.send(bot);
-      });
-
-      return Promise.all(promises);
-    }
-  }]);
-
-  return BulkMessage;
-}(_Message3.default);
-
-exports.default = BulkMessage;
-module.exports = exports['default'];
diff --git a/types/File.js b/types/File.js
deleted file mode 100644
index a318aa6..0000000
--- a/types/File.js
+++ /dev/null
@@ -1,159 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-var _Base2 = require('./Base');
-
-var _Base3 = _interopRequireDefault(_Base2);
-
-var _mime = require('mime');
-
-var _mime2 = _interopRequireDefault(_mime);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-var TYPES = ['photo', 'video', 'document', 'audio'];
-
-/**
- * File class, used to send pictures/movies/audios/documents to chat
- */
-
-var File = function (_Base) {
-  _inherits(File, _Base);
-
-  /**
-   * Create a new file instance
-   * @param  {object} properties File properties, as defined by Telegram API
-   */
-
-  function File() {
-    var properties = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
-
-    _classCallCheck(this, File);
-
-    var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(File).call(this, 'sendDocument'));
-
-    _this.properties = properties;
-    _this._keyboard = new _Base3.default();
-    return _this;
-  }
-
-  /**
-   * Set chat_id of the message
-   * @param  {number} chat
-   * @return {object} returns the message object
-   */
-
-
-  _createClass(File, [{
-    key: 'to',
-    value: function to(chat) {
-      this.properties.chat_id = chat;
-      return this;
-    }
-
-    /**
-     * Set file of the message
-     * @param  {string} file File path
-     * @param {string} fileType (optional) if the first argument is a
-     *                          file_id string, this option indicates file type
-     * @return {object} returns the message object
-     */
-
-  }, {
-    key: 'file',
-    value: function file(_file, fileType) {
-      if (fileType) {
-        this.properties[fileType] = { file: _file };
-
-        return this;
-      }
-
-      var _mime$lookup$split = _mime2.default.lookup(_file).split('/');
-
-      var _mime$lookup$split2 = _slicedToArray(_mime$lookup$split, 2);
-
-      var type = _mime$lookup$split2[0];
-      var extension = _mime$lookup$split2[1];
-
-      if (type === 'image') {
-        type = 'photo';
-      }
-
-      if (extension === 'gif') {
-        type = 'document';
-      }
-
-      if (TYPES.indexOf(type) === -1) {
-        type = 'document';
-      }
-
-      this.properties[type] = { file: _file };
-
-      this.method = 'send' + (type[0].toUpperCase() + type.slice(1));
-
-      return this;
-    }
-
-    /**
-     * Set caption for photos
-     * @param  {string} text caption's text
-     * @return {object} returns the message object
-     */
-
-  }, {
-    key: 'caption',
-    value: function caption(text) {
-      this.properties.caption = text;
-      return this;
-    }
-
-    /**
-     * Set reply_to_message_id of the message
-     * @param  {number} id message_id of the message to reply to
-     * @return {object} returns the message object
-     */
-
-  }, {
-    key: 'reply',
-    value: function reply(id) {
-      this.properties.reply_to_message_id = id;
-      return this;
-    }
-
-    /**
-     * Sets keyboard of the message
-     * The value of reply_markup is set to the sanitized keyboard properties
-     * i.e. reply_markup = JSON.stringify(kb.getProperties())
-     * @param  {object} kb A Keyboard instance
-     * @return {object} returns the message object
-     */
-
-  }, {
-    key: 'keyboard',
-    value: function keyboard(kb) {
-      this._keyboard = kb;
-      return this;
-    }
-
-    // This class inherits Base's send method
-
-  }]);
-
-  return File;
-}(_Base3.default);
-
-exports.default = File;
-module.exports = exports['default'];
diff --git a/types/Forward.js b/types/Forward.js
deleted file mode 100644
index 14a0e26..0000000
--- a/types/Forward.js
+++ /dev/null
@@ -1,94 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-var _Base2 = require('./Base');
-
-var _Base3 = _interopRequireDefault(_Base2);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-/**
- * Forward class, used to forward messages from a chat to another
- */
-
-var Forward = function (_Base) {
-  _inherits(Forward, _Base);
-
-  /**
-   * Create a new forward message
-   * @param  {object} properties Forward Message properties, as defined by
-   *                             Telegram API
-   */
-
-  function Forward() {
-    var properties = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
-
-    _classCallCheck(this, Forward);
-
-    var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(Forward).call(this, 'forwardMessage'));
-
-    _this.properties = properties;
-    _this._keyboard = new _Base3.default();
-    return _this;
-  }
-
-  /**
-   * Set chat_id of the message
-   * @param  {number} chat
-   * @return {object} returns the message object
-   */
-
-
-  _createClass(Forward, [{
-    key: 'to',
-    value: function to(chat) {
-      this.properties.chat_id = chat;
-      return this;
-    }
-
-    /**
-     * Set from_chat_id, source of message's chat's id
-     * @param  {number} chat Source chat id
-     * @return {object} returns the message object
-     */
-
-  }, {
-    key: 'from',
-    value: function from(chat) {
-      this.properties.from_chat_id = chat;
-      return this;
-    }
-
-    /**
-     * Sets message_id, the message to forward from source to target chat
-     * @param  {number} message ID of the message to forward
-     * @return {object} returns the message object
-     */
-
-  }, {
-    key: 'message',
-    value: function message(_message) {
-      this.properties.message_id = _message;
-      return this;
-    }
-
-    // This class inherits Base's send method
-
-  }]);
-
-  return Forward;
-}(_Base3.default);
-
-exports.default = Forward;
-module.exports = exports['default'];
diff --git a/types/Keyboard.js b/types/Keyboard.js
deleted file mode 100644
index 460b17f..0000000
--- a/types/Keyboard.js
+++ /dev/null
@@ -1,145 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-var _Base2 = require('./Base');
-
-var _Base3 = _interopRequireDefault(_Base2);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-/**
- * Keyboard class, used to configure keyboards for messages.
- * You should pass your instance of this class to message.keyboard() method
- */
-
-var Keyboard = function (_Base) {
-  _inherits(Keyboard, _Base);
-
-  /**
-   * Create a new keyboard
-   * @param  {object} properties Keyboard properties, as defined by Telegram API
-   *                             See ReplyKeyboardMarkup, ReplyKeyboardHide,
-   *                                 ForceReply
-   */
-
-  function Keyboard() {
-    var properties = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
-
-    _classCallCheck(this, Keyboard);
-
-    var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(Keyboard).call(this));
-
-    _this.properties = properties;
-    return _this;
-  }
-
-  /**
-   * Set the keyboard property of reply_markup
-   * @param  {array} keys An array of arrays, with the format of
-   *                            Column         Column
-   *                      Row [['TopLeft',   'TopRight'],
-   *                      Row ['BottomLeft', 'BottomRight']]
-   * @return {object} returns the keyboard object
-   */
-
-
-  _createClass(Keyboard, [{
-    key: 'keys',
-    value: function keys(_keys) {
-      this.properties.keyboard = _keys;
-      this.properties.hide_keyboard = false;
-      return this;
-    }
-
-    /**
-     * Set force_keyboard property of reply_markup
-     * @param  {boolean} enable value of force_keyboard, defaults to true
-     * @return {object} returns the keyboard object
-     */
-
-  }, {
-    key: 'force',
-    value: function force() {
-      var enable = arguments.length <= 0 || arguments[0] === undefined ? true : arguments[0];
-
-      this.properties.force_keyboard = enable;
-      return this;
-    }
-
-    /**
-     * Set resize_keyboard property of reply_markup
-     * @param  {boolean} enable value of resize_keyboard, defaults to true
-     * @return {object} returns the keyboard object
-     */
-
-  }, {
-    key: 'resize',
-    value: function resize() {
-      var enable = arguments.length <= 0 || arguments[0] === undefined ? true : arguments[0];
-
-      this.properties.resize_keyboard = enable;
-      return this;
-    }
-
-    /**
-     * Set force_keyboard property of reply_markup
-     * @param  {boolean} enable value of force_keyboard, defaults to true
-     * @return {object} returns the keyboard object
-     */
-
-  }, {
-    key: 'oneTime',
-    value: function oneTime() {
-      var enable = arguments.length <= 0 || arguments[0] === undefined ? true : arguments[0];
-
-      this.properties.one_time_keyboard = enable;
-      return this;
-    }
-
-    /**
-     * Set selective property of reply_markup
-     * @param  {boolean} enable value of force_keyboard, defaults to true
-     * @return {object} returns the keyboard object
-     */
-
-  }, {
-    key: 'selective',
-    value: function selective() {
-      var enable = arguments.length <= 0 || arguments[0] === undefined ? true : arguments[0];
-
-      this.properties.selective = enable;
-      return this;
-    }
-
-    /**
-     * Set hide_keyboard property of reply_markup to true
-     * @return {object} returns the keyboard object
-     */
-
-  }, {
-    key: 'hide',
-    value: function hide() {
-      this.properties = {
-        hide_keyboard: true
-      };
-
-      return this;
-    }
-  }]);
-
-  return Keyboard;
-}(_Base3.default);
-
-exports.default = Keyboard;
-module.exports = exports['default'];
diff --git a/types/Message.js b/types/Message.js
deleted file mode 100644
index 9084494..0000000
--- a/types/Message.js
+++ /dev/null
@@ -1,155 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-var _Base2 = require('./Base');
-
-var _Base3 = _interopRequireDefault(_Base2);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-/**
- * Message class, used to send message to a chat
- */
-
-var Message = function (_Base) {
-  _inherits(Message, _Base);
-
-  /**
-   * Create a new message
-   * @param  {object} properties Message properties, as defined by Telegram API
-   */
-
-  function Message() {
-    var properties = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
-
-    _classCallCheck(this, Message);
-
-    var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(Message).call(this, 'sendMessage'));
-
-    _this.properties = properties;
-    _this._keyboard = new _Base3.default();
-    return _this;
-  }
-
-  /**
-   * Set chat_id of the message
-   * @param  {number} chat
-   * @return {object} returns the message object
-   */
-
-
-  _createClass(Message, [{
-    key: 'to',
-    value: function to(chat) {
-      this.properties.chat_id = chat;
-      return this;
-    }
-
-    /**
-     * Set text of the message
-     * @param  {string} text Message's content
-     * @return {object} returns the message object
-     */
-
-  }, {
-    key: 'text',
-    value: function text(_text) {
-      this.properties.text = _text;
-      return this;
-    }
-
-    /**
-     * Set text of the message in HTML format
-     * @param  {string} text Message's content in HTML format
-     * @return {object} returns the message object
-     */
-
-  }, {
-    key: 'html',
-    value: function html(text) {
-      this.properties.parse_mode = 'HTML';
-      if (text) {
-        this.properties.text = text;
-      }
-      return this;
-    }
-
-    /**
-     * Set text of the message in Markdown format
-     * @param  {string} text Message's content in Markdown format
-     * @return {object} returns the message object
-     */
-
-  }, {
-    key: 'markdown',
-    value: function markdown(text) {
-      this.properties.parse_mode = 'Markdown';
-      if (text) {
-        this.properties.text = text;
-      }
-      return this;
-    }
-
-    /**
-     * Set reply_to_message_id of the message
-     * @param  {number} id message_id of the message to reply to
-     * @return {object} returns the message object
-     */
-
-  }, {
-    key: 'reply',
-    value: function reply(id) {
-      this.properties.reply_to_message_id = id;
-      return this;
-    }
-
-    /**
-     * Set disable_web_page_preview of the message
-     * @param  {boolean} enable
-     * @return {object} returns the message object
-     */
-
-  }, {
-    key: 'preview',
-    value: function preview() {
-      var enable = arguments.length <= 0 || arguments[0] === undefined ? true : arguments[0];
-
-      this.properties.disable_web_page_preview = !enable;
-      return this;
-    }
-
-    /**
-     * Sets keyboard of the message
-     * The value of reply_markup is set to the sanitized keyboard properties
-     * i.e. reply_markup = JSON.stringify(kb.getProperties())
-     * @param  {object} kb A Keyboard instance
-     * @return {object} returns the message object
-     */
-
-  }, {
-    key: 'keyboard',
-    value: function keyboard(kb) {
-      this._keyboard = kb;
-      return this;
-    }
-
-    // This class inherits Base's send method
-
-  }]);
-
-  return Message;
-}(_Base3.default);
-
-exports.default = Message;
-module.exports = exports['default'];
diff --git a/types/Question.js b/types/Question.js
deleted file mode 100644
index 7aa5819..0000000
--- a/types/Question.js
+++ /dev/null
@@ -1,116 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } };
-
-var _Message2 = require('./Message');
-
-var _Message3 = _interopRequireDefault(_Message2);
-
-var _Keyboard = require('./Keyboard');
-
-var _Keyboard2 = _interopRequireDefault(_Keyboard);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-/**
- * Question class, extends Message
- * Sends a message, shows a keyboard with the answers provided, and validates
- * the answer
- */
-
-var Question = function (_Message) {
-  _inherits(Question, _Message);
-
-  /**
-   * Create a new question
-   * @param  {object} options Options, same as Message, plus `answers` which
-   *                          is a keyboard layout, see Keyboard#keys
-   */
-
-  function Question() {
-    var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
-
-    _classCallCheck(this, Question);
-
-    var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(Question).call(this, options));
-
-    var kb = new _Keyboard2.default().force().oneTime().selective();
-    _this.keyboard(kb);
-
-    _this.answers(options.answers);
-    return _this;
-  }
-
-  /**
-   * Sets answers of the question. This is passed to Keyboard#keys, and then
-   * used to validate the answer given
-   * @param  {array} answers Array of arrays of strings, same as Keyboard#keys
-   * @return {object} returns the question object
-   */
-
-
-  _createClass(Question, [{
-    key: 'answers',
-    value: function answers(_answers) {
-      this._answers = _answers;
-      this._keyboard.keys(_answers);
-      return this;
-    }
-
-    /**
-     * Sends the question (same as Message#send), and validates the answer given
-     * if the answer is one of the defined answers, resolves, else rejects
-     * You should not manually use this method unless you're extending this class
-     * You should instead use bot.send(question);
-     * @param  {object} bot
-     * @return {promise} A promise which is resolved in case of valid answer, and
-     *                     rejected in case of invalid answer
-     */
-
-  }, {
-    key: 'send',
-    value: function send(bot) {
-      var _this2 = this;
-
-      var answers = this._answers;
-
-      return _get(Object.getPrototypeOf(Question.prototype), 'send', this).call(this, bot).then(function (message) {
-        var answer = void 0;
-
-        answers.forEach(function find(a) {
-          if (Array.isArray(a)) {
-            a.forEach(find);
-          }
-          if (a === message.text) {
-            answer = a;
-          }
-        });
-
-        if (answer) {
-          _this2.emit('question:answer', answer, message);
-          return message;
-        } else {
-          _this2.emit('question:invalid', message);
-          throw message;
-        }
-      });
-    }
-  }]);
-
-  return Question;
-}(_Message3.default);
-
-exports.default = Question;
-module.exports = exports['default'];